perf: remove check

* stash

* perf: 验证用户和网域

* perf: 优化 drawer

* perf: 优化创建后 list reload

* perf: 优化创建

* perf: 替换账号管理相关页面创建、更新组件

* perf: 替换权限管理相关页面组件

* perf: 优化资产这里

* perf: 修改 reload

* perf: 替换权限管理-用户登录页面组件

* perf: 修改资产这里

* perf: 优化一点

* perf: 优化平台列表创建、更新抽屉组件不能正常显示问题

* perf: 优化平台列表创建时表单初始化数据不准确问题

* perf: 优化创建、更新平台表单报错问题

* perf: 优化列表克隆问题

* perf: 优化创建资产时抽屉组件偶尔不显示问题

* perf: 优化工作台创建、更新组件

* perf: GenericCreateUpdateDrawer 组件增加参数visible控制显示隐藏

* perf: 优化visible判断

* perf: 优化资产创建、更新

* perf: 增加el-drawer组件补丁，防止在抽屉里复制拖拽至遮罩层会使抽屉关闭问题

* perf: 优化角色列表创建、更新报错问题；优化关闭抽屉控制台报错问题

* perf: 优化作业管理创建、更新

* perf: 优化工单创建

* perf: 优化远程应用创建、更新

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: “huailei000” <2280131253@qq.com>
Co-authored-by: wangruidong <940853815@qq.com>
Co-authored-by: huailei <31801270+huailei000@users.noreply.github.com>

.github/workflows/release-drafter.yml

@@ -33,17 +33,27 @@ jobs:
           tag: ${{ steps.get_version.outputs.TAG }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.16'
-
-  build-and-release:
-    needs: create-realese
-    name: Build and Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build it and upload
-        uses: jumpserver/action-build-upload-assets@node10
+          node-version: '16.20'
+      - name: Install dependencies
+        run: yarn install
+      - name: Build web
+        run: |
+          sed -i "s@version-dev@${{ steps.get_version.outputs.TAG }}@g" src/layout/components/NavHeader/About.vue
+          yarn build
+      - name: Create Upload Assets
+        run: |
+          rm -rf build/*
+          mv lina lina-${{ steps.get_version.outputs.VERSION }}
+          tar -czf lina-${{ steps.get_version.outputs.VERSION }}.tar.gz lina-${{ steps.get_version.outputs.VERSION }}
+          echo $(md5sum lina-${{ steps.get_version.outputs.VERSION }}.tar.gz | awk '{print $1}') > build/lina-${{ steps.get_version.outputs.VERSION }}.tar.gz.md5
+          mv lina-${{ steps.get_version.outputs.VERSION }}.tar.gz build/
+      - name: Release Upload Assets
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          draft: true
+          files: |
+            build/lina-${{ steps.get_version.outputs.TAG }}.tar.gz
+            build/lina-${{ steps.get_version.outputs.TAG }}.tar.gz.md5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-realese.outputs.upload_url }}

Dockerfile

@@ -1,13 +1,28 @@
-FROM node:14.16 as stage-build
+FROM node:16.20-bullseye-slim as stage-build
 ARG TARGETARCH
+
+ARG DEPENDENCIES="                    \
+        g++                           \
+        make                          \
+        python3"
+
+ARG APT_MIRROR=http://mirrors.ustc.edu.cn
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=lina \
+    sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
+    && rm -f /etc/apt/apt.conf.d/docker-clean \
+    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
+    && echo "no" | dpkg-reconfigure dash \
+    && rm -rf /var/lib/apt/lists/*
+
 ARG NPM_REGISTRY="https://registry.npmmirror.com"
-
-WORKDIR /data
-
 RUN set -ex \
     && npm config set registry ${NPM_REGISTRY} \
     && yarn config set registry ${NPM_REGISTRY}
 
+WORKDIR /data
+
 ADD package.json yarn.lock /data
 RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=lina \
     yarn install
@@ -19,6 +34,6 @@ RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=lin
     sed -i "s@version-dev@${VERSION}@g" src/layout/components/NavHeader/About.vue \
     && yarn build
 
-FROM nginx:1.24
+FROM nginx:1.24-bullseye
 COPY --from=stage-build /data/lina /opt/lina
 COPY nginx.conf /etc/nginx/conf.d/default.conf

GITSHA

@@ -1 +0,0 @@
-58feba889adc1068882aa0ae7a26292e3610b65d

package.json

@@ -5,11 +5,10 @@
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+    "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
     "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "fix": "eslint --ext .js,.vue --fix src",

src/api/ops.js

@@ -44,3 +44,11 @@ export function renameFile(playbookId, node) {
     data: node
   })
 }
+
+export function createJob(form) {
+  return request({
+    url: '/api/v1/ops/jobs/',
+    method: 'post',
+    data: form
+  })
+}

src/api/sessions.js

@@ -8,24 +8,11 @@ export function terminateSession(data) {
   })
 }
 
-export function getSessionDetail(id) {
+export function toggleLockSession(data) {
   return request({
-    url: `/api/v1/terminal/sessions/${id}/`,
-    method: 'get'
-  })
-}
-
-export function getSessionCommands(id) {
-  return request({
-    url: `/api/v1/terminal/commands/?session_id=${id}`,
-    method: 'get'
-  })
-}
-
-export function getTerminalDetail(id) {
-  return request({
-    url: `/api/v1/terminal/terminals/${id}/`,
-    method: 'get'
+    url: '/api/v1/terminal/tasks/toggle-lock-session/',
+    method: 'post',
+    data: data
   })
 }
 

src/components/Apps/AccountCreateUpdateForm/index.vue

@@ -8,12 +8,12 @@
 </template>
 
 <script>
-import AutoDataForm from '@/components/AutoDataForm'
-import { UpdateToken, UploadSecret } from '@/components/FormFields'
-import Select2 from '@/components/FormFields/Select2'
-import AssetSelect from '@/components/AssetSelect'
+import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
+import { UpdateToken, UploadSecret } from '@/components/Form/FormFields'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
 import { encryptPassword } from '@/utils/crypto'
-import { Required, RequiredChange } from '@/components/DataForm/rules'
+import { Required, RequiredChange } from '@/components/Form/DataForm/rules'
 import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSetting.vue'
 
 export default {
@@ -55,7 +55,7 @@ export default {
         protocols: [
           {
             name: 'ssh',
-            secret_types: ['password', 'ssh_key', 'token', 'access_key']
+            secret_types: ['password', 'ssh_key', 'token', 'access_key', 'api_key']
           }
         ]
       },
@@ -67,8 +67,8 @@ export default {
         [this.$t('accounts.AccountTemplate'), ['template']],
         [this.$t('common.Basic'), ['name', 'username', 'privileged', 'su_from', 'su_from_username']],
         [this.$t('assets.Secret'), [
-          'secret_type', 'secret', 'ssh_key',
-          'token', 'access_key', 'passphrase'
+          'secret_type', 'password', 'ssh_key', 'token',
+          'access_key', 'passphrase', 'api_key'
         ]],
         [this.$t('common.Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
       ],
@@ -173,7 +173,7 @@ export default {
             return this.platform || this.asset || this.addTemplate
           }
         },
-        secret: {
+        password: {
           label: this.$t('assets.Password'),
           component: UpdateToken,
           hidden: (formValue) => formValue.secret_type !== 'password' || this.addTemplate
@@ -199,6 +199,12 @@ export default {
           component: UploadSecret,
           hidden: (formValue) => formValue.secret_type !== 'access_key' || this.addTemplate
         },
+        api_key: {
+          id: 'api_key',
+          label: this.$t('assets.ApiKey'),
+          component: UploadSecret,
+          hidden: (formValue) => formValue.secret_type !== 'api_key' || this.addTemplate
+        },
         secret_type: {
           type: 'radio-group',
           options: [],
@@ -208,11 +214,12 @@ export default {
         },
         push_now: {
           helpText: this.$t('accounts.AccountPush.WindowsPushHelpText'),
-          hidden: () => {
+          hidden: (formValue) => {
             const automation = this.iPlatform.automation || {}
             return !automation.push_account_enabled ||
               !automation.ansible_enabled ||
               !this.$hasPerm('accounts.push_account') ||
+              (formValue.secret_type === 'ssh_key' && this.iPlatform.type.value === 'windows') ||
               this.addTemplate
           }
         },
@@ -276,6 +283,10 @@ export default {
         {
           label: this.$t('assets.AccessKey'),
           value: 'access_key'
+        },
+        {
+          label: this.$t('assets.ApiKey'),
+          value: 'api_key'
         }
       ]
       const secretTypes = []
@@ -290,11 +301,13 @@ export default {
       })
     },
     confirm(form) {
-      const secretType = form.secret_type || ''
-      if (secretType !== 'password') {
-        form.secret = form[secretType]
-      }
+      const secretType = form.secret_type || 'password'
+      form.secret = form[secretType]
       form.secret = this.encryptPassword ? encryptPassword(form.secret) : form.secret
+
+      // 如果不删除会明文显示
+      delete form[secretType]
+
       if (!form.secret) {
         delete form['secret']
       }

src/components/Apps/AccountListTable/AccountCreateUpdate.vue

@@ -1,16 +1,5 @@
 <template>
-  <Dialog
-    v-if="iVisible"
-    :close-on-click-modal="false"
-    :destroy-on-close="true"
-    :show-cancel="false"
-    :show-confirm="false"
-    :title="title"
-    :visible.sync="iVisible"
-    v-bind="$attrs"
-    width="70%"
-    v-on="$listeners"
-  >
+  <GenericCreateUpdateDrawer v-bind="$attrs">
     <AccountCreateUpdateForm
       v-if="!loading"
       ref="form"
@@ -20,18 +9,18 @@
       @add="addAccount"
       @edit="editAccount"
     />
-  </Dialog>
+  </GenericCreateUpdateDrawer>
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
-import AccountCreateUpdateForm from '@/components/AccountCreateUpdateForm'
+import GenericCreateUpdateDrawer from '@/layout/components/GenericCreateUpdateDrawer/index.vue'
+import AccountCreateUpdateForm from '@/components/Apps/AccountCreateUpdateForm/index.vue'
 
 export default {
   name: 'CreateAccountDialog',
   components: {
-    Dialog,
-    AccountCreateUpdateForm
+    AccountCreateUpdateForm,
+    GenericCreateUpdateDrawer
   },
   props: {
     visible: {

src/components/Apps/AccountListTable/AccountList.vue

@@ -14,21 +14,11 @@
       @updateAuthDone="onUpdateAuthDone"
     />
     <AccountCreateUpdate
-      v-if="showAddDialog"
-      :account="account"
+      :url="url"
       :asset="iAsset"
-      :title="accountCreateUpdateTitle"
-      :visible.sync="showAddDialog"
-      @add="addAccountSuccess"
-      @bulk-create-done="showBulkCreateResult($event)"
-    />
-    <AccountCreateUpdate
-      v-if="showAddTemplateDialog"
       :account="account"
-      :add-template="true"
-      :asset="iAsset"
+      :add-template="addTemplate"
       :title="accountCreateUpdateTitle"
-      :visible.sync="showAddTemplateDialog"
       @add="addAccountSuccess"
       @bulk-create-done="showBulkCreateResult($event)"
     />
@@ -41,11 +31,11 @@
 </template>
 
 <script>
-import ListTable from '@/components/ListTable/index'
-import { ActionsFormatter } from '@/components/TableFormatters'
-import ViewSecret from './ViewSecret'
-import UpdateSecretInfo from './UpdateSecretInfo'
-import AccountCreateUpdate from './AccountCreateUpdate'
+import ListTable from '@/components/Table/ListTable/index.vue'
+import { ActionsFormatter } from '@/components/Table/TableFormatters'
+import ViewSecret from './ViewSecret.vue'
+import UpdateSecretInfo from './UpdateSecretInfo.vue'
+import AccountCreateUpdate from './AccountCreateUpdate.vue'
 import { connectivityMeta } from './const'
 import { openTaskPage } from '@/utils/jms'
 import ResultDialog from './BulkCreateResultDialog.vue'
@@ -111,7 +101,7 @@ export default {
       type: Array,
       default: () => ([
         'name', 'username', 'asset', 'privileged',
-        'secret_type', 'date_updated'
+        'secret_type', 'is_active', 'date_updated'
       ])
     },
     headerExtraActions: {
@@ -128,6 +118,7 @@ export default {
       showAddDialog: false,
       showAddTemplateDialog: false,
       createAccountResults: [],
+      addTemplate: false,
       accountCreateUpdateTitle: this.$t('assets.AddAccount'),
       iAsset: this.asset,
       account: {},
@@ -142,10 +133,6 @@ export default {
           order: '-date_updated'
         },
         columnsExclude: ['spec_info'],
-        columns: [
-          'name', 'username', 'asset', 'privileged',
-          'secret_type', 'source', 'actions'
-        ],
         columnsShow: {
           min: ['name', 'username', 'actions'],
           default: this.columnsDefault
@@ -262,7 +249,7 @@ export default {
                   name: 'Update',
                   title: this.$t('common.Update'),
                   can: this.$hasPerm('accounts.change_account') && !this.$store.getters.currentOrgIsRoot,
-                  callback: ({ row }) => {
+                  callback: ({ row, col }) => {
                     const data = {
                       ...this.asset,
                       ...row.asset
@@ -270,9 +257,10 @@ export default {
                     vm.account = row
                     vm.iAsset = data
                     vm.showAddDialog = false
+                    vm.addTemplate = false
                     vm.accountCreateUpdateTitle = this.$t('assets.UpdateAccount')
                     setTimeout(() => {
-                      vm.showAddDialog = true
+                      vm.$eventBus.$emit('showCreateUpdateDrawer', 'update', { url: this.url, row, col })
                     })
                   }
                 }
@@ -317,8 +305,9 @@ export default {
               setTimeout(() => {
                 vm.iAsset = this.asset
                 vm.account = {}
+                vm.addTemplate = false
                 vm.accountCreateUpdateTitle = this.$t('assets.AddAccount')
-                vm.showAddDialog = true
+                vm.$eventBus.$emit('showCreateUpdateDrawer', 'create', { url: vm.url })
               })
             }
           },
@@ -334,8 +323,9 @@ export default {
               setTimeout(() => {
                 vm.iAsset = this.asset
                 vm.account = {}
+                vm.addTemplate = true
                 vm.accountCreateUpdateTitle = this.$t('assets.AddAccount')
-                vm.showAddTemplateDialog = true
+                vm.$eventBus.$emit('showCreateUpdateDrawer', 'create', { url: vm.url })
               })
             }
           },

src/components/Apps/AccountListTable/BulkCreateResultDialog.vue

@@ -15,7 +15,7 @@
 
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import DataTable from '@/components/DataTable/index.vue'
+import DataTable from '@/components/Table/DataTable/index.vue'
 
 export default {
   name: 'ResultDialog',

src/components/Apps/AccountListTable/PasswordHistoryDialog.vue

@@ -4,7 +4,7 @@
 
 <script>
 import { GenericListTableDialog } from '@/layout/components'
-import { ShowKeyCopyFormatter } from '@/components/TableFormatters'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   components: {
@@ -29,7 +29,7 @@ export default {
         tableConfig: {
           id: 'history_date',
           url: `/api/v1/accounts/account-secrets/${this.account.id}/histories/`,
-          columns: ['secret', 'secret_type', 'version', 'history_date'],
+          columns: ['secret', 'version', 'history_date'],
           columnsMeta: {
             secret: {
               label: this.$t('assets.Password'),

src/components/Apps/AccountListTable/UpdateSecretInfo.vue

@@ -29,8 +29,8 @@
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
-import { UpdateToken, UploadKey } from '@/components/FormFields'
+import Dialog from '@/components/Dialog/index.vue'
+import { UpdateToken, UploadKey } from '@/components/Form/FormFields'
 import { encryptPassword } from '@/utils/crypto'
 
 export default {

src/components/Apps/AccountListTable/ViewSecret.vue

@@ -1,12 +1,5 @@
 <template>
   <div>
-    <div v-if="mfaDialogVisible">
-      <UserConfirmDialog
-        :url="url"
-        @UserConfirmCancel="exit"
-        @UserConfirmDone="getAuthInfo"
-      />
-    </div>
     <Dialog
       :destroy-on-close="true"
       :show-cancel="false"
@@ -65,10 +58,9 @@
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
-import PasswordHistoryDialog from './PasswordHistoryDialog'
-import UserConfirmDialog from '@/components/UserConfirmDialog'
-import { ShowKeyCopyFormatter } from '@/components/TableFormatters'
+import Dialog from '@/components/Dialog/index.vue'
+import PasswordHistoryDialog from './PasswordHistoryDialog.vue'
+import { ShowKeyCopyFormatter } from '@/components/Table/TableFormatters'
 import { encryptPassword } from '@/utils/crypto'
 
 export default {
@@ -76,7 +68,6 @@ export default {
   components: {
     Dialog,
     PasswordHistoryDialog,
-    UserConfirmDialog,
     ShowKeyCopyFormatter
   },
   props: {
@@ -128,7 +119,10 @@ export default {
       const url = `/api/v1/accounts/account-secrets/${this.account.id}/histories/?limit=1`
       this.$axios.get(url, { disableFlashErrorMsg: true }).then(resp => {
         this.versions = resp.count
+        this.showSecretDialog()
       })
+    } else {
+      this.showSecretDialog()
     }
   },
   methods: {
@@ -146,10 +140,10 @@ export default {
         this.$message.success(this.$tc('common.updateSuccessMsg'))
       })
     },
-    getAuthInfo() {
-      this.$axios.get(this.url, { disableFlashErrorMsg: true }).then(resp => {
-        this.secretInfo = resp
-        this.sshKeyFingerprint = resp?.spec_info?.ssh_key_fingerprint || '-'
+    showSecretDialog() {
+      return this.$axios.get(this.url, { disableFlashErrorMsg: true }).then((res) => {
+        this.secretInfo = res
+        this.sshKeyFingerprint = res?.spec_info?.ssh_key_fingerprint || '-'
         this.showSecret = true
       })
     },

src/components/Apps/AccountListTable/const.js

@@ -1,5 +1,5 @@
 import i18n from '@/i18n/i18n'
-import { ChoicesFormatter } from '@/components/TableFormatters'
+import { ChoicesFormatter } from '@/components/Table/TableFormatters'
 
 export const connectivityMeta = {
   label: i18n.t('assets.Connectivity'),

src/components/Apps/AssetRelationCard/index.vue

@@ -1,14 +1,14 @@
 <template>
-  <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
+  <IBox :fa="icon" :title="title" :type="type" v-bind="$attrs">
     <table style="width: 100%">
       <tr>
         <td colspan="2">
-          <AssetSelect ref="assetSelect" :disabled="disabled" :can-select="canSelect" />
+          <AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" />
         </td>
       </tr>
       <tr>
         <td colspan="2">
-          <el-button :type="type" size="small" :disabled="disabled" @click="addObjects">{{ $t('common.Add') }}</el-button>
+          <el-button :disabled="disabled" :type="type" size="small" @click="addObjects">{{ $t('common.Add') }}</el-button>
         </td>
       </tr>
     </table>
@@ -16,8 +16,8 @@
 </template>
 
 <script>
-import IBox from '@/components/IBox'
-import AssetSelect from '@/components/AssetSelect'
+import IBox from '@/components/IBox/index.vue'
+import AssetSelect from '@/components/Apps/AssetSelect/index.vue'
 
 export default {
   name: 'AssetRelationCard',

src/components/Apps/AssetSelect/dialog.vue

@@ -24,8 +24,8 @@
 </template>
 
 <script>
-import AssetTreeTable from '@/components/AssetTreeTable'
-import Dialog from '@/components/Dialog'
+import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
+import Dialog from '@/components/Dialog/index.vue'
 
 export default {
   componentName: 'AssetSelectDialog',
@@ -86,7 +86,7 @@ export default {
           {
             prop: 'protocols',
             formatter: function(row) {
-              const data = row.protocols.map(p => {
+              const data = row.protocols?.map(p => {
                 return <el-tag size='mini'>{p.name}/{p.port} </el-tag>
               })
               return <span> {data} </span>

src/components/Apps/AssetSelect/index.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import Select2 from '@/components/FormFields/Select2'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
 import AssetSelectDialog from './dialog.vue'
 import { b } from 'css-color-function/lib/adjusters'
 

src/components/Apps/AssetTreeTable/index.vue

@@ -1,10 +1,10 @@
 <template>
   <TreeTable
     ref="TreeList"
-    component="TabTree"
-    :table-config="tableConfig"
     :active-menu.sync="treeTableConfig.activeMenu"
+    :table-config="tableConfig"
     :tree-tab-config="treeTableConfig"
+    component="TabTree"
     v-bind="$attrs"
     v-on="$listeners"
   >
@@ -12,13 +12,13 @@
       <slot name="table" />
     </template>
     <div slot="rMenu" slot-scope="{data}">
-      <slot name="rMenu" :data="data" />
+      <slot :data="data" name="rMenu" />
     </div>
   </TreeTable>
 </template>
 
 <script>
-import TreeTable from '../TreeTable'
+import TreeTable from '../../Table/TreeTable/index.vue'
 import { setRouterQuery, setUrlParam } from '@/utils/common'
 import $ from '@/utils/jquery-vendor'
 

src/components/Apps/AutomationParams/index.vue

@@ -2,21 +2,23 @@
   <div>
     <div>
       <el-button
+        :disabled="isDisabled"
         size="mini"
         type="primary"
-        :disabled="isDisabled"
         @click="onOpenDialog"
-      >{{ $tc('common.Setting') }}</el-button>
+      >
+        {{ $tc('common.Setting') }}
+      </el-button>
     </div>
     <Dialog
       v-if="visible"
-      width="60%"
-      :visible.sync="visible"
-      :title="title"
+      :destroy-on-close="true"
       :show-cancel="false"
       :show-confirm="false"
-      :destroy-on-close="true"
+      :title="title"
+      :visible.sync="visible"
       v-bind="$attrs"
+      width="60%"
       v-on="$listeners"
     >
       <AutoDataForm
@@ -31,9 +33,11 @@
 </template>
 
 <script>
-import { Dialog, AutoDataForm } from '@/components'
+import Dialog from '../../Dialog'
+import AutoDataForm from '../../Form/AutoDataForm'
 
 export default {
+  componentName: 'AutomationParams',
   components: {
     Dialog,
     AutoDataForm
@@ -57,19 +61,26 @@ export default {
       type: Array,
       default: () => []
     },
+    platforms: {
+      type: Array,
+      default: () => []
+    },
+    method: {
+      type: String,
+      default: ''
+    },
     url: {
       type: String,
       default: `/api/v1/assets/platform-automation-methods/`
     }
   },
   data() {
+    const vm = this
     return {
       remoteMeta: {},
       visible: false,
       isDisabled: true,
       form: this.value,
-      node_ids: this.nodes,
-      asset_ids: this.assets,
       config: {
         url: this.url,
         hasSaveContinue: false,
@@ -77,7 +88,8 @@ export default {
         method: 'get',
         fields: [],
         fieldsMeta: {}
-      }
+      },
+      onFieldChangeHandler: _.debounce(vm.handleFieldChange, 1000)
     }
   },
   computed: {
@@ -87,22 +99,27 @@ export default {
   },
   watch: {
     nodes: {
-      handler(val) {
-        this.node_ids = val
-        this.onFieldChangeHandle()
+      handler() {
+        this.onFieldChangeHandler()
       },
       deep: true
     },
     assets: {
-      handler(val) {
-        this.asset_ids = val
-        this.onFieldChangeHandle()
+      handler() {
+        this.onFieldChangeHandler()
       },
       deep: true
+    },
+    platforms: {
+      handler(newVal) {
+        this.onFieldChangeHandler()
+      },
+      deep: true,
+      immediate: true
     }
   },
-  created() {
-    this.getUrlMeta()
+  async mounted() {
+    await this.getUrlMeta()
   },
   methods: {
     async getUrlMeta() {
@@ -110,35 +127,34 @@ export default {
       this.remoteMeta = data.actions[this.config.method.toUpperCase()] || {}
     },
     async getFilterPlatforms() {
-      const res = await this.$axios.post(
+      return await this.$axios.post(
         '/api/v1/assets/platforms/filter-nodes-assets/',
         {
-          'node_ids': this.node_ids,
-          'asset_ids': this.asset_ids
+          'node_ids': this.nodes,
+          'asset_ids': this.assets,
+          'platform_ids': this.platforms.map(i => i.id || i.pk || i)
         }
       )
-      return res
     },
-    async onFieldChangeHandle() {
+    async handleFieldChange() {
       const platforms = await this.getFilterPlatforms()
-      let pushAccountMethods = platforms.map(i => i.automation?.push_account_method)
+      let pushAccountMethods = platforms.map(i => i.automation[this.method])
       pushAccountMethods = _.uniq(pushAccountMethods)
       // 检测是否有可设置的推送方式
       const hasCanSettingPushMethods = _.intersection(pushAccountMethods, Object.keys(this.remoteMeta))
       this.setFormConfig(hasCanSettingPushMethods)
-      if (hasCanSettingPushMethods.length > 0) {
-        this.isDisabled = false
-        this.$emit('input', this.form)
-      } else {
-        this.isDisabled = true
-        this.$emit('input', {})
-      }
+      this.isDisabled = hasCanSettingPushMethods.length <= 0
     },
     setFormConfig(methods) {
       const newForm = {}
       const fields = []
       const fieldsMeta = {}
       this.config.fields = []
+      // Todo: 未来改成后端处理，生成 serializer, 这里就不用判断类型了
+      const typeMapper = {
+        'string': 'input',
+        'boolean': 'switch'
+      }
 
       for (const method of methods) {
         const filterField = this.remoteMeta[method] || {}
@@ -155,7 +171,7 @@ export default {
           for (const [k, v] of Object.entries(filterField.children)) {
             const item = {
               ...v,
-              type: 'input'
+              type: typeMapper[v.type] || 'input'
             }
             delete item.default
             fieldsMeta[method].fields.push(k)
@@ -172,8 +188,11 @@ export default {
       this.visible = true
     },
     onSubmit(form) {
-      this.visible = false
+      this.form = form
       this.$emit('input', form)
+      setTimeout(() => {
+        this.visible = false
+      }, 100)
       this.$log.debug('Auto push form:', form)
     }
   }

src/components/Apps/BlockedIPs/BlockedIPList.vue

@@ -0,0 +1,97 @@
+<template>
+  <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import ListTable from '@/components/Table/ListTable/index.vue'
+
+export default {
+  name: 'BlockedIPList',
+  components: {
+    ListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    }
+  },
+  data() {
+    const vm = this
+    return {
+      tableConfig: {
+        url: '/api/v1/settings/security/block-ip/',
+        columns: [
+          'ip', 'actions'
+        ],
+        columnsMeta: {
+          ip: {
+            label: this.$t('assets.ip')
+          },
+          actions: {
+            formatterArgs: {
+              hasDelete: false,
+              hasUpdate: false,
+              hasClone: false,
+              extraActions: [
+                {
+                  name: 'UnlockIP',
+                  title: this.$t('setting.Unblock'),
+                  can: this.$hasPerm('settings.change_security'),
+                  type: 'primary',
+                  callback: ({ row }) => {
+                    this.$axios.post(
+                      '/api/v1/settings/security/unlock-ip/',
+                      { ips: [row.ip] }
+                    ).then(() => {
+                      vm.$message.success(this.$tc('common.UnlockSuccessMsg'))
+                      vm.$refs.ListTable.reloadTable()
+                    })
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasExport: false,
+        hasImport: false,
+        hasCreate: false,
+        hasSearch: false,
+        hasRefresh: true,
+        hasBulkDelete: false,
+        hasBulkUpdate: false,
+        hasLeftActions: true,
+        hasRightActions: true,
+        extraMoreActions: [
+          {
+            name: 'UnlockSelected',
+            title: this.$t('setting.BulkUnblock'),
+            type: 'primary',
+            can: ({ selectedRows }) => {
+              return selectedRows.length > 0
+            },
+            callback: function({ selectedRows }) {
+              vm.$axios.post(
+                '/api/v1/settings/security/unlock-ip/',
+                {
+                  ips: selectedRows.map(v => { return v.ip })
+                }
+              ).then(res => {
+                vm.$message.success(vm.$tc('common.UnlockSuccessMsg'))
+                vm.$refs.ListTable.reloadTable()
+              })
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>

src/components/Apps/BlockedIPs/index.vue

@@ -0,0 +1,75 @@
+<template>
+  <div>
+    <div>
+      <el-button
+        size="mini"
+        type="primary"
+        @click="onOpenDialog"
+      >{{ $tc('common.View') }}</el-button>
+    </div>
+    <Dialog
+      v-if="visible"
+      :visible.sync="visible"
+      :title="title"
+      width="40%"
+      :show-cancel="false"
+      :show-confirm="false"
+      :destroy-on-close="true"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <BlockedIPList />
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import { Dialog } from '@/components'
+import BlockedIPList from '@/components/Apps/BlockedIPs/BlockedIPList'
+
+export default {
+  componentName: 'BlockedIPs',
+  components: {
+    BlockedIPList,
+    Dialog
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({})
+    },
+    title: {
+      type: String,
+      default: function() {
+        return this.$t('setting.BlockedIPS')
+      }
+    },
+    url: {
+      type: String,
+      default: `/api/v1/assets/platform-automation-methods/`
+    }
+  },
+  data() {
+    return {
+      remoteMeta: {},
+      visible: false,
+      form: this.value,
+      config: {
+        url: this.url,
+        hasSaveContinue: false,
+        hasButtons: true,
+        fields: [],
+        fieldsMeta: {}
+      }
+    }
+  },
+  methods: {
+    onOpenDialog() {
+      this.visible = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/components/Apps/GatewayDialog/index.vue

@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import Dialog from '@/components/Dialog'
+import Dialog from '@/components/Dialog/index.vue'
 import { openTaskPage } from '@/utils/jms'
 
 export default {

src/components/Apps/GrantedAssets/index.vue

@@ -3,8 +3,8 @@
 </template>
 
 <script type="text/jsx">
-import TreeTable from '../TreeTable'
-import { DetailFormatter } from '@/components/TableFormatters'
+import TreeTable from '../../Table/TreeTable/index.vue'
+import { DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'GrantedAssets',

src/components/Apps/ManyJsonTabs/AssetJsonTab.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import ListTable from '@/components/ListTable/index.vue'
+import ListTable from '@/components/Table/ListTable/index.vue'
 import { toM2MJsonParams } from '@/utils/jms'
 
 export default {

src/components/Apps/ManyJsonTabs/UserJsonTab.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import ListTable from '@/components/ListTable/index.vue'
+import ListTable from '@/components/Table/ListTable/index.vue'
 import { toM2MJsonParams } from '@/utils/jms'
 
 export default {

src/components/Apps/ResourceActivity/index.vue

@@ -30,8 +30,8 @@
 </template>
 
 <script>
-import IBox from '@/components/IBox'
-import DiffDetail from '@/components/Dialog/DiffDetail'
+import IBox from '@/components/IBox/index.vue'
+import DiffDetail from '@/components/Dialog/DiffDetail.vue'
 import { openTaskPage } from '@/utils/jms'
 
 export default {

src/components/Apps/UserConfirmDialog/index.vue

@@ -0,0 +1,224 @@
+<template>
+  <Dialog
+    :close-on-click-modal="false"
+    :destory-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="title"
+    :visible.sync="visible"
+    class="dialog-content"
+    v-bind="$attrs"
+    width="600px"
+    @confirm="visible = false"
+    v-on="$listeners"
+  >
+    <div v-if="confirmTypeRequired === 'relogin'">
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-alert
+            :title="$tc('auth.ReLoginTitle')"
+            center
+            style="margin-bottom: 20px;"
+            type="error"
+          />
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24">
+          <el-button class="confirm-btn" size="mini" type="primary" @click="logout">
+            {{ this.$t('auth.ReLogin') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <div v-else>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24" :span="24" class="add">
+          <el-select
+            v-model="subTypeSelected"
+            style="width: 100%; margin-bottom: 20px;"
+            @change="handleSubTypeChange"
+          >
+            <el-option
+              v-for="item of subTypeChoices"
+              :key="item.name"
+              :disabled="item.disabled"
+              :label="item.display_name"
+              :value="item.name"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 0 auto;">
+        <el-col :md="24" :sm="24" style="display: flex; margin-bottom: 20px;">
+          <el-input v-model="secretValue" :placeholder="inputPlaceholder" :show-password="showPassword" />
+          <span v-if="subTypeSelected === 'sms'" style="margin: -1px 0 0 20px;">
+            <el-button
+              :disabled="smsBtnDisabled"
+              size="mini"
+              style="line-height:20px; float: right;"
+              type="primary"
+              @click="sendSMSCode"
+            >
+              {{ smsBtnText }}
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" style="margin: 10px auto;">
+        <el-col :md="24" :sm="24">
+          <el-button class="confirm-btn" size="mini" type="primary" @click="handleConfirm">
+            {{ this.$t('common.Confirm') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </Dialog>
+</template>
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+
+export default {
+  name: 'UserConfirmDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    url: {
+      type: String,
+      default: ''
+    },
+    handler: {
+      type: Function,
+      default: null
+    }
+  },
+  data() {
+    return {
+      title: this.$t('common.CurrentUserVerify'),
+      smsWidth: 0,
+      subTypeSelected: '',
+      inputPlaceholder: '',
+      smsBtnText: this.$t('common.SendVerificationCode'),
+      smsBtnDisabled: false,
+      confirmTypeRequired: '',
+      subTypeChoices: [],
+      secretValue: '',
+      visible: false,
+      callback: null,
+      cancel: null,
+      processing: false
+    }
+  },
+  computed: {
+    showPassword() {
+      return this.confirmTypeRequired === 'password'
+    }
+  },
+  mounted() {
+    // const onRecvCallback = _.debounce(this.performConfirm, 500)
+    this.$eventBus.$on('showConfirmDialog', this.performConfirm)
+  },
+  methods: {
+    handleSubTypeChange(val) {
+      this.inputPlaceholder = this.subTypeChoices.filter(item => item.name === val)[0]?.placeholder
+      this.smsWidth = val === 'sms' ? 6 : 0
+    },
+    performConfirm({ response, callback, cancel }) {
+      if (this.processing || this.visible) {
+        return
+      }
+      this.processing = true
+      this.callback = callback
+      this.cancel = cancel
+      this.$log.debug('perform confirm action')
+      const confirmType = response.data?.code
+      const confirmUrl = '/api/v1/authentication/confirm/'
+      this.$axios.get(confirmUrl, { params: { confirm_type: confirmType }}).then((data) => {
+        this.confirmTypeRequired = data.confirm_type
+
+        if (this.confirmTypeRequired === 'relogin') {
+          this.$axios.post(confirmUrl, { 'confirm_type': 'relogin', 'secret_key': 'x' }).then(() => {
+            this.callback()
+            this.visible = false
+          }).catch(() => {
+            this.title = this.$t('auth.NeedReLogin')
+            this.visible = true
+          })
+        }
+        this.subTypeChoices = data.content
+        const defaultSubType = this.subTypeChoices.filter(item => !item.disabled)[0]
+        this.subTypeSelected = defaultSubType.name
+        this.inputPlaceholder = defaultSubType.placeholder
+        this.visible = true
+      }).catch((err) => {
+        const data = err.response?.data
+        const msg = data?.error || data?.detail || data?.msg || this.$t('common.GetConfirmTypeFailed')
+        this.$message.error(msg)
+        this.cancel(err)
+      }).finally(() => {
+        this.processing = false
+      })
+    },
+    logout() {
+      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
+    },
+    sendSMSCode() {
+      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: 'sms' }).then(res => {
+        this.$message.success(this.$tc('common.VerificationCodeSent'))
+        let time = 60
+        const interval = setInterval(() => {
+          const originText = this.smsBtnText
+          this.smsBtnText = this.$t('common.Pending') + `: ${time}`
+          this.smsBtnDisabled = true
+          time -= 1
+
+          if (time === 0) {
+            this.smsBtnText = originText
+            this.smsBtnDisabled = false
+            clearInterval(interval)
+          }
+        }, 1000)
+      })
+    },
+    handleConfirm() {
+      if (this.confirmTypeRequired === 'relogin') {
+        return this.logout()
+      }
+      if (this.subTypeSelected === 'otp' && this.secretValue.length !== 6) {
+        return this.$message.error(this.$tc('common.MFAErrorMsg'))
+      }
+      const data = {
+        confirm_type: this.confirmTypeRequired,
+        mfa_type: this.confirmTypeRequired === 'mfa' ? this.subTypeSelected : '',
+        secret_key: this.secretValue
+      }
+      this.$axios.post(`/api/v1/authentication/confirm/`, data).then(res => {
+        this.callback()
+        this.visible = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .dialog-content >>> .el-dialog__footer {
+    padding: 0;
+  }
+
+  .dialog-content >>> .el-dialog {
+    padding: 8px;
+
+    .el-dialog__body {
+      padding-top: 30px;
+      padding-bottom: 30px;
+    }
+  }
+
+  .confirm-btn {
+    width: 100%;
+    line-height: 20px;
+  }
+
+</style>

src/components/Cards/DetailCard/ItemValue.vue

@@ -17,6 +17,11 @@ export default {
       default: null
     }
   },
+  data() {
+    return {
+      formatterData: ''
+    }
+  },
   computed: {
     displayValue() {
       if ([null, undefined, ''].includes(this.value)) {
@@ -65,7 +70,17 @@ export default {
   },
   render(h) {
     if (typeof this.formatter === 'function') {
-      return this.formatter(this.item, this.value)
+      const data = this.formatter(this.item, this.value)
+      if (data instanceof Promise) {
+        data.then(res => {
+          this.formatterData = res
+        })
+      } else {
+        this.formatterData = data
+      }
+      return (
+        <span>{this.formatterData}</span>
+      )
     }
     if (this.value instanceof Array) {
       const newArr = this.value || []

src/components/Cards/DetailCard/auto.vue

@@ -1,9 +1,9 @@
 <template>
-  <DetailCard v-if="!loading && hasObject" :items="items" v-bind="$attrs" />
+  <DetailCard v-if="!loading && hasObject && items.length > 0" :items="items" v-bind="$attrs" />
 </template>
 
 <script>
-import DetailCard from './index'
+import DetailCard from './index.vue'
 import { copy, toSafeLocalDateStr } from '@/utils/common'
 
 export default {

src/components/Cards/DetailCard/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <IBox :title="title" :fa="fa">
+  <IBox :fa="fa" :title="title">
     <el-form class="content" label-position="left" label-width="25%">
       <el-form-item v-for="item in items" :key="item.key" :label="item.key">
-        <ItemValue class="item-value" :value="item.value" v-bind="item" />
+        <ItemValue :value="item.value" class="item-value" v-bind="item" />
       </el-form-item>
     </el-form>
     <slot />
@@ -10,8 +10,8 @@
 </template>
 
 <script>
-import IBox from '../IBox'
-import ItemValue from './ItemValue'
+import IBox from '../../IBox/index.vue'
+import ItemValue from './ItemValue.vue'
 
 export default {
   name: 'DetailCard',

src/components/Cards/RelationCard/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <IBox :type="type" :title="title" v-bind="$attrs">
-    <table style="width: 100%;table-layout:fixed;" class="CardTable">
+  <IBox :title="title" :type="type" v-bind="$attrs">
+    <table class="CardTable" style="width: 100%;table-layout:fixed;">
       <tr>
         <td colspan="2">
           <Select2 ref="select2" v-model="select2.value" :disabled="iDisabled" v-bind="select2" />
@@ -9,7 +9,7 @@
       <slot />
       <tr>
         <td colspan="2">
-          <el-button :type="type" size="small" :loading="submitLoading" :disabled="iDisabled" @click="addObjects">
+          <el-button :disabled="iDisabled" :loading="submitLoading" :type="type" size="small" @click="addObjects">
             {{ $t('common.Add') }}
           </el-button>
         </td>
@@ -17,12 +17,12 @@
       <template v-if="showHasObjects">
         <tr v-for="obj of iHasObjects" :key="obj.value" class="item">
           <td style="width: 100%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-            <el-tooltip style="margin: 4px;" effect="dark" :content="obj.label" placement="left">
+            <el-tooltip :content="obj.label" effect="dark" placement="left" style="margin: 4px;">
               <b>{{ obj.label }}</b>
             </el-tooltip>
           </td>
           <td>
-            <el-button size="mini" :disabled="iDisabled" type="danger" style="float: right" @click="removeObject(obj)">
+            <el-button :disabled="iDisabled" size="mini" style="float: right" type="danger" @click="removeObject(obj)">
               <i class="fa fa-minus" />
             </el-button>
           </td>
@@ -30,7 +30,7 @@
       </template>
       <tr v-if="params.hasMore && showHasMore" class="item">
         <td colspan="2">
-          <el-button :type="type" :disabled="iDisabled" size="small" style="width: 100%" @click="loadMore">
+          <el-button :disabled="iDisabled" :type="type" size="small" style="width: 100%" @click="loadMore">
             <i class="fa fa-arrow-down" />
             {{ $t('common.More') }}
           </el-button>
@@ -41,10 +41,11 @@
 </template>
 
 <script>
-import Select2 from '../FormFields/Select2'
-import IBox from '../IBox'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import IBox from '../../IBox/index.vue'
 import { createSourceIdCache } from '@/api/common'
 import { mapGetters } from 'vuex'
+
 export default {
   name: 'RelationCard',
   components: {

src/components/Form/AutoDataForm/components/NestedField.vue

@@ -1,16 +1,19 @@
 <template>
   <DataForm
+    v-if="!loading"
     :disabled="disabled"
     :fields="iFields"
     :form="value"
     style="margin-left: -26%;margin-right: -6%"
     v-bind="kwargs"
+    @change="updateValue($event)"
+    @input="updateValue($event)"
     v-on="$listeners"
   />
 </template>
 
 <script>
-import DataForm from '@/components/DataForm'
+import DataForm from '@/components/Form/DataForm/index.vue'
 
 export default {
   name: 'NestedField',
@@ -37,6 +40,8 @@ export default {
   },
   data() {
     return {
+      loading: false,
+      formJson: JSON.stringify(this.value),
       kwargs: {
         hasReset: false,
         hasSaveContinue: false,
@@ -65,7 +70,26 @@ export default {
       return fields
     }
   },
+  watch: {
+    value: {
+      handler(val) {
+        const valJson = JSON.stringify(val)
+        // 如果不想等，证明是 value 自己变化导致的， 需要重新渲染
+        if (valJson !== this.formJson) {
+          this.loading = true
+          setTimeout(() => {
+            this.loading = false
+          }, 10)
+        }
+      },
+      deep: true
+    }
+  },
   methods: {
+    updateValue(val) {
+      this.formJson = JSON.stringify(val)
+      this.$emit('input', val)
+    },
     objectToString(obj) {
       let data = ''
       // eslint-disable-next-line prefer-const

src/components/Form/AutoDataForm/index.vue

@@ -23,9 +23,9 @@
 </template>
 
 <script>
-import DataForm from '../DataForm'
-import FormGroupHeader from '@/components/FormGroupHeader'
-import { FormFieldGenerator } from '@/components/AutoDataForm/utils'
+import DataForm from '../DataForm/index.vue'
+import FormGroupHeader from '@/components/Form/FormGroupHeader/index.vue'
+import { FormFieldGenerator } from '@/components/Form/AutoDataForm/utils'
 
 export default {
   name: 'AutoDataForm',
@@ -67,6 +67,9 @@ export default {
     }
   },
   computed: {
+    dataForm() {
+      return this.$refs.dataForm
+    },
     iForm() {
       const iForm = {}
       Object.entries(this.form).forEach(([key, value]) => {

src/components/Form/AutoDataForm/utils.js

@@ -1,13 +1,13 @@
 import Vue from 'vue'
-import Select2 from '@/components/FormFields/Select2'
-import ObjectSelect2 from '@/components/FormFields/NestedObjectSelect2'
-import NestedField from '@/components/AutoDataForm/components/NestedField'
-import Switcher from '@/components/FormFields/Switcher'
-import rules from '@/components/DataForm/rules'
-import BasicTree from '@/components/FormFields/BasicTree'
-import JsonEditor from '@/components/FormFields/JsonEditor'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import ObjectSelect2 from '@/components/Form/FormFields/NestedObjectSelect2.vue'
+import NestedField from '@/components/Form/AutoDataForm/components/NestedField.vue'
+import Switcher from '@/components/Form/FormFields/Switcher.vue'
+import rules from '@/components/Form/DataForm/rules'
+import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
+import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
 import { assignIfNot } from '@/utils/common'
-import TagInput from '@/components/FormFields/TagInput.vue'
+import TagInput from '@/components/Form/FormFields/TagInput.vue'
 
 export class FormFieldGenerator {
   constructor(emit) {

src/components/Form/CronTab/components/Crontab-Week.vue

@@ -25,7 +25,9 @@
           multiple
           style="width:100%"
         >
-          <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{ item }}</el-option>
+          <el-option v-for="(item,index) of weekList" :key="index" :value="index === 6 ? 0 : (index + 1)">
+            {{ item }}
+          </el-option>
         </el-select>
       </el-radio>
     </el-form-item>

src/components/Form/DataForm/index.vue

@@ -1,19 +1,22 @@
 <template>
-  <ElFormRender
-    ref="form"
-    :class="mobile? 'mobile' : 'desktop'"
-    :content="fields"
-    :form="basicForm"
-    :label-position="labelPosition"
-    label-width="20%"
-    v-bind="$attrs"
-    v-on="$listeners"
-  >
-    <!-- slot 透传 -->
-    <slot v-for="item in fields" :slot="`id:${item.id}`" :name="`id:${item.id}`" />
-    <slot v-for="item in fields" :slot="`$id:${item.id}`" :name="`$id:${item.id}`" />
+  <div>
+    <ElFormRender
+      ref="form"
+      :class="mobile? 'mobile' : 'desktop'"
+      :content="fields"
+      :form="basicForm"
+      :label-position="labelPosition"
+      class="form-fields"
+      label-width="22%"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <!-- slot 透传 -->
+      <slot v-for="item in fields" :slot="`id:${item.id}`" :name="`id:${item.id}`" />
+      <slot v-for="item in fields" :slot="`$id:${item.id}`" :name="`$id:${item.id}`" />
 
-    <el-form-item v-if="hasButtons" class="form-buttons">
+    </ElFormRender>
+    <div v-if="hasButtons" class="form-buttons">
       <el-button
         v-for="button in moreButtons"
         :key="button.title"
@@ -38,14 +41,14 @@
         v-if="defaultButton"
         :disabled="!canSubmit"
         :loading="isSubmitting"
-        size="small"
+        :size="submitBtnSize"
         type="primary"
         @click="submitForm('form')"
       >
-        {{ $t('common.Submit') }}
+        {{ submitBtnText }}
       </el-button>
-    </el-form-item>
-  </ElFormRender>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -73,6 +76,16 @@ export default {
       type: Boolean,
       default: true
     },
+    submitBtnSize: {
+      type: String,
+      default: 'small'
+    },
+    submitBtnText: {
+      type: String,
+      default() {
+        return this.$t('common.Submit')
+      }
+    },
     hasSaveContinue: {
       type: Boolean,
       default: true
@@ -126,8 +139,8 @@ export default {
       })
     },
     // 重置表单
-    resetForm(formName) {
-      this.$refs[formName].resetFields()
+    resetForm() {
+      this.$refs['form'].resetFields()
     },
     handleClick(button) {
       const callback = button.callback || function(values, form) {
@@ -138,6 +151,7 @@ export default {
       callback(values, form, button)
     },
     getFormValue() {
+      return this.$refs.form.getFormValue()
     }
   }
 }
@@ -149,7 +163,7 @@ export default {
   }
 
   .el-form ::v-deep .el-form-item__content {
-    width: 75%;
+    width: 73%;
   }
 
   .mobile.el-form ::v-deep .el-form-item__content {
@@ -187,5 +201,7 @@ export default {
 
   .form-buttons {
     margin-top: 20px;
+    margin-left: 22%;
+    margin-bottom: 20px;
   }
 </style>

src/components/Form/DataForm/rules/index.js

@@ -53,13 +53,27 @@ export const matchAlphanumericUnderscore = {
   trigger: ['blur', 'change']
 }
 
+// 不能包含()
+export const MatchExcludeParenthesis = {
+  validator: (rule, value, callback) => {
+    value = value?.trim()
+    if (!/^[^()]*$/.test(value)) {
+      callback(new Error(i18n.t('common.notParenthesis')))
+    } else {
+      callback()
+    }
+  },
+  trigger: ['blur', 'change']
+}
+
 export default {
   IpCheck,
   Required,
   RequiredChange,
   EmailCheck,
   specialEmojiCheck,
-  matchAlphanumericUnderscore
+  matchAlphanumericUnderscore,
+  MatchExcludeParenthesis
 }
 
 export const JsonRequired = {

src/components/Form/FormFields/AllOrSpec.vue

@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <el-radio-group v-model="type" @input="handleTypeChange">
+      <el-radio v-for="tp of types" :key="tp.name" :label="tp.name">
+        {{ tp.label }}
+      </el-radio>
+    </el-radio-group>
+    <Select2 v-if="type === 'spec'" v-model="selected" v-bind="select2" @change="onChangeEmit" />
+  </div>
+</template>
+
+<script>
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+
+export default {
+  name: 'AllOrSpec',
+  components: { Select2 },
+  props: {
+    value: {
+      type: [Array],
+      default: () => ([])
+    },
+    select2: {
+      type: Object,
+      default: () => ({})
+    },
+    resource: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      type: 'all', // all, selected
+      types: [
+        { name: 'all', label: this.$t('common.All') },
+        { name: 'spec', label: this.$t('common.Spec') + this.$t('common.WordSep') + this.resource }
+      ],
+      selected: []
+    }
+  },
+  computed: {
+    iValue() {
+      if (this.type === 'all') {
+        return ['all']
+      } else {
+        return this.selected
+      }
+    }
+
+  },
+  mounted() {
+    if (!this.value || this.value.length === 0) {
+      return
+    }
+    console.log('Value: ', this.value)
+    if (this.value.indexOf('all') > -1) {
+      this.type = 'all'
+    } else {
+      this.type = 'spec'
+      this.selected = this.value
+    }
+  },
+  methods: {
+    onChangeEmit() {
+      this.$emit('input', this.iValue)
+    },
+    handleTypeChange() {
+      this.$emit('input', this.iValue)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Form/FormFields/AttrInput.vue

@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <GenericCreateUpdateForm
+      class="attr-form"
+      v-bind="formConfig"
+      @submit="onSubmit"
+    />
+    <DataTable :config="tableConfig" class="attr-list" />
+  </div>
+</template>
+
+<script>
+import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm'
+import DataTable from '@/components/Table/DataTable/index.vue'
+
+export default {
+  name: 'AttrInput',
+  components: { DataTable, GenericCreateUpdateForm },
+  props: {
+    formConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    tableConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    beforeSubmit: {
+      type: Function,
+      default: (val) => { return true }
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    onSubmit(value) {
+      if (this.beforeSubmit(value)) {
+        const clonedValue = JSON.parse(JSON.stringify(value))
+        this.tableConfig.totalData.push(clonedValue)
+        this.$emit('submit', this.tableConfig.totalData)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.attr-form {
+  >>> .el-select {
+    width: 100%;
+  }
+  >>> .el-form-item__content {
+    width: 100%;
+  }
+  >>> .form-buttons {
+    margin: auto;
+  }
+}
+</style>
+

src/components/Form/FormFields/BasicTree.vue

@@ -85,7 +85,7 @@ export default {
           <span>{label} </span>
           {helpText
             ? (<el-tooltip content={helpText} placement='top'>
-              <i class='fa fa-info-circle'></i>
+              <i class='fa fa-question-circle-o'></i>
             </el-tooltip>) : ''}
         </span>)
     }

src/components/Form/FormFields/CodeEditor.vue

@@ -16,9 +16,8 @@
           >
             <i :class="item.icon" style="margin-right: 4px;" />{{ item.name }}
           </el-button>
-
           <el-autocomplete
-            v-if="item.type === 'input' && item.el.autoComplete"
+            v-if="item.type === 'input' &&item.el && item.el.autoComplete"
             v-model="item.value"
             :placeholder="item.placeholder"
             :fetch-suggestions="item.el.query"
@@ -27,7 +26,14 @@
             @select="item.callback(item.value)"
             @change="item.callback(item.value)"
           />
-
+          <el-input
+            v-else-if="item.type==='input'"
+            v-model="item.value"
+            :placeholder="item.placeholder"
+            class="inline-input"
+            size="mini"
+            @change="item.callback(item.value)"
+          />
           <div v-if="item.type==='select' && item.el && item.el.create" class="select-content">
             <span class="filter-label">
               {{ item.name }}:

src/components/Form/FormFields/DynamicInput.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div v-for="(command, index) in value" :key="index" :prop="'value.' + index + '.value'" class="command-item">
-      <el-input v-model="value[index]" size="mini">
+    <div v-for="(command, index) in iValue" :key="index" :prop="'iValue.' + index + '.value'" class="command-item">
+      <el-input v-model="iValue[index]" size="mini">
         <template slot="prepend"> {{ inputTitle + ' ' + (index + 1) }}</template>
       </el-input>
       <div class="input-button">
@@ -14,7 +14,7 @@
           @click="handleDelete(command)"
         />
         <el-button
-          v-if="index === value.length - 1"
+          v-if="index === iValue.length - 1"
           icon="el-icon-plus"
           size="mini"
           style="flex-shrink: 0;"
@@ -27,6 +27,7 @@
 </template>
 
 <script>
+
 export default {
   props: {
     value: {
@@ -39,20 +40,32 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      iValue: ['']
+    }
+  },
+  watch: {
+    iValue: {
+      handler(v) {
+        this.$emit('input', Array.from(v))
+      }
+    }
+  },
+  created() {
+    this.iValue = Array.from(this.value)
   },
   methods: {
     handleDelete(command) {
-      const index = this.value.indexOf(command)
+      const index = this.iValue.indexOf(command)
       if (index !== -1) {
-        this.value.splice(index, 1)
+        this.iValue.splice(index, 1)
       }
     },
     handleAdd() {
-      this.value.push('')
+      this.iValue.push('')
     },
     deleteDisabled() {
-      return this.value.length <= 1
+      return this.iValue.length <= 1
     }
   }
 }

src/components/Form/FormFields/JSONManyToManySelect/AttrFormDialog.vue

@@ -18,10 +18,10 @@
 </template>
 
 <script>
-import DataForm from '@/components/DataForm/index.vue'
+import DataForm from '@/components/Form/DataForm/index.vue'
 import Dialog from '@/components/Dialog/index.vue'
-import ValueField from '@/components/FormFields/JSONManyToManySelect/ValueField.vue'
-import { attrMatchOptions, typeMatchMapper } from './const'
+import ValueField from '@/components/Form/FormFields/JSONManyToManySelect/ValueField.vue'
+import { attrMatchOptions, typeMatchMapper } from '@/components/const'
 
 export default {
   name: 'AttrFormDialog',

src/components/Form/FormFields/JSONManyToManySelect/AttrMatchResultDialog.vue

@@ -13,7 +13,7 @@
 
 <script>
 import Dialog from '@/components/Dialog/index.vue'
-import ListTable from '@/components/ListTable/index.vue'
+import ListTable from '@/components/Table/ListTable/index.vue'
 
 export default {
   name: 'AttrMatchResultDialog',

src/components/Form/FormFields/JSONManyToManySelect/ValueField.vue

@@ -8,9 +8,9 @@
 </template>
 
 <script>
-import TagInput from '@/components/FormFields/TagInput.vue'
-import Select2 from '@/components/FormFields/Select2.vue'
-import Switcher from '@/components/FormFields/Switcher.vue'
+import TagInput from '@/components/Form/FormFields/TagInput.vue'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import Switcher from '@/components/Form/FormFields/Switcher.vue'
 
 export default {
   name: 'ValueField',
@@ -81,7 +81,6 @@ export default {
     changeValueType() {
       this.loading = true
       this.type = this.getType()
-      console.log('Type is: ', this.type, this.match)
       this.$nextTick(() => {
         this.loading = false
       })
@@ -89,15 +88,15 @@ export default {
     getType() {
       const attrType = this.attr.type || 'str'
       this.$log.debug('Value field attr type: ', attrType, this.attr, this.match)
-      if (attrType === 'm2m') {
+      if (['m2m', 'fk', 'select'].includes(attrType)) {
         return 'select'
       } else if (attrType === 'bool') {
         return 'bool'
-      } else if (attrType === 'select') {
-        return 'select'
       }
       if (['in', 'ip_in'].includes(this.match)) {
         return 'array'
+      } else if (this.match.startsWith('m2m')) {
+        return 'select'
       } else {
         return 'string'
       }

src/components/Form/FormFields/JSONManyToManySelect/ValueFormatter.vue

@@ -3,11 +3,13 @@
     <i v-if="value" class="fa fa-check text-primary" />
     <i v-else class="fa fa-times text-danger" />
   </span>
-  <span v-else :title="value">{{ value }}</span>
+  <span v-else :title="value">
+    {{ value }}
+  </span>
 </template>
 
 <script>
-import BaseFormatter from '@/components/TableFormatters/base.vue'
+import BaseFormatter from '@/components/Table/TableFormatters/base.vue'
 import { setUrlParam } from '@/utils/common'
 
 export default {
@@ -32,44 +34,53 @@ export default {
       value: ''
     }
   },
-  computed: {
-  },
   watch: {
     cellValue: {
-      handler(val) {
+      handler() {
+        this.getValue()
+      },
+      deep: true
+    },
+    formatterArgs: {
+      handler() {
+        this.getValue()
+      },
+      deep: true
+    },
+    row: {
+      handler() {
         this.getValue()
       },
-      immediate: true,
       deep: true
     }
   },
   mounted() {
-    this.getValue()
+    setTimeout(() => {
+      this.getValue()
+    }, 100)
   },
   methods: {
     async getValue() {
       this.attr = this.formatterArgs.attrs.find(attr => attr.name === this.row.name)
-      this.match = this.row.match
+      const match = this.row.match
       this.$log.debug('ValueFormatter: ', this.attr, this.row.name)
       if (this.attr.type === 'm2m') {
         const url = setUrlParam(this.attr.el.url, 'ids', this.cellValue.join(','))
-        const data = await this.$axios.get(url)
+        const data = await this.$axios.get(url) || []
         if (data.length > 0) {
           const displayField = this.attr.el.displayField || 'name'
           this.value = data.map(item => item[displayField]).join(', ')
         }
       } else if (this.attr.type === 'select') {
-        this.value = this.attr.el.options
-          .filter(item => this.cellValue.includes(item.value))
-          .map(item => item.label).join(',')
-      } else if (['in', 'ip_in'].includes(this.match)) {
+        const options = this.attr.el.options || []
+        const items = options.filter(item => this.cellValue.includes(item.value))
+        this.value = items.map(item => item.label).join(', ')
+      } else if (['in', 'ip_in'].includes(match)) {
         this.value = this.cellValue.join(', ')
       } else {
         this.value = this.cellValue
       }
-      this.loading = false
     }
-
   }
 }
 </script>

src/components/Form/FormFields/JSONManyToManySelect/index.vue

@@ -38,12 +38,12 @@
 
 <script>
 import Select2 from '../Select2.vue'
-import DataTable from '@/components/DataTable/index.vue'
+import DataTable from '@/components/Table/DataTable/index.vue'
 import ValueFormatter from './ValueFormatter.vue'
 import AttrFormDialog from './AttrFormDialog.vue'
 import AttrMatchResultDialog from './AttrMatchResultDialog.vue'
 import { setUrlParam } from '@/utils/common'
-import { attrMatchOptions } from './const'
+import { attrMatchOptions } from '@/components/const'
 import { toM2MJsonParams } from '@/utils/jms'
 
 export default {

src/components/Form/FormFields/JsonEditor.vue

@@ -4,6 +4,7 @@
       v-model="resultInfo"
       :mode="'code'"
       :show-btns="false"
+      :class="{resize: resize === 'vertical'}"
       @json-change="onJsonChange"
       @json-save="onJsonSave"
       @has-error="onError"
@@ -20,6 +21,13 @@ export default {
     value: {
       type: [String, Object, Array],
       default: () => ({})
+    },
+    resize: {
+      type: String,
+      validator: (value) => {
+        return ['none', 'vertical'].indexOf(value) !== -1
+      },
+      default: 'vertical'
     }
   },
   data() {
@@ -46,15 +54,21 @@ export default {
     },
     onError: _.debounce(function(value) {
       this.$message.error(this.$tc('common.FormatError'))
-    }, 1100)
+    }, 1500)
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/variables.scss";
+  @import "~@/styles/variables";
 
   .json-editor {
+    .resize {
+      & > > > .jsoneditor {
+      resize: vertical;
+      cursor: s-resize;
+      }
+    }
     & > > > .jsoneditor {
       border: 1px solid #e5e6e7;
     }

src/components/Form/FormFields/NestedObjectSelect2.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import Select2 from './Select2'
+import Select2 from './Select2.vue'
 
 export default {
   name: 'NestedObjectSelect2',

src/components/Form/FormFields/PasswordRule.vue

@@ -0,0 +1,101 @@
+<template>
+  <div style="display: block">
+    <el-button size="mini" type="primary" @click="visible=true">
+      {{ $t('common.Setting') }}
+    </el-button>
+    <Dialog
+      :destroy-on-close="true"
+      :title="$tc('common.PasswordRule')"
+      :visible.sync="visible"
+      width="600px"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      @open="handleOpen"
+    >
+      <AutoDataForm ref="dataform" v-bind="form" />
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog/index.vue'
+import AutoDataForm from '@/components/Form/AutoDataForm/index.vue'
+
+export default {
+  name: 'PasswordRule',
+  components: { Dialog, AutoDataForm },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({
+        length: 16
+      })
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      form: {
+        url: '',
+        hasButtons: false,
+        hasReset: false,
+        hasSaveContinue: false,
+        form: Object.assign({}, this.value),
+        fields: [
+          {
+            id: 'length',
+            label: this.$t('common.Length'),
+            type: 'input-number',
+            el: {
+              min: 8,
+              max: 30
+            }
+          },
+          {
+            id: 'uppercase',
+            label: this.$t('common.Uppercase'),
+            type: 'switch'
+          },
+          {
+            id: 'lowercase',
+            label: this.$t('common.Lowercase'),
+            type: 'switch'
+          },
+          {
+            id: 'digit',
+            label: this.$t('common.Digit'),
+            type: 'switch'
+          },
+          {
+            id: 'symbol',
+            label: this.$t('common.SpecialSymbol'),
+            type: 'switch'
+          }
+        ]
+      }
+    }
+  },
+  methods: {
+    handleConfirm() {
+      const formValue = this.$refs.dataform.dataForm.getFormValue()
+      this.form.form = formValue
+      this.$emit('input', formValue)
+      setTimeout(() => {
+        this.visible = false
+      }, 100)
+    },
+    handleCancel() {
+      this.$refs.dataform.dataForm.resetForm()
+      setTimeout(() => {
+        this.visible = false
+      }, 100)
+    },
+    handleOpen() {
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Form/FormFields/ProtocolSelector/ProtocolSettingDialog.vue

@@ -0,0 +1,116 @@
+<template>
+  <Dialog
+    v-if="$attrs.visible"
+    :close-on-click-modal="false"
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="$tc('assets.PlatformProtocolConfig') + '：' + protocol.name"
+    class="setting-dialog"
+    v-bind="$attrs"
+    width="70%"
+    v-on="$listeners"
+  >
+    <el-alert v-if="disabled && platformDetail" style="margin-bottom: 10px" type="success">
+      {{ $t('assets.InheritPlatformConfig') }}
+      <el-link :href="platformDetail" class="link-more" target="_blank">
+        {{ $t('common.View') }}
+      </el-link>
+      <i class="fa fa-external-link" />
+    </el-alert>
+    <AutoDataForm
+      :disabled="disabled"
+      :form="form"
+      class="data-form"
+      v-bind="config"
+      @submit="onSubmit"
+    />
+  </Dialog>
+</template>
+
+<script>
+import { AutoDataForm, Dialog } from '@/components'
+import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
+
+export default {
+  name: 'ProtocolSetting',
+  components: {
+    Dialog,
+    AutoDataForm
+  },
+  props: {
+    protocol: {
+      type: Object,
+      default: () => ({})
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const vm = this
+    const platform = this.$route.query.platform
+    return {
+      loading: true,
+      form: this.protocol,
+      platformDetail: platform ? '#/console/assets/platforms/' + platform : '',
+      config: {
+        hasSaveContinue: false,
+        hasButtons: !this.disabled,
+        url: '/api/v1/assets/protocol-settings/?name=' + this.protocol.name,
+        fields: [
+          [vm.$t('common.Basic'), [
+            'primary', 'required', 'default', 'public'
+          ]],
+          [vm.$t('common.Advanced'), ['setting']]
+        ],
+        fieldsMeta: {
+          setting: {
+            fields: '__all__',
+            fieldsMeta: {
+              username_selector: {
+                hidden: (formValue) => formValue['autofill'] !== 'basic'
+              },
+              password_selector: {
+                hidden: (formValue) => formValue['autofill'] !== 'basic'
+              },
+              submit_selector: {
+                hidden: (formValue) => formValue['autofill'] !== 'basic'
+              },
+              script: {
+                component: JsonEditor,
+                hidden: (formValue) => formValue['autofill'] !== 'script'
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  methods: {
+    onSubmit(form) {
+      this.protocol = Object.assign(this.protocol, form)
+      this.$emit('update:visible', false)
+      this.$emit('confirm', this.protocol)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.data-form > > > .el-form-item.form-buttons {
+  padding-top: 10px;
+  margin-bottom: 0;
+}
+
+.setting-dialog > > > .el-dialog__body {
+  padding-top: 10px;
+}
+
+.link-more {
+  font-size: 10px;
+  border-bottom: solid 1px;
+  color: inherit;
+}
+</style>

src/components/Form/FormFields/ProtocolSelector/index.vue

@@ -3,9 +3,10 @@
     <div v-for="(item, index) in items" :key="item.name" class="protocol-item">
       <el-input
         v-model="item.port"
-        :class="readonly ? '' : 'input-with-select'"
+        :class="isPortReadonly(item) ? '' : 'input-with-select'"
         :placeholder="portPlaceholder"
-        :readonly="readonly"
+        :readonly="isPortReadonly(item)"
+        :title="isPortReadonly(item) ? '端口由 URL 指定' : ''"
         v-bind="$attrs"
       >
         <template #prepend>
@@ -62,7 +63,7 @@
     <ProtocolSettingDialog
       v-if="showDialog"
       :disabled="settingReadonly || readonly"
-      :item="settingItem"
+      :protocol="currentProtocol"
       :visible.sync="showDialog"
       @confirm="handleSettingConfirm"
     />
@@ -70,7 +71,7 @@
 </template>
 
 <script>
-import ProtocolSettingDialog from './ProtocolSettingDialog'
+import ProtocolSettingDialog from './ProtocolSettingDialog.vue'
 
 export default {
   components: {
@@ -102,13 +103,17 @@ export default {
     showSetting: {
       type: Function,
       default: (item) => true
+    },
+    instance: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
     return {
       name: '',
       items: [],
-      settingItem: {},
+      currentProtocol: {},
       showDialog: false,
       loading: false
     }
@@ -138,13 +143,18 @@ export default {
   },
   watch: {
     choices: {
-      handler(value) {
+      handler(value, oldValue) {
+        if (value?.length === oldValue?.length) {
+          return
+        }
         this.loading = true
         setTimeout(() => {
-          this.loading = false
           this.setDefaultItems(value)
-        }, 100)
-      }
+          this.loading = false
+        },)
+      },
+      deep: true,
+      immediate: true
     },
     items: {
       handler(value) {
@@ -157,6 +167,21 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    instance: {
+      handler(value) {
+        const port = this.getPortFromInstance(value)
+        if (!port) {
+          return
+        }
+        for (const item of this.items) {
+          if (item['port_from_addr']) {
+            item.port = port
+          }
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   mounted() {
@@ -166,21 +191,40 @@ export default {
     this.$log.debug('Items: ', this.items)
   },
   methods: {
+    getPortFromInstance(instance) {
+      if (!instance) {
+        return 0
+      }
+      let address = instance.address || ''
+      if (address.indexOf('://') === -1) {
+        address = `https://${address}`
+      }
+      const parse = require('url-parse')
+      const path = parse(address)
+      let port = path.port
+      if (port < 0 || port > 65535) {
+        port = 0
+      }
+      if (!port) {
+        port = path.protocol === 'https:' ? 443 : 80
+      }
+      return port
+    },
     handleSettingConfirm() {
-      if (this.settingItem.primary) {
+      if (this.currentProtocol.primary) {
         const others = this.items
-          .filter(item => item.name !== this.settingItem.name)
+          .filter(item => item.name !== this.currentProtocol.name)
           .map(item => {
             item.primary = false
             return item
           })
-        this.items = [this.settingItem, ...others]
+        this.items = [this.currentProtocol, ...others]
       }
-      if (this.settingItem.name === 'winrm') {
-        if (this.settingItem.setting?.use_ssl) {
-          this.settingItem.port = 5986
+      if (this.currentProtocol.name === 'winrm') {
+        if (this.currentProtocol.setting?.use_ssl) {
+          this.currentProtocol.port = 5986
         } else {
-          this.settingItem.port = 5985
+          this.currentProtocol.port = 5985
         }
       }
     },
@@ -217,20 +261,25 @@ export default {
       item.name = selected.name
       item.port = selected.port
     },
+    isPortFormAddr(item) {
+      return !!item['port_from_addr']
+    },
+    isPortReadonly(item) {
+      return this.readonly || this.isPortFormAddr(item)
+    },
     setPrimaryIfNeed(items) {
       // 如果没有设置主协议，设置第一个为主协议
-      if (!this.settingReadonly) {
-        const primaryProtocols = items.filter(item => item.primary)
-        if (primaryProtocols.length === 0) {
-          items[0].primary = true
-          items[0].default = true
-          items[0].required = true
-          items[0].public = true
-        } else if (primaryProtocols.length > 1) {
-          primaryProtocols.slice(1, primaryProtocols.length).forEach(item => {
-            item.primary = false
-          })
-        }
+      if (this.settingReadonly) {
+        return items
+      }
+      const primaryProtocols = items.filter(item => item.primary)
+      if (primaryProtocols.length === 0) {
+        items[0].default = true
+        items[0].public = true
+      } else if (primaryProtocols.length > 1) {
+        primaryProtocols.slice(1, primaryProtocols.length).forEach(item => {
+          item.primary = false
+        })
       }
       return items
     },
@@ -256,7 +305,7 @@ export default {
         items = protocols.filter(item => allProtocolNames.indexOf(item.name) !== -1)
       } else {
         const defaults = choices.filter(item => (item.required || item.primary || item.default))
-        if (defaults.length === 0) {
+        if (defaults.length === 0 && choices.length !== 0) {
           defaults.push(choices[0])
         }
         items = defaults
@@ -271,7 +320,7 @@ export default {
       return protocols
     },
     onSettingClick(item) {
-      this.settingItem = item
+      this.currentProtocol = item
       this.showDialog = true
     }
   }

src/components/Form/FormFields/Secret.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    Todo: 抽象 Secret
+  </div>
+</template>

src/components/Form/FormFields/Select2.vue

@@ -215,6 +215,13 @@ export default {
       handler(newValue, oldValue) {
       },
       deep: true
+    },
+    iOptions(val) {
+      if (val.length === 0) {
+        this.remote = false
+      } else {
+        this.remote = true
+      }
     }
   },
   async mounted() {

src/components/Form/FormFields/TagInput.vue

@@ -10,7 +10,7 @@
       @click="handleTagClick(v, k)"
       @close="handleTagClose(v)"
     >
-      {{ v }}
+      {{ isCheckShowPassword ? changeTagShowValue(v) : v }}
     </el-tag>
     <component
       :is="component"
@@ -18,6 +18,7 @@
       v-model.trim="filterValue"
       :fetch-suggestions="autocomplete"
       :placeholder="this.$t('common.EnterToContinue')"
+      :type="inputType"
       class="search-input"
       @blur="focus = false"
       @change="handleConfirm"
@@ -25,6 +26,13 @@
       @select="handleSelect"
       @keyup.enter.native="handleConfirm"
     />
+    <span
+      v-if="replaceShowPassword && filterTags.length > 0"
+      class="show-password"
+      @click="handleShowPassword"
+    >
+      <i :class="[isCheckShowPassword ? 'fa-eye-slash' : 'fa-eye']" class="fa" />
+    </span>
   </div>
 </template>
 
@@ -50,6 +58,22 @@ export default {
     autocomplete: {
       type: Function,
       default: null
+    },
+    replaceShowPassword: {
+      type: Boolean,
+      default: false
+    },
+    replaceRule: {
+      type: String,
+      default: ''
+    },
+    replaceContent: {
+      type: String,
+      default: '*'
+    },
+    inputType: {
+      type: String,
+      default: () => 'text'
     }
   },
   data() {
@@ -57,6 +81,7 @@ export default {
       filterTags: this.value,
       focus: false,
       filterValue: '',
+      isCheckShowPassword: this.replaceShowPassword,
       component: this.autocomplete ? 'el-autocomplete' : 'el-input'
     }
   },
@@ -76,6 +101,7 @@ export default {
     },
     handleConfirm() {
       if (this.filterValue === '') return
+
       if (!this.filterTags.includes(this.filterValue)) {
         this.filterTags.push(this.filterValue)
         this.filterValue = ''
@@ -89,6 +115,23 @@ export default {
       this.$delete(this.filterTags, k)
       this.filterValue = v
       this.$refs.SearchInput.focus()
+    },
+    matchRule(value) {
+      const regex = new RegExp(this.replaceRule)
+      const replacedValue = value.replace(regex, (match, p1, p2, p3) => {
+        const stars = p2.replace(/./g, this.replaceContent)
+        return p1 + stars + p3
+      })
+      return replacedValue
+    },
+    changeTagShowValue(value) {
+      if (this.replaceShowPassword && this.replaceRule) {
+        value = this.matchRule(value)
+      }
+      return value
+    },
+    handleShowPassword() {
+      this.isCheckShowPassword = !this.isCheckShowPassword
     }
   }
 }
@@ -103,8 +146,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    padding-left: 2px;
-    padding-bottom: 3px;
+    padding: 1px 2px 1px;
     border: 1px solid #dcdee2;
     border-radius: 1px;
     background-color: #fff;
@@ -115,11 +157,12 @@ export default {
     }
 
     &>>> .el-tag {
-      margin-top: 3px;
+      margin-top: 1px;
+      font-family: sans-serif !important;
     }
 
     &>>> .el-autocomplete {
-      height: 26px;
+      height: 30px;
     }
   }
 
@@ -128,7 +171,7 @@ export default {
     &>>> .el-input__inner {
       max-width: 100%;
       border: none;
-      padding-left: 5px;
+      padding-left: 10px;
     }
   }
 
@@ -138,6 +181,15 @@ export default {
   }
 
   .filter-field >>> .el-input__inner {
-    height: 26px;
+    height: 29px;
+  }
+
+  .show-password {
+    display: inherit;
+    padding-right: 6px;
+    cursor: pointer;
+    &:hover {
+      color: #999999;
+    }
   }
 </style>

src/components/Form/FormFields/TextReadonly.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="input-text">
+    {{ value.toString() || text }}
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: [String, Boolean],
+      default: () => ''
+    },
+    text: {
+      type: String,
+      default: () => ''
+    }
+  },
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.input-text {
+  line-height: 32px;
+  padding-left: 8px;
+  height: 32px;
+  margin-top: 4px;
+  font-size: 13px;
+}
+.bolder {
+  border: solid 1px #dcdfe6;
+}
+
+</style>

src/components/Form/FormFields/UpdateSelect.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import Select2 from './Select2'
+import Select2 from './Select2.vue'
 import { hasUUID } from '@/utils/common'
 
 export default {

src/components/Form/FormFields/UploadField.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <input ref="upLoadFile" type="file" style="display: none" @change="Onchange">
+    <input ref="upLoadFile" :accept="accept" style="display: none" type="file" @change="Onchange">
     <el-button size="mini" @click.native.stop="onUpLoad">
       {{ this.$t('common.SelectFile') }}
     </el-button>
     <span>{{ fileName }}</span>
-    <div v-if="tip !== ''">{{ tip }}</div>
-    <input v-model="value" type="text" hidden v-on="$listeners">
+    <div v-if="tip !== ''" class="help-block">{{ tip }}</div>
+    <input v-model="value" hidden type="text" v-on="$listeners">
     <div>
       <img :src="preview" v-bind="$attrs">
     </div>
@@ -23,6 +23,10 @@ export default {
     tip: {
       type: String,
       default: () => ''
+    },
+    accept: {
+      type: String,
+      default: '*'
     }
   },
   data() {

src/components/Form/FormFields/UserPassword.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import PasswordInput from './PasswordInput'
+import PasswordInput from './PasswordInput.vue'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import i18n from '@/i18n/i18n'

src/components/Form/FormFields/WeekCronSelect.vue

@@ -13,7 +13,7 @@
           <td v-for="t in theadArr" :key="t" :colspan="colspan">{{ t }}</td>
         </tr>
       </thead>
-      <tbody class="c-weektime-body">
+      <tbody class="c-weektime-body" @mouseleave="containerLeave()">
         <tr v-for="t in weektimeData" :key="t.row">
           <td>{{ t.value }}</td>
           <td
@@ -230,6 +230,11 @@ export default {
       })
       this.setTimeRange()
     },
+    containerLeave() {
+      this.width = 0
+      this.height = 0
+      this.mode = 0
+    },
     setTimeRange() {
       this.timeRange = this.weektimeData.map(item => {
         return {

src/components/Form/FormFields/index.js

@@ -0,0 +1,69 @@
+import Link from './Link.vue'
+import Select2 from './Select2.vue'
+import TagInput from './TagInput.vue'
+import Switcher from './Switcher.vue'
+import AttrInput from './AttrInput.vue'
+import UploadKey from './UploadKey.vue'
+import JsonEditor from './JsonEditor.vue'
+import PhoneInput from './PhoneInput.vue'
+import UploadField from './UploadField.vue'
+import UpdateToken from './UpdateToken.vue'
+import UserPassword from './UserPassword.vue'
+import UploadSecret from './UploadSecret.vue'
+import TextReadonly from './TextReadonly.vue'
+import DynamicInput from './DynamicInput.vue'
+import PasswordInput from './PasswordInput.vue'
+import WeekCronSelect from './WeekCronSelect.vue'
+import BoolTextReadonly from './BoolTextReadonly.vue'
+import NestedObjectSelect2 from './NestedObjectSelect2.vue'
+import DatetimeRangePicker from './DatetimeRangePicker.vue'
+import JSONManyToManySelect from './JSONManyToManySelect/index.vue'
+import PasswordRule from './PasswordRule.vue'
+
+export default {
+  Link,
+  Switcher,
+  Select2,
+  TagInput,
+  AttrInput,
+  UploadKey,
+  JsonEditor,
+  UpdateToken,
+  PhoneInput,
+  UploadField,
+  UserPassword,
+  DynamicInput,
+  PasswordInput,
+  UploadSecret,
+  PasswordRule,
+  TextReadonly,
+  WeekCronSelect,
+  BoolTextReadonly,
+  NestedObjectSelect2,
+  DatetimeRangePicker,
+  JSONManyToManySelect
+}
+
+export {
+  Link,
+  Switcher,
+  Select2,
+  TagInput,
+  AttrInput,
+  UploadKey,
+  JsonEditor,
+  UpdateToken,
+  PhoneInput,
+  UploadField,
+  UserPassword,
+  DynamicInput,
+  PasswordInput,
+  UploadSecret,
+  PasswordRule,
+  TextReadonly,
+  WeekCronSelect,
+  BoolTextReadonly,
+  NestedObjectSelect2,
+  DatetimeRangePicker,
+  JSONManyToManySelect
+}

src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue

@@ -1,220 +0,0 @@
-<template>
-  <Dialog
-    :close-on-click-modal="false"
-    :destroy-on-close="true"
-    :show-cancel="false"
-    :show-confirm="false"
-    :title="$tc('assets.PlatformProtocolConfig') + '：' + item.name"
-    class="setting-dialog"
-    v-bind="$attrs"
-    width="70%"
-    v-on="$listeners"
-  >
-    <el-alert v-if="disabled && platformDetail" type="success" style="margin-bottom: 10px">
-      {{ $t('assets.InheritPlatformConfig') }}
-      <el-link :href="platformDetail" class="link-more" target="_blank">
-        {{ $t('common.View') }}
-      </el-link>
-      <i class="fa fa-external-link" />
-    </el-alert>
-    <AutoDataForm
-      :disabled="disabled"
-      :form="form"
-      class="data-form"
-      v-bind="config"
-      @submit="onSubmit"
-    />
-  </Dialog>
-</template>
-
-<script>
-import { AutoDataForm, Dialog } from '@/components'
-
-export default {
-  name: 'ProtocolSetting',
-  components: {
-    Dialog,
-    AutoDataForm
-  },
-  props: {
-    item: {
-      type: Object,
-      default: () => ({})
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    const vm = this
-    const platform = this.$route.query.platform
-    return {
-      baseAttrs: ['primary', 'required', 'default', 'public'], // 基础属性， 放到 setting 中处理了，处理完成后，还得返回回去
-      defaultSetting: {
-        sftp_enabled: true,
-        sftp_home: '/tmp',
-        username_selector: '#username',
-        password_selector: '#password',
-        submit_selector: '.btn-submit',
-        security: 'any',
-        console: false
-      },
-      loading: true,
-      form: {},
-      platformDetail: platform ? '#/console/assets/platforms/' + platform : '',
-      config: {
-        hasSaveContinue: false,
-        hasButtons: !this.disabled,
-        url: '',
-        fields: [
-          [this.$t('common.Basic'), [
-            {
-              id: 'primary',
-              label: this.$t('assets.Primary'),
-              type: 'switch',
-              helpText: this.$t('assets.PrimaryProtocol'),
-              on: {
-                change: ([val], updateForm) => {
-                  const relatedFields = vm.config['fields'][0][1]
-                    .filter(item => this.baseAttrs.includes(item.id))
-                    .filter(item => item.id !== 'primary')
-                  if (val) {
-                    const relatedValue = relatedFields.reduce((acc, cur) => {
-                      acc[cur.id] = true
-                      return acc
-                    }, {})
-                    updateForm(relatedValue)
-                  }
-                }
-              }
-            },
-            {
-              id: 'required',
-              label: this.$t('assets.Required'),
-              type: 'switch',
-              helpText: this.$t('assets.RequiredProtocol'),
-              disabled: false
-            },
-            {
-              id: 'default',
-              label: this.$t('assets.Default'),
-              type: 'switch',
-              helpText: this.$t('assets.DefaultProtocol'),
-              disabled: false
-            },
-            {
-              id: 'public',
-              label: this.$t('assets.Public'),
-              type: 'switch',
-              helpText: this.$t('assets.PublicProtocol'),
-              disabled: false
-            }
-          ]],
-          [this.$t('assets.LoginConfig'), [
-            {
-              id: 'console',
-              label: 'Console',
-              type: 'switch',
-              hidden: () => this.item.name !== 'rdp'
-            },
-            {
-              id: 'security',
-              label: 'Security',
-              hidden: () => this.item.name !== 'rdp',
-              type: 'radio-group',
-              options: [
-                { label: 'Any', value: 'any' },
-                { label: 'RDP', value: 'rdp' },
-                { label: 'NLA', value: 'nla' },
-                { label: 'TLS', value: 'tls' }
-              ]
-            },
-            {
-              id: 'use_ssl',
-              label: this.$t('assets.UseSSL'),
-              type: 'switch',
-              hidden: () => this.item.name !== 'winrm'
-            },
-            {
-              id: 'sftp_enabled',
-              label: this.$t('common.Enable') + ' SFTP',
-              type: 'switch',
-              hidden: () => this.item.name !== 'ssh'
-            },
-            {
-              id: 'sftp_home',
-              label: 'SFTP home',
-              type: 'input',
-              helpText: this.$t('assets.SFTPHelpMessage'),
-              hidden: (form) => this.item.name !== 'ssh' || !form['sftp_enabled']
-            },
-            {
-              id: 'username_selector',
-              label: this.$t('assets.UserNameSelector'),
-              type: 'input',
-              hidden: (form) => this.item.name !== 'http'
-            },
-            {
-              id: 'password_selector',
-              label: this.$t('assets.PasswordSelector'),
-              type: 'input',
-              hidden: (form) => this.item.name !== 'http'
-            },
-            {
-              id: 'submit_selector',
-              label: this.$t('assets.SubmitSelector'),
-              type: 'input',
-              hidden: (form) => this.item.name !== 'http'
-            },
-            {
-              id: 'auth_username',
-              label: this.$t('assets.AuthUsername'),
-              type: 'switch',
-              hidden: (form) => this.item.name !== 'redis'
-            }
-          ]]
-        ]
-      }
-    }
-  },
-  created() {
-    this.form = this.item.setting
-    if (!this.form || !this.item) {
-      return
-    }
-    for (const i of this.baseAttrs) {
-      this.form[i] = !!this.item[i]
-    }
-  },
-  methods: {
-    onSubmit(form) {
-      for (const i of this.baseAttrs) {
-        if (form.hasOwnProperty(i)) {
-          this.item[i] = form[i]
-        }
-      }
-      this.item.setting = form
-      this.$emit('update:visible', false)
-      this.$emit('confirm', this.item)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.data-form > > > .el-form-item.form-buttons {
-  padding-top: 10px;
-  margin-bottom: 0;
-}
-
-.setting-dialog > > > .el-dialog__body {
-  padding-top: 10px;
-}
-
-.link-more {
-  font-size: 10px;
-  border-bottom: solid 1px;
-  color: inherit;
-}
-</style>

src/components/FormFields/Text.vue

@@ -1,26 +0,0 @@
-<template>
-  <span>
-    {{ text }}
-  </span>
-</template>
-
-<script>
-export default {
-  name: 'Text',
-  props: {
-    text: {
-      type: String,
-      default: ''
-    }
-  },
-  methods: {
-    onClick() {
-      window.open(this.href)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/FormFields/index.js

@@ -1,60 +0,0 @@
-import Link from './Link'
-import Text from './Text'
-import Select2 from './Select2'
-import TagInput from './TagInput'
-import Switcher from './Switcher'
-import UploadKey from './UploadKey'
-import JsonEditor from './JsonEditor'
-import PhoneInput from './PhoneInput'
-import UploadField from './UploadField'
-import UpdateToken from './UpdateToken'
-import UserPassword from './UserPassword'
-import DynamicInput from './DynamicInput'
-import PasswordInput from './PasswordInput'
-import UploadSecret from './UploadSecret'
-import WeekCronSelect from './WeekCronSelect'
-import NestedObjectSelect2 from './NestedObjectSelect2'
-import DatetimeRangePicker from './DatetimeRangePicker'
-import JSONManyToManySelect from './JSONManyToManySelect/index.vue'
-
-export default {
-  Text,
-  Link,
-  Switcher,
-  Select2,
-  TagInput,
-  UploadKey,
-  JsonEditor,
-  UpdateToken,
-  PhoneInput,
-  UploadField,
-  UserPassword,
-  DynamicInput,
-  PasswordInput,
-  UploadSecret,
-  WeekCronSelect,
-  NestedObjectSelect2,
-  DatetimeRangePicker,
-  JSONManyToManySelect
-}
-
-export {
-  Text,
-  Link,
-  Switcher,
-  Select2,
-  TagInput,
-  UploadKey,
-  JsonEditor,
-  UpdateToken,
-  PhoneInput,
-  UploadField,
-  UserPassword,
-  DynamicInput,
-  PasswordInput,
-  UploadSecret,
-  WeekCronSelect,
-  NestedObjectSelect2,
-  DatetimeRangePicker,
-  JSONManyToManySelect
-}

src/components/MarkDown/index.vue

@@ -1,37 +0,0 @@
-<template>
-  <div class="markdown-body">
-    <VueMarkdown :source="value" />
-  </div>
-</template>
-
-<script>
-import VueMarkdown from 'vue-markdown'
-import 'github-markdown-css/github-markdown-light.css'
-
-export default {
-  components: {
-    VueMarkdown
-  },
-  props: {
-    value: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {}
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.markdown-body * {
-  padding: 10px;
-  background-color: #f3f3f3;
-  color: #1a1a1a;
-  font-size: 13px;
-  //& >>> .table * {
-  //  background-color: #f3f3f3;
-  //}
-}
-</style>

src/components/QuickActions/action.vue

@@ -24,9 +24,9 @@
 </template>
 
 <script>
-import Switcher from '../FormFields/Switcher'
-import Select2 from '../FormFields/Select2'
-import UpdateSelect from '../FormFields/UpdateSelect'
+import Switcher from '@/components/Form/FormFields/Switcher'
+import Select2 from '@/components/Form/FormFields/Select2'
+import UpdateSelect from '@/components/Form/FormFields/UpdateSelect'
 
 class Action {
   constructor() {

src/components/Table/AutoDataSearch/index.vue

@@ -3,8 +3,9 @@
 </template>
 
 <script>
-import TagSearch from '@/components/TagSearch'
+import TagSearch from '@/components/Table/TagSearch/index.vue'
 import i18n from '@/i18n/i18n'
+
 export default {
   name: 'AutoDataSearch',
   components: {

src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import Dialog from '@/components/Dialog/index'
+import Dialog from '@/components/Dialog/index.vue'
 
 export default {
   name: 'ColumnSettingPopover',
@@ -75,6 +75,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    this.$eventBus.$off('showColumnSettingPopover')
+  },
   methods: {
     handleColumnConfirm() {
       this.showColumnSettingPopover = false

src/components/Table/AutoDataTable/index.vue

@@ -20,19 +20,14 @@
 </template>
 
 <script type="text/jsx">
-import DataTable from '../DataTable'
+import DataTable from '@/components/Table/DataTable/index.vue'
 import {
-  ActionsFormatter,
-  ArrayFormatter,
-  ChoicesFormatter,
-  DateFormatter,
-  DetailFormatter,
-  DisplayFormatter,
+  ActionsFormatter, ArrayFormatter, ChoicesFormatter, DateFormatter, DetailFormatter, DisplayFormatter,
   ObjectRelatedFormatter
-} from '@/components/TableFormatters'
+} from '@/components/Table/TableFormatters'
 import i18n from '@/i18n/i18n'
 import { newURL, replaceAllUUID } from '@/utils/common'
-import ColumnSettingPopover from './components/ColumnSettingPopover'
+import ColumnSettingPopover from './components/ColumnSettingPopover.vue'
 
 export default {
   name: 'AutoDataTable',