Merge pull request #67 from DTStack/dev

Dev

Author: liuxy0551

app/router.js

@@ -93,5 +93,6 @@ module.exports = app => {
     app.post('/api/tags/delete-tag', app.controller.tagManagement.deleteTag);
 
     // io.of('/').route('getShellCommand',  io.controller.home.getShellCommand)
-    io.of('/').route('loginServer',  io.controller.home.loginServer)
+    // 暂时close Terminal相关功能
+    // io.of('/').route('loginServer',  io.controller.home.loginServer)
 };

app/web/pages/hostManagement/index.tsx

@@ -59,8 +59,9 @@ export default (props: any) => {
             width: 200,
             render: (value: any, row: any) => {
                 return <span>
-                    <a onClick={handleOpenTerminal.bind(this, row)}>终端</a>
-                    <Divider type="vertical" />
+                    {/** 暂时close Terminal相关功能 */}
+                    {/* <a onClick={handleOpenTerminal.bind(this, row)}>终端</a>
+                    <Divider type="vertical" /> */}
                     <a onClick={handleTableRowEdit.bind(this, row)}>编辑</a>
                     <Divider type="vertical" />
                     <Popconfirm title={`确认是否删除该主机「${row.hostName}」?`} onConfirm={handleTableRowDelete.bind(this, row)}>

app/web/pages/proxyServer/components/proxyRuleModal/index.tsx

@@ -56,6 +56,12 @@ class ProxyRuleModal extends React.PureComponent<any, any>{
             target: undefined
         })
     }
+    addressValidator = (rules: any, value: any, callback: any) => {
+        if (value?.includes('doraemon')) {
+            return callback('请使用 portalfront 地址，请勿使用 portalfront-doraemon 地址');
+        }
+        return callback();
+    }
     render() {
         const { visible, editable, proxyServer, confirmLoading, targetAddrs, localIp } = this.props;
         const { ip, target, remark, mode } = proxyServer;
@@ -114,7 +120,11 @@ class ProxyRuleModal extends React.PureComponent<any, any>{
                                     <Form.Item
                                         label="目标服务地址"
                                         name="target"
-                                        rules={[{ required: true, pattern: urlReg, message: '请输入正确格式的目标服务地址，以 http(s):// 开头' }]}
+                                        validateFirst
+                                        rules={[
+                                            { required: true, pattern: urlReg, message: '请输入正确格式的目标服务地址，以 http(s):// 开头' },
+                                            { validator: this.addressValidator }
+                                        ]}
                                     >
                                         <Input placeholder="请输入正确格式的目标服务地址，以 http(s):// 开头" />
                                     </Form.Item>

app/web/pages/proxyServer/components/proxyServerModal/index.tsx

@@ -85,6 +85,9 @@ class ProxyServerModal extends React.PureComponent<any, any> {
                 if (!target) {
                     callback('请输入目标服务地址');
                 }
+                if (target?.includes('doraemon')) {
+                    callback('请使用 portalfront 地址，请勿使用 portalfront-doraemon 地址');
+                }
                 if (!urlReg.test(target)) {
                     callback('请输入正确格式的目标服务地址，以 http(s):// 开头');
                 }