feat: Custom change password supports configuration of interactive items

* perf: update passkey create

* perf: update placeholder

---------

Co-authored-by: ibuler <ibuler@qq.com>

.github/workflows/build-base-image.yml

@@ -0,0 +1,72 @@
+name: Build and Push Base Image
+
+on:
+  push:
+    branches:
+      - 'pr*'
+    paths:
+      - 'package.json'
+      - 'package-lock.json'
+      - 'yarn.lock'
+      - 'Dockerfile-base'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Lock Pull Request
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -d '{"state":"pending", "description":"Action running, merge disabled", "context":"Lock PR"}' \
+          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract date
+        id: vars
+        run: echo "IMAGE_TAG=$(date +'%Y%m%d_%H%M%S')" >> $GITHUB_ENV
+
+      - name: Extract repository name
+        id: repo
+        run: echo "REPO=$(basename ${{ github.repository }})" >> $GITHUB_ENV
+
+      - name: Build and push multi-arch image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: Dockerfile-base
+          tags: jumpserver/${{ env.REPO }}-base:${{ env.IMAGE_TAG }}
+
+      - name: Update Dockerfile
+        run: |
+          sed -i 's|-base:.* AS stage-build|-base:${{ env.IMAGE_TAG }} AS stage-build|' Dockerfile
+
+      - name: Commit changes
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add Dockerfile
+          git commit -m "perf: Update Dockerfile with new base image tag"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Unlock Pull Request
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -d '{"state":"success", "description":"Action running, merge disabled", "context":"Lock PR"}' \
+          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"

.github/workflows/jms-build-test.yml

@@ -1,46 +0,0 @@
-name: "Run Build Test"
-on:
-  push:
-    paths:
-      - 'Dockerfile'
-      - 'Dockerfile*'
-      - 'package.json'
-      - 'yarn.lock'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        component: [lina]
-        version: [v4]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: docker/setup-buildx-action@v3
-
-    - name: Prepare Build
-      run: |
-        sed -i 's@registry.npmmirror.com@registry.yarnpkg.com@g' yarn.lock
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build Image
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        file: Dockerfile
-        tags: ghcr.io/jumpserver/${{ matrix.component }}:${{ matrix.version }}
-        platforms: linux/amd64
-        build-args: |
-          VERSION=${{ matrix.version }}
-          APT_MIRROR=http://deb.debian.org
-          NPM_REGISTRY=https://registry.yarnpkg.com
-        outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
-        cache-from: type=gha
-        cache-to: type=gha,mode=max

.github/workflows/jms-build-test.yml.disabled

@@ -0,0 +1,46 @@
+name: "Run Build Test"
+on:
+  push:
+    paths:
+      - 'Dockerfile'
+      - 'Dockerfile*'
+      - 'package.json'
+      - 'yarn.lock'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        component: [ lina ]
+        version: [ v4 ]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Prepare Build
+        run: |
+          sed -i 's@registry.npmmirror.com@registry.yarnpkg.com@g' yarn.lock
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          file: Dockerfile
+          tags: ghcr.io/jumpserver/${{ matrix.component }}:${{ matrix.version }}
+          platforms: linux/amd64
+          build-args: |
+            VERSION=${{ matrix.version }}
+            APT_MIRROR=http://deb.debian.org
+            NPM_REGISTRY=https://registry.yarnpkg.com
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/release-drafter.yml

@@ -31,7 +31,7 @@ jobs:
           tag: ${{ steps.get_version.outputs.TAG }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '16.20'
+          node-version: '20.15'
       - name: Install dependencies
         run: yarn install
       - name: Build web

Dockerfile

@@ -1,34 +1,4 @@
-FROM node:16.20-bullseye-slim AS stage-build
+FROM jumpserver/lina-base:20240723_084702 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 \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    set -ex \
-    && rm -f /etc/apt/apt.conf.d/docker-clean \
-    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \
-    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
-    && echo "no" | dpkg-reconfigure dash
-
-ARG NPM_REGISTRY="https://registry.npmmirror.com"
-
-RUN set -ex \
-    && npm config set registry ${NPM_REGISTRY} \
-    && yarn config set registry ${NPM_REGISTRY}
-
-WORKDIR /data
-
-RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked \
-    --mount=type=bind,source=package.json,target=package.json \
-    --mount=type=bind,source=yarn.lock,target=yarn.lock \
-    yarn install
 
 ARG VERSION
 ENV VERSION=$VERSION

Dockerfile-base

@@ -0,0 +1,22 @@
+FROM node:20.15-bullseye-slim
+
+ARG DEPENDENCIES="                    \
+        g++                           \
+        make                          \
+        python3"
+
+RUN set -ex \
+    && rm -f /etc/apt/apt.conf.d/docker-clean \
+    && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \
+    && apt-get update \
+    && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
+    && echo "no" | dpkg-reconfigure dash
+
+WORKDIR /data
+
+COPY package.json yarn.lock ./
+
+ARG NPM_MIRROR="https://registry.npmjs.org"
+RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=yarn-cache \
+    sed -i "s|https://registry.npmmirror.com|${NPM_MIRROR}|g" yarn.lock \
+    && yarn install

package.json

@@ -1,13 +1,13 @@
 {
-  "name": "Lina",
+  "name": "lina",
   "version": "v4.0.0",
   "description": "JumpServer Web UI",
   "author": "JumpServer Team <support@fit2cloud.com>",
   "license": "GPL-3.0-or-later",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-    "serve": "vue-cli-service serve",
+    "serve": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "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",
@@ -30,6 +30,7 @@
     "@ztree/ztree_v3": "3.5.44",
     "axios": "0.28.0",
     "axios-retry": "^3.1.9",
+    "caniuse-lite": "^1.0.30001642",
     "cron-parser": "^4.0.0",
     "crypto-js": "^4.1.1",
     "css-color-function": "^1.3.3",
@@ -65,7 +66,7 @@
     "normalize.css": "7.0.0",
     "npm": "^7.8.0",
     "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
+    "path-to-regexp": "3.3.0",
     "v-sanitize": "^0.0.13",
     "vue": "2.6.10",
     "vue-codemirror": "4.0.6",
@@ -116,7 +117,7 @@
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
-    "serve-static": "^1.13.2",
+    "serve-static": "^1.16.0",
     "strip-ansi": "^7.1.0",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",

src/api/settings.js

@@ -15,6 +15,7 @@ export function testEmailSetting(data) {
     data: data
   })
 }
+
 export function importLicense(formData) {
   return request({
     url: '/api/v1/xpack/license/import',
@@ -25,6 +26,7 @@ export function importLicense(formData) {
     data: formData
   })
 }
+
 export function testLdapSetting(data, refresh = true) {
   let url = '/api/v1/settings/ldap/testing/config/'
   if (refresh) {
@@ -96,9 +98,17 @@ export function getPublicSettings(isOpen) {
     method: 'get'
   })
 }
+
 export function getLogo() {
   return request({
     url: '/api/v1/xpack/interface/setting/',
     method: 'get'
   })
 }
+
+export function getPreference() {
+  return request({
+    url: '/api/v1/users/preference/?category=luna',
+    method: 'get'
+  })
+}

src/api/users.js

@@ -65,10 +65,6 @@ export function logout() {
   })
 }
 
-export function refreshSessionIdAge() {
-  return getProfile()
-}
-
 export default {
   getProfile,
   getUserList

src/components/Apps/AssetSelect/dialog.vue

@@ -2,6 +2,7 @@
   <Dialog
     :close-on-click-modal="false"
     :title="$tc('Assets')"
+    :disabled-status="!isLoaded"
     custom-class="asset-select-dialog"
     top="2vh"
     v-bind="$attrs"
@@ -22,6 +23,8 @@
       :url="baseUrl"
       class="tree-table"
       v-bind="$attrs"
+      v-on="$listeners"
+      @loaded="handleTableLoaded"
     />
   </Dialog>
 </template>
@@ -64,6 +67,7 @@ export default {
   data() {
     const vm = this
     return {
+      isLoaded: false,
       dialogVisible: false,
       rowSelected: _.cloneDeep(this.value) || [],
       rowsAdd: [],
@@ -124,6 +128,9 @@ export default {
     }
   },
   methods: {
+    handleTableLoaded() {
+      this.isLoaded = true
+    },
     handleClose() {
       this.$refs.ListPage.$refs.TreeList.componentKey += 1
     },

src/components/Apps/AssetSelect/index.vue

@@ -28,7 +28,6 @@
 <script>
 import Select2 from '@/components/Form/FormFields/Select2.vue'
 import AssetSelectDialog from './dialog.vue'
-import { b } from 'css-color-function/lib/adjusters'
 
 export default {
   componentName: 'AssetSelect',
@@ -38,6 +37,10 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
+    defaultPageSize: {
+      type: Number,
+      default: 10
+    },
     baseNodeUrl: {
       type: String,
       default: '/api/v1/assets/nodes/'
@@ -71,6 +74,7 @@ export default {
         value: iValue,
         multiple: true,
         clearable: true,
+        defaultPageSize: this.defaultPageSize,
         ajax: {
           url: this.baseUrl,
           transformOption: (item) => {
@@ -81,7 +85,6 @@ export default {
     }
   },
   methods: {
-    b,
     handleFocus() {
       this.$refs.select2.selectRef.blur()
       this.dialogVisible = true

src/components/Apps/AssetTreeTable/index.vue

@@ -32,6 +32,10 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
+    typeUrl: {
+      type: String,
+      default: '/api/v1/assets/nodes/category/tree/'
+    },
     nodeUrl: {
       type: String,
       default: '/api/v1/assets/nodes/'
@@ -105,9 +109,9 @@ export default {
               showAssets: false,
               showSearch: false,
               customTreeHeaderName: this.$t('TypeTree'),
-              url: '/api/v1/assets/nodes/category/tree/',
+              url: this.typeUrl,
               nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
-              treeUrl: `/api/v1/assets/nodes/category/tree/?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
+              treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
               callback: {
                 onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
               }
@@ -176,12 +180,12 @@ export default {
         setParam('node_id', '')
         setParam('asset_id', assetId)
       } else if (treeNode.meta.type === 'category') {
-        url = setUrlParam(url, 'category', treeNode.meta.category)
+        setParam('category', treeNode.meta.category)
       } else if (treeNode.meta.type === 'type') {
         setParam('category', treeNode.meta.category)
         setParam('type', treeNode.meta._type)
       } else if (treeNode.meta.type === 'platform') {
-        url = setUrlParam(url, 'platform', treeNode.id)
+        setParam('platform', treeNode.id)
       }
       setTimeout(() => {
         const query = this.setTreeUrlQuery()

src/components/Apps/GrantedAssets/index.vue

@@ -1,5 +1,6 @@
 <template>
   <AssetTreeTable
+    ref="AssetTreeTable"
     :header-actions="headerActions"
     :table-config="tableConfig"
     :tree-setting="treeSetting"
@@ -47,9 +48,19 @@ export default {
         return this.tableUrl.replace('/assets/', `/assets/${row.id}/accounts/`)
       }
     },
-    nameDisabled: {
+    name: {
-      type: Boolean,
+      type: Object,
-      default: true
+      default: () => ({
+        formatter: DetailFormatter,
+        formatterArgs: {
+          route: 'AssetDetail',
+          can: true
+        }
+      })
+    },
+    comment: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -80,11 +91,7 @@ export default {
         },
         columnsMeta: {
           name: {
-            formatter: DetailFormatter,
+            ...this.name
-            formatterArgs: {
-              route: 'AssetDetail',
-              can: !this.nameDisabled
-            }
           },
           labels: {
             formatterArgs: {
@@ -99,7 +106,8 @@ export default {
             formatter: AccountInfoFormatter,
             width: '100px'
           },
-          connectivity: connectivityMeta
+          connectivity: connectivityMeta,
+          comment: { ...this.comment }
         },
         tableAttrs: {
           rowClassName({ row }) {

src/components/Cards/DetailCard/ItemValue.vue

@@ -78,7 +78,7 @@ export default {
         formatterData = data
       }
       return (
-        <span>{formatterData}</span>
+        <span style={{ whiteSpace: 'pre-wrap', lineHeight: '1.2' }}>{formatterData}</span>
       )
     }
     if (this.value instanceof Array) {

src/components/Dialog/index.vue

@@ -10,13 +10,16 @@
       v-bind="$attrs"
       v-on="$listeners"
     >
-      <slot />
+      <div v-loading="disabledStatus">
+        <slot />
+      </div>
+
       <div v-if="showButtons" slot="footer" class="dialog-footer">
         <slot name="footer">
           <el-button v-if="showCancel && showButtons" size="small" @click="onCancel">{{ cancelTitle }}</el-button>
           <el-button
             v-if="showConfirm && showButtons"
-            :loading="loadingStatus"
+            :disabled="disabledStatus"
             size="small"
             type="primary"
             @click="onConfirm"
@@ -69,7 +72,7 @@ export default {
       type: Boolean,
       default: true
     },
-    loadingStatus: {
+    disabledStatus: {
       type: Boolean,
       default: false
     },
@@ -79,7 +82,8 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+    }
   },
   computed: {
     iWidth() {
@@ -119,6 +123,7 @@ export default {
 
     &__body {
       padding: 20px 30px;
+      font-size: 13px;
 
       &:has(.el-table) {
         background: #f3f3f4;

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

@@ -85,6 +85,7 @@ export default {
         // 如果不想等，证明是 value 自己变化导致的， 需要重新渲染
         if (valJson !== this.formJson) {
           this.iValue = val
+          this.$log.debug('Sub form value changed, rerender form: ', this.formJson, valJson)
           this.loading = true
           setTimeout(() => {
             this.loading = false
@@ -95,11 +96,12 @@ export default {
     }
   },
   methods: {
+    outputValue: _.debounce(function(val) {
+      this.$emit('input', val)
+    }),
     updateValue(val) {
       this.iValue = val
-      setTimeout(() => {
+      this.outputValue(val)
-        this.$emit('input', val)
-      }, 100)
     },
     objectToString(obj) {
       let data = ''

src/components/Form/AutoDataForm/index.vue

@@ -7,7 +7,7 @@
     v-bind="$attrs"
     v-on="$listeners"
   >
-    <span
+    <div
       v-for="(group, i) in groups"
       :key="'group-'+group.name"
       :slot="'id:'+group.name"
@@ -18,7 +18,7 @@
         :index="i"
         :line="i !== 0 && !groupHidden(groups[i - 1], i - 1)"
       />
-    </span>
+    </div>
   </DataForm>
 </template>
 

src/components/Form/AutoDataForm/utils.js

@@ -7,7 +7,6 @@ import BasicTree from '@/components/Form/FormFields/BasicTree.vue'
 import JsonEditor from '@/components/Form/FormFields/JsonEditor.vue'
 import { assignIfNot, toSentenceCase } from '@/utils/common'
 import TagInput from '@/components/Form/FormFields/TagInput.vue'
-import TransferSelect from '@/components/Form/FormFields/TransferSelect.vue'
 import i18n from '@/i18n/i18n'
 
 export class FormFieldGenerator {
@@ -135,9 +134,6 @@ export class FormFieldGenerator {
       case 'comment':
         field.el.type = 'textarea'
         break
-      case 'users':
-        field.component = TransferSelect
-        field.el.label = field.label
     }
     return field
   }
@@ -197,6 +193,24 @@ export class FormFieldGenerator {
     return field
   }
 
+  setChoicesTips(field, fieldMeta, fieldRemoteMeta) {
+    // 设置 checkbox 的 tips
+    if (['checkbox-group', 'radio-group'].indexOf(field.type) !== -1) {
+      field.options.map(option => {
+        if (!option.tip && field.tips) {
+          option.tip = field.tips[option.value]
+        }
+        if (!option.tip) {
+          const match = option.label.match(/^(.+?)\s*\((.*?)\)$/)
+          if (match) {
+            option.label = match[1]
+            option.tip = match[2]
+          }
+        }
+      })
+    }
+  }
+
   afterGenerateField(field) {
     field.label = toSentenceCase(field.label)
 
@@ -204,15 +218,7 @@ export class FormFieldGenerator {
       field.el.placeholder = field.placeholder
     }
 
-    // 设置 checkbox 的 tips
+    this.setChoicesTips(field)
-    if (field.tips && ['checkbox-group', 'radio-group'].indexOf(field.type) !== -1) {
-      field.options.map(option => {
-        if (!option.tip && field.tips[option.value]) {
-          option.tip = field.tips[option.value]
-        }
-      })
-    }
-
     return field
   }
 

src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue

@@ -17,7 +17,7 @@
         placement="right"
         popper-class="help-tips"
       >
-        <div slot="content" v-sanitize="data.helpTip" /> <!-- Noncompliant -->
+        <div slot="content" v-sanitize="data.helpTip" class="help-tip-content" /> <!-- Noncompliant -->
         <i class="fa fa-question-circle-o help-tip-icon" />
       </el-tooltip>
     </template>
@@ -322,4 +322,9 @@ export default {
     cursor: pointer;
   }
 }
+
+.help-tip-content {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
 </style>

src/components/Form/DataForm/index.vue

@@ -33,6 +33,7 @@
       >
         {{ iSubmitBtnText }}
       </el-button>
+
       <el-button
         v-if="defaultButton && hasSaveContinue"
         size="small"
@@ -40,6 +41,7 @@
       >
         {{ $t("SaveAndAddAnother") }}
       </el-button>
+
       <el-button
         v-if="defaultButton && hasReset"
         size="small"
@@ -47,6 +49,7 @@
       >
         {{ $t("Reset") }}
       </el-button>
+
       <el-button
         v-for="button in moreButtons"
         v-show="!button.hidden"
@@ -217,7 +220,7 @@ export default {
 
     .el-form-item__label {
       padding: 0 30px 0 0;
-      line-height: 32px;
+      line-height: 30px;
       color: var(--color-text-primary);
 
       i {

src/components/Form/FormFields/CodeEditor.vue

@@ -8,99 +8,118 @@
           :label="item.name"
           :prop="item.name"
         >
+
           <template v-if="item.type === 'button' && !item.isVisible">
-            <el-button
+            <el-tooltip :disabled="!item.tip" :content="item.tip">
-              :type="item.el && item.el.type"
+              <el-button
-              class="start-stop-btn"
+                :type="item.el && item.el.type"
-              size="mini"
+                class="start-stop-btn"
-              @click="item.callback()"
+                size="mini"
-            >
+                @click="item.callback()"
-              <i :class="item.icon" />{{ item.name }}
+              >
-            </el-button>
+                <i :class="item.icon" />
+
+                {{ item.name }}
+              </el-button>
+            </el-tooltip>
           </template>
+
           <template v-if="item.type === 'input' && item.el && item.el.autoComplete">
-            <el-autocomplete
+            <el-tooltip :disabled="!item.tip" :content="item.tip">
-              v-model="formModel[item.name]"
+              <el-autocomplete
-              :fetch-suggestions="item.el.query"
+                v-model="formModel[item.name]"
-              :placeholder="item.placeholder"
+                :fetch-suggestions="item.el.query"
-              class="inline-input"
+                :placeholder="item.placeholder"
-              size="mini"
+                class="inline-input"
-              @change="handleInputChange(item)"
+                size="mini"
-              @select="handleInputChange(item)"
+                clearable
-            />
+                @change="handleInputChange(item)"
+                @select="handleInputChange(item)"
+              />
+            </el-tooltip>
           </template>
+
           <template v-else-if="item.type === 'input'">
-            <el-input
+            <el-tooltip :disabled="!item.tip" :content="item.tip">
-              v-model="formModel[item.name]"
+              <el-input
-              :class="!isFold ? 'special-style' : ''"
+                v-model="formModel[item.name]"
-              :placeholder="item.placeholder"
+                :class="!isFold ? 'special-style' : ''"
-              class="inline-input"
+                :placeholder="item.placeholder"
-              size="mini"
+                class="inline-input"
-              @change="item.callback(formModel[item.name])"
+                size="mini"
-            />
+                @change="item.callback(formModel[item.name])"
+              />
+            </el-tooltip>
           </template>
 
           <template v-if="item.type === 'select' && item.el && item.el.create">
-            <span class="filter-label">{{ item.name }}:</span>
+            <el-tooltip :disabled="!item.tip" :content="item.tip">
-            <el-select
+              <span class="filter-label">{{ item.name }}:</span>
-              v-if="item.type === 'select' && item.el && item.el.create"
+              <el-select
-              :key="index"
+                v-if="item.type === 'select' && item.el && item.el.create"
-              v-model="formModel[item.name]"
+                :key="index"
-              :allow-create="item.el.create || false"
+                v-model="formModel[item.name]"
-              :filterable="item.el.create || false"
+                :allow-create="item.el.create || false"
-              :multiple="item.el.multiple"
+                :filterable="item.el.create || false"
-              :placeholder="item.name"
+                :multiple="item.el.multiple"
-              class="autoWidth-select"
+                :placeholder="item.name"
-              default-first-option
+                class="autoWidth-select"
-              size="mini"
+                default-first-option
-              @change="item.callback(item.value)"
+                size="mini"
-            >
+                @change="item.callback(item.value)"
-              <template slot="prefix">{{ item.label + ':' + item.value }}</template>
+              >
-              <el-option
+                <template slot="prefix">{{ item.label + ':' + item.value }}</template>
-                v-for="(option, id) in item.options"
+                <el-option
-                :key="id"
+                  v-for="(option, id) in item.options"
-                :label="option.label"
+                  :key="id"
-                :title="option.value"
+                  :label="option.label"
-                :value="option.value"
+                  :title="option.value"
-              />
+                  :value="option.value"
-            </el-select>
+                />
+              </el-select>
+            </el-tooltip>
           </template>
 
           <template v-if="item.type === 'select' && (!item.el || !item.el.create)">
-            <el-dropdown
+            <el-tooltip :disabled="!item.tip" :content="item.tip">
-              class="select-dropdown"
+              <el-dropdown
-              trigger="click"
+                class="select-dropdown"
-              @command="(command) => {
+                trigger="click"
-                item.value = command
+                @command="(command) => {
-                item.callback(command)
+                  item.value = command
-              }"
+                  item.callback(command)
-            >
+                }"
-              <el-button size="mini" type="primary">
+              >
-                <div class="text-content">
+                <el-button size="mini" type="primary">
-                  <span class="content">
+                  <div class="text-content">
-                    {{ getLabel(item.value, item.options) }}
+                    <span class="content">
-                    <i class="el-icon-arrow-down el-icon--right" />
+                      {{ getLabel(item.value, item.options) }}
-                  </span>
+                      <i class="el-icon-arrow-down el-icon--right" />
-                </div>
+                    </span>
-              </el-button>
+                  </div>
-              <el-dropdown-menu v-slot="dropdown">
+                </el-button>
-                <el-dropdown-item
+                <el-dropdown-menu v-slot="dropdown">
-                  v-for="(option, i) in item.options"
+                  <el-dropdown-item
-                  :key="i"
+                    v-for="(option, i) in item.options"
-                  :command="option.value"
+                    :key="i"
-                >
+                    :command="option.value"
-                  {{ option.label }}
+                  >
-                </el-dropdown-item>
+                    {{ option.label }}
-              </el-dropdown-menu>
+                  </el-dropdown-item>
-            </el-dropdown>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-tooltip>
           </template>
+
           <template v-if="item.type === 'switch'">
-            <el-switch
+            <el-tooltip :disabled="!item.tip" :content="item.tip">
-              v-model="formModel[item.name]"
+              <el-switch
-              :active-text="item.name"
+                v-model="formModel[item.name]"
-              :disabled="item.disabled"
+                :active-text="item.name"
-              @change="item.callback(formModel[item.name])"
+                :disabled="item.disabled"
-            />
+                @change="item.callback(formModel[item.name])"
+              />
+            </el-tooltip>
           </template>
         </el-form-item>
         <div
@@ -379,7 +398,6 @@ $input-border-color: #C0C4CC;
   }
 
   .editor {
-    //margin-left: 30px;
     border: 1px solid var(--color-border);
     overflow: hidden;
   }

src/components/Form/FormFields/InputWithUnit.vue

@@ -15,6 +15,7 @@ export default {
   },
   data() {
     return {
+      defaultValue: 24,
       displayMapper: {
         'second': this.$t('Second'), // 'sec' is the default value of 'unit
         'min': this.$t('Minute'), // 'min' is the default value of 'unit

src/components/Form/FormFields/PasswordRule.vue

@@ -48,7 +48,8 @@ export default {
             type: 'input-number',
             el: {
               min: 8,
-              max: 30
+              max: 36,
+              size: 'mini'
             }
           },
           {

src/components/Form/FormFields/PhoneInput.vue

@@ -1,21 +1,20 @@
 <template>
   <div>
-    <el-input v-model="rawValue.phone" required :placeholder="$tc('InputPhone')" @input="OnInputChange">
+    <el-input v-model="rawValue.phone" :placeholder="$tc('InputPhone')" required @input="onInputChange">
       <el-select
         slot="prepend"
         :placeholder="$tc('Select')"
         :value="rawValue.code"
-        style="width: 75px;"
+        style="width: 105px;"
-        @change="OnChange"
+        @change="onChange"
       >
         <el-option
           v-for="country in countries"
-          :key="country.value"
+          :key="country.name"
           :label="country.value"
           :value="country.value"
-          style="width: 200px;"
         >
-          <span style="float: left">{{ country.name }}</span>
+          <span class="country-name">{{ country.name }}</span>
           <span style="float: right; font-size: 13px">{{ country.value }}</span>
         </el-option>
       </el-select>
@@ -24,19 +23,19 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 
 export default {
   name: 'PhoneInput',
   props: {
     value: {
       type: [Object, String],
-      default: () => ({ 'code': '+86', 'phone': '' })
+      default: null
     }
   },
   data() {
     return {
-      rawValue: {}
+      rawValue: {},
+      countries: [{ 'name': 'China', 'value': '+86' }]
     }
   },
   computed: {
@@ -45,26 +44,38 @@ export default {
         return ''
       }
       return `${this.rawValue.code}${this.rawValue.phone}`
-    },
+    }
-    countries: {
-      get() {
-        return this.publicSettings.COUNTRY_CALLING_CODES
-      }
-    },
-    ...mapGetters(['publicSettings'])
   },
   mounted() {
-    this.rawValue = this.value || { code: '+86', phone: '' }
+    const defaults = { code: localStorage.getItem('prePhoneCode') || '+86', phone: '' }
+    this.rawValue = this.value || defaults
+    this.$axios.get('/api/v1/common/countries/').then(res => {
+      this.countries = res.map(item => {
+        return { name: `${item.flag} ${item.name}`, value: item.phone_code }
+      })
+    })
     this.$emit('input', this.fullPhone)
   },
   methods: {
-    OnChange(countryCode) {
+    onChange(countryCode) {
       this.rawValue.code = countryCode
-      this.OnInputChange()
+      this.onInputChange()
+      localStorage.setItem('prePhoneCode', countryCode)
     },
-    OnInputChange() {
+    onInputChange() {
       this.$emit('input', this.fullPhone)
     }
   }
 }
 </script>
+
+<style scoped>
+.country-name {
+  display: inline-block;
+  width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-right: 5px;
+}
+</style>

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

@@ -144,9 +144,6 @@ export default {
   watch: {
     choices: {
       handler(value, oldValue) {
-        if (value?.length === oldValue?.length) {
-          return
-        }
         this.loading = true
         setTimeout(() => {
           this.setDefaultItems(value)
@@ -345,6 +342,10 @@ export default {
 .protocol-item {
   display: flex;
   margin: 5px 0;
+
+  &:first-of-type {
+    margin-top: 0;
+  }
 }
 
 .input-button {

src/components/Form/FormFields/Select2.vue

@@ -125,16 +125,19 @@ export default {
     allowCreate: {
       type: Boolean,
       default: false
+    },
+    defaultPageSize: {
+      type: Number,
+      default: 10
     }
   },
   data() {
     const vm = this
-    const defaultPageSize = 10
     const defaultParams = {
       search: '',
       page: 1,
       hasMore: true,
-      pageSize: defaultPageSize
+      pageSize: vm.defaultPageSize
     }
     // 设置axios全局报错提示不显示
     const validateStatus = (status) => {
@@ -194,7 +197,6 @@ export default {
       }
     },
     iAjax() {
-      const defaultPageSize = 10
       const defaultMakeParams = (params) => {
         const page = params.page || 1
         const offset = (page - 1) * params.pageSize
@@ -237,7 +239,7 @@ export default {
       }
       const defaultAjax = {
         url: '',
-        pageSize: defaultPageSize,
+        pageSize: this.defaultPageSize,
         makeParams: defaultMakeParams,
         transformOption: defaultTransformOption,
         processResults: defaultProcessResults,

src/components/Form/FormFields/TransferSelect.vue

@@ -14,10 +14,12 @@
       :close-on-click-modal="false"
       :title="label"
       :visible.sync="showTransfer"
+      :disabled-status="!isLoaded"
       class="the-dialog"
       width="730px"
       @cancel="handleTransCancel"
       @confirm="handleTransConfirm"
+      v-on="$listeners"
     >
       <krryPaging v-if="selectInitialized" ref="pageTransfer" class="transfer" v-bind="pagingTransfer" />
     </Dialog>
@@ -77,13 +79,16 @@ export default {
       if (keyword) {
         params['search'] = keyword
       }
+      this.isLoaded = false
       const data = await this.$axios.get(url, { params })
+      this.isLoaded = true
       return data['results'].map(item => {
         const n = transformOption(item)
         return { id: n.value, label: n.label }
       })
     }
     return {
+      isLoaded: false,
       showTransfer: false,
       selectInitialized: false,
       select2: {
@@ -167,7 +172,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/components/Form/FormFields/UserPassword.vue

@@ -42,7 +42,7 @@ export default {
         patterns.push([/\d/, i18n.t('NUMBER_REQUIRED')])
       }
       if (passwordRule['SECURITY_PASSWORD_SPECIAL_CHAR']) {
-        const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
+        const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？_+-]")
         patterns.push([pattern, i18n.t('SPECIAL_CHAR_REQUIRED')])
       }
       for (const [pattern, msg] of patterns) {

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

@@ -3,7 +3,7 @@
     v-if="showColumnSettingPopover"
     :cancel-title="$tc('RestoreDefault')"
     :destroy-on-close="true"
-    :title="$tc('TableSetting')"
+    :title="$tc('ListPreference')"
     :visible.sync="showColumnSettingPopover"
     top="10%"
     width="50%"
@@ -90,8 +90,14 @@ export default {
       }
     }
   },
+  beforeDestroy() {
+    this.$eventBus.$off('showColumnSettingPopover', this.showColumnSettingPopoverHandler)
+  },
   mounted() {
-    this.$eventBus.$on('showColumnSettingPopover', ({ url }) => {
+    this.$eventBus.$on('showColumnSettingPopover', this.showColumnSettingPopoverHandler)
+  },
+  methods: {
+    showColumnSettingPopoverHandler({ url }) {
       if (url === this.url) {
         this.checkAll = false
         this.showColumnSettingPopover = true
@@ -105,9 +111,7 @@ export default {
         this.checkAll = false
         this.isIndeterminate = true
       }
-    })
+    },
-  },
-  methods: {
     handleColumnConfirm() {
       this.showColumnSettingPopover = false
       this.$emit('columnsUpdate', { columns: this.iCurrentColumns, url: this.url })

src/components/Table/DataTable/index.vue

@@ -153,6 +153,8 @@ export default {
           this.toggleRowSelection(row, true)
         }
       }
+
+      this.$emit('loaded')
     },
     handleSizeChange(val) {
       localStorage.setItem('paginationSize', val)

src/components/Table/ListTable/TableAction/ExportDialog.vue

@@ -171,14 +171,18 @@ export default {
       ]
     }
   },
+  beforeDestroy() {
+    this.$eventBus.$off('showExportDialog', this.showExportDialogHandler)
+  },
   mounted() {
-    this.$eventBus.$on('showExportDialog', ({ selectedRows, url, name }) => {
+    this.$eventBus.$on('showExportDialog', this.showExportDialogHandler)
+  },
+  methods: {
+    showExportDialogHandler({ selectedRows, url, name }) {
       if (url === this.url || url.indexOf(this.url) > -1) {
         this.showExportDialog()
       }
-    })
+    },
-  },
-  methods: {
     showExportDialog() {
       if (!this.mfaVerifyRequired) {
         this.exportDialogShow = true

src/components/Table/ListTable/TableAction/ImportDialog.vue

@@ -142,14 +142,18 @@ export default {
       this.showTable = false
     }
   },
+  beforeDestroy() {
+    this.$eventBus.$off('showImportDialog', this.showImportEventHandler)
+  },
   mounted() {
-    this.$eventBus.$on('showImportDialog', ({ url }) => {
+    this.$eventBus.$on('showImportDialog', this.showImportEventHandler)
+  },
+  methods: {
+    showImportEventHandler({ url }) {
       if (url === this.url) {
         this.showImportDialog = true
       }
-    })
+    },
-  },
-  methods: {
     closeDialog() {
       this.showImportDialog = false
       this.$emit('importDialogClose')

src/components/Table/ListTable/TableAction/ImportTable.vue

@@ -44,8 +44,9 @@
 import DataTable from '@/components/Table/DataTable/index.vue'
 import { getUpdateObjURL } from '@/utils/common'
 import { sleep } from '@/utils/time'
-import { EditableInputFormatter, StatusFormatter } from '@/components/Table/TableFormatters'
+import { EditableInputFormatter } from '@/components/Table/TableFormatters'
 import { encryptPassword } from '@/utils/crypto'
+import getStatusColumnMeta from '@/components/Table/ListTable/TableAction/const'
 
 export default {
   name: 'ImportTable',
@@ -223,38 +224,7 @@ export default {
   },
   methods: {
     generateTableColumns(tableTitles, tableData) {
-      const vm = this
+      const columns = [{ ...getStatusColumnMeta.bind(this)().status }]
-      const columns = [{
-        prop: '@status',
-        label: vm.$t('Status'),
-        width: '80px',
-        align: 'center',
-        formatter: StatusFormatter,
-        formatterArgs: {
-          faChoices: {
-            ok: 'fa-check text-primary',
-            error: 'fa-times text-danger',
-            pending: 'fa-clock-o'
-          },
-          getChoicesKey(val) {
-            if (val === 'ok' || val === 'pending') {
-              return val
-            }
-            return 'error'
-          },
-          getTip(val) {
-            if (val === 'ok') {
-              return vm.$t('Success')
-            } else if (val === 'pending') {
-              return vm.$t('Pending')
-            } else if (val && val.name === 'error') {
-              return val.error
-            }
-            return ''
-          },
-          hasTips: true
-        }
-      }]
       for (const item of tableTitles) {
         const dataItemLens = tableData.map(d => {
           if (!d) {

src/components/Table/ListTable/TableAction/LabelSearch.vue

@@ -71,7 +71,16 @@ export default {
     this.listenViewPort()
   },
   mounted() {
-    this.$eventBus.$on('labelSearch', label => {
+    this.$eventBus.$on('labelSearch', this.labelSearchHandler)
+  },
+  beforeDestroy(label) {
+    this.$eventBus.$off('labelSearch', this.labelSearchHandler)
+  },
+  methods: {
+    handleCascaderFocus() {
+      this.setSearchFocus()
+    },
+    labelSearchHandler(label) {
       if (!label) {
         this.labelValue = []
         this.showLabelSearch = true
@@ -82,14 +91,6 @@ export default {
       setTimeout(() => {
         this.showLabelSearch = true
       }, 500)
-    })
-  },
-  destroyed() {
-    this.$eventBus.$off('labelSearch')
-  },
-  methods: {
-    handleCascaderFocus() {
-      this.setSearchFocus()
     },
     handleCascaderVisibleChange(visible) {
       const input = this.$refs.labelCascader.$el

src/components/Table/ListTable/TableAction/RightSide.vue

@@ -106,7 +106,7 @@ export default {
         {
           name: 'actionSetting',
           icon: 'system-setting',
-          tip: this.$t('TableSetting'),
+          tip: this.$t('ListPreference'),
           has: this.hasColumnSetting,
           callback: this.handleTableSettingClick.bind(this)
         },

src/components/Table/ListTable/TableAction/const.js

@@ -0,0 +1,40 @@
+import { StatusFormatter } from '@/components/Table/TableFormatters'
+import i18n from '@/i18n/i18n'
+
+export const getStatusColumnMeta = (prop = '@status') => {
+  return {
+    status: {
+      prop: prop,
+      label: i18n.t('Status'),
+      width: '80px',
+      align: 'center',
+      formatter: StatusFormatter,
+      formatterArgs: {
+        faChoices: {
+          ok: 'fa-check text-primary',
+          error: 'fa-times text-danger',
+          pending: 'fa-clock-o'
+        },
+        getChoicesKey: (val) => {
+          if (val === 'ok' || val === 'pending') {
+            return val
+          }
+          return 'error'
+        },
+        getTip: (val) => {
+          if (val === 'ok') {
+            return i18n.t('Success')
+          } else if (val === 'pending') {
+            return i18n.t('Pending')
+          } else if ((val && val.name === 'error') || val.error !== undefined) {
+            return val.error
+          }
+          return ''
+        },
+        hasTips: true
+      }
+    }
+  }
+}
+
+export default getStatusColumnMeta

src/components/Table/ListTable/index.vue

@@ -189,22 +189,23 @@ export default {
     }
   },
   mounted() {
-    this.urlUpdated[this.tableUrl] = location.href
+    this.$set(this.urlUpdated, this.tableUrl, location.href)
   },
   deactivated() {
     this.isDeactivated = true
   },
   activated() {
-    this.isDeactivated = false
+    this.$nextTick(() => {
-    const preURL = this.urlUpdated[this.tableUrl]
+      this.isDeactivated = false
-    if (!preURL || preURL === location.href) {
+      const cleanUrl = this.tableUrl.split('?')[0]
-      return
+      const preURL = this.urlUpdated[cleanUrl]
-    }
+
-    this.urlUpdated[this.tableUrl] = location.href
+      if (!preURL || preURL === location.href) return
-    this.$log.debug('Reload the table get latest data: pre ', preURL, ' current: ', location.href)
+
-    setTimeout(() => {
+      this.$set(this.urlUpdated, this.tableUrl, location.href)
+      this.$log.debug('Reload the table get latest data: pre ', preURL, ' current: ', location.href)
       this.reloadTable()
-    }, 500)
+    })
   },
   methods: {
     handleActionInitialDone() {

src/components/Table/TableFormatters/AmountFormatter.vue

@@ -51,7 +51,7 @@ export default {
     const formatterArgs = Object.assign(this.formatterArgsDefault, this.col.formatterArgs || {})
     return {
       formatterArgs: formatterArgs,
-      data: formatterArgs.async ? [] : (this.cellValue || []),
+      listData: formatterArgs.async ? [] : (this.cellValue || []),
       amount: '',
       asyncGetDone: false
     }
@@ -68,17 +68,18 @@ export default {
         return [this.$t('Loading') + '...']
       }
       const getItem = this.formatterArgs.getItem || (item => item.name)
+
       let data = []
-      if (Array.isArray(this.data)) {
+
-        data = this.data.map(item => getItem(item)) || []
+      if (Array.isArray(this.listData)) {
-      } else {
+        data = this.listData.map(item => getItem(item)).filter(Boolean)
-        // object {key: [value]}
+      } else if (this.listData && typeof this.listData === 'object') {
-        data = Object.entries(this.data).map(([key, value]) => {
+        data = Object.entries(this.listData).map(([key, value]) => {
           const item = { key: key, value: value }
           return getItem(item)
-        }) || []
+        }).filter(Boolean)
       }
-      data = data.filter(Boolean)
+
       return data
     },
     showItems() {
@@ -86,8 +87,12 @@ export default {
     }
   },
   watch: {
-    cellValue() {
+    cellValue: {
-      this.computeAmount()
+      handler(newValue) {
+        // listData 需要重新赋值一遍 items 重新计算
+        this.listData = newValue
+        this.computeAmount()
+      }
     }
   },
   async mounted() {
@@ -105,6 +110,7 @@ export default {
           // object {key: [value]}
           cellValue = Object.keys(this.cellValue)
         }
+
         this.amount = (cellValue?.filter(value => !this.cellValueToRemove.includes(value)) || []).length
       }
     },
@@ -127,7 +133,7 @@ export default {
       const params = this.formatterArgs.ajax.params || {}
       const transform = this.formatterArgs.ajax.transform || (resp => resp[this.col.prop.replace('_amount', '')])
       const response = await this.$axios.get(url, { params: params })
-      this.data = transform(response)
+      this.listData = transform(response)
       this.asyncGetDone = true
     }
   }

src/components/Table/TableFormatters/DateFormatter.vue

@@ -1,5 +1,5 @@
 <template>
-  <span>{{ value }}</span>
+  <span class="date">{{ dateValue }}</span>
 </template>
 
 <script>
@@ -10,24 +10,31 @@ export default {
   name: 'DateFormatter',
   extends: BaseFormatter,
   data() {
-    let value
+    // let value
-    if (this.cellValue) {
+    // if (this.cellValue) {
-      value = toSafeLocalDateStr(this.cellValue)
+    //   value = toSafeLocalDateStr(this.cellValue)
-    } else {
+    // } else {
-      value = '-'
+    //   value = '-'
-    }
+    // }
     // const locale = this.$i18n.locale
     // const value = dt.toLocaleString(locale, { hourCycle: 'h23' })
     // debug(this.$i18n.locale)
-    return {
+    // return {
-      value: value
+    //   value: value
-    }
+    // }
     // return {
     //   value: `${year}-${month}-${date} ${hour}:${minutes}:${seconds}`
     // }
+    return {}
+  },
+  computed: {
+    dateValue() {
+      if (this.cellValue) {
+        return toSafeLocalDateStr(this.cellValue)
+      } else {
+        return '-'
+      }
+    }
   }
 }
 </script>
-<style scoped>
-
-</style>

src/components/Table/TableFormatters/EditableInputFormatter.vue

@@ -1,7 +1,8 @@
 <template>
-  <div style="width: 100%;min-height: 20px" @click.stop="editCell">
+  <div class="edit-container" style="min-height: 20px" @click.stop="editCell">
     <el-input
       v-if="inEditMode"
+      ref="inputRef"
       v-model="value"
       class="editInput"
       size="mini"
@@ -9,8 +10,17 @@
       @keyup.enter.native="onInputEnter"
     />
     <template v-else>
-      <span>{{ iCellValue }}</span>
+      <span class="cellValue">{{ iCellValue }}</span>
+      <a
+        v-if="formatterArgs.showEditBtn"
+        :class="[{ 'disabled-link': this.$store.getters.currentOrgIsRoot },'edit-btn']"
+        style="padding-left: 5px"
+        @click="editCell"
+      >
+        <i class="fa fa-edit" />
+      </a>
     </template>
+
   </div>
 </template>
 
@@ -61,6 +71,9 @@ export default {
     editCell() {
       if (this.formatterArgs.canEdit) {
         this.inEditMode = true
+        this.$nextTick(() => {
+          this.$refs.inputRef.focus()
+        })
       }
     },
     getCellValue(val) {
@@ -88,7 +101,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .editInput ::v-deep .el-input__inner {
   padding: 2px;
   line-height: 12px;
@@ -97,4 +110,35 @@ export default {
 .editInput {
   padding: -6px;
 }
+
+.edit-btn {
+  visibility: hidden;
+  position: relative;
+  transition: all 1s;
+
+  & > i {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+
+}
+
+.edit-container {
+  display: flex;
+  flex-wrap: nowrap;
+
+  &:hover {
+    .edit-btn {
+      visibility: visible;
+    }
+  }
+
+  .cellValue {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+}
+
 </style>

src/components/Table/TableFormatters/LabelsFormatter.vue

@@ -4,8 +4,8 @@
       <span v-if="!iLabels || iLabels.length === 0" style="vertical-align: top;">
         -
       </span>
-      <div v-else>
+      <span v-else class="label-wrapper">
-        <div
+        <span
           v-for="label of iLabels"
           :key="label.id"
         >
@@ -15,8 +15,9 @@
             class="tag-formatter"
             @click="handleLabelSearch(label)"
           />
-        </div>
+          <span />
-      </div>
+        </span>
+      </span>
     </a>
     <a
       v-if="formatterArgs.showEditBtn"
@@ -30,15 +31,16 @@
       v-if="showDialog"
       :title="$tc('BindLabel')"
       :visible.sync="showDialog"
+      class="tag-dialog"
       width="600px"
       @cancel="handleCancel"
       @confirm="handleConfirm"
     >
-      <el-row :gutter="1" class="tag-select">
+      <el-row class="tag-select">
         <el-col :span="12">
           <Select2 v-model="keySelect2.value" v-bind="keySelect2" @change="handleKeyChanged" />
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" style="padding-left: 5px">
           <Select2
             v-model="valueSelect2.value"
             :disabled="!keySelect2.value"
@@ -129,6 +131,16 @@ export default {
     }
   },
   computed: {},
+  watch: {
+    cellValue: {
+      handler(newValue) {
+        if (newValue) {
+          this.initial = this.formatterArgs.getLabels(this.cellValue)
+          this.iLabels = [...this.initial]
+        }
+      }
+    }
+  },
   mounted() {
     this.initial = this.formatterArgs.getLabels(this.cellValue)
     this.iLabels = [...this.initial]
@@ -207,18 +219,11 @@ export default {
   flex-wrap: wrap;
 
   & > span {
-    overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
 }
 
-.tag-select {
-  ::v-deep .el-input__inner::placeholder {
-    font-size: 13px;
-  }
-}
-
 .edit-btn {
   visibility: hidden;
   position: relative;
@@ -233,9 +238,14 @@ export default {
 
 .label-container {
   display: flex;
+  height: 28px;
 
   .label-formatter-col {
     overflow: hidden;
+
+    &:hover {
+      overflow: auto;
+    }
   }
 
   &:hover {
@@ -249,15 +259,23 @@ export default {
   }
 }
 
-.tag-zone {
+.tag-dialog {
-  margin: 20px 0 0 0;
+  .tag-zone {
-  border: solid 1px #ebeef5;
+    margin: 20px 0 0 0;
-  padding: 10px;
+    border: solid 1px #ebeef5;
-  background: #f2f2f5;
+    padding: 10px;
+    background: #f2f2f5;
 
-  .tag-formatter {
+    .tag-formatter {
-    margin: 1px 3px;
+      margin: 1px 3px;
-    display: inline-block;
+      display: inline-block;
+    }
+  }
+
+  .tag-select {
+    ::v-deep .el-input__inner::placeholder {
+      font-size: 13px;
+    }
   }
 }
 
@@ -270,7 +288,6 @@ export default {
 
 .tag-formatter {
   margin: 2px 0;
-
 }
 
 .tag-tip {

src/components/Table/TableFormatters/TagsFormatter.vue

@@ -55,8 +55,9 @@ export default {
 
 <style lang="scss" scoped>
 .tag {
-  display: flex;
+  display: inline-block;
   flex-wrap: wrap;
+
   & > span {
     overflow: hidden;
     white-space: nowrap;

src/components/Table/TagSearch/index.vue

@@ -234,12 +234,10 @@ export default {
         delete routeFilter.search
       }
       const asFilterTags = _.cloneDeep(this.filterTags)
-      setTimeout(() => {
+      this.filterTags = {
-        this.filterTags = {
+        ...asFilterTags,
-          ...asFilterTags,
+        ...routeFilter
-          ...routeFilter
+      }
-        }
-      }, 100)
     },
     getValueLabel(key, value) {
       for (const field of this.options) {

src/components/Tree/DataZTree/index.vue

@@ -39,7 +39,7 @@ export default {
           showRenameBtn: false,
           drag: {
             isCopy: false,
-            isMove: true
+            isMove: !this.$store.getters.currentOrgIsRoot
           }
         },
         callback: {

src/components/Widgets/Announcement/index.vue

@@ -35,13 +35,29 @@ export default {
     ]),
     announcement() {
       const ann = this.publicSettings.ANNOUNCEMENT
-      return { id: ann['ID'], subject: ann['SUBJECT'], content: ann['CONTENT'], link: ann['LINK'] }
+      return {
+        id: ann['ID'],
+        subject: ann['SUBJECT'],
+        content: ann['CONTENT'],
+        link: ann['LINK'],
+        date_start: ann['DATE_START'],
+        date_end: ann['DATE_END']
+      }
     },
     enabled() {
-      return this.publicSettings.ANNOUNCEMENT_ENABLED && (this.announcement.content || this.announcement.subject)
+      return this.publicSettings.ANNOUNCEMENT_ENABLED && (this.announcement.content || this.announcement.subject) && this.isDateValid
     },
     title() {
       return this.$t('Announcement') + ': ' + this.announcement.subject
+    },
+    isDateValid() {
+      if (this.announcement.date_start === undefined || this.announcement.date_end === undefined) {
+        return true
+      }
+      const now = new Date()
+      const start = new Date(this.announcement.date_start)
+      const end = new Date(this.announcement.date_end)
+      return now >= start && now <= end
     }
   },
   methods: {

src/layout/components/AppMain.vue

@@ -33,11 +33,13 @@ export default {
         query[k] = v
       }
 
+      let key
       if (this.$route.name.toLowerCase().includes('list')) {
-        return _.trimEnd(this.$route.path, '/') + '?' + new URLSearchParams(query).toString()
+        key = _.trimEnd(this.$route.path, '/') + '?' + new URLSearchParams(query).toString()
       } else {
-        return new Date().getTime()
+        key = new Date().getTime()
       }
+      return key
     },
     chatAiEnabled() {
       return this.publicSettings?.CHAT_AI_ENABLED

src/layout/components/NavHeader/AccountDropdown.vue

@@ -59,18 +59,22 @@ export default {
           this.$router.push({ name: 'Profile' })
           break
         case 'PasswordAndSSHKey':
-          this.$router.push({ name: 'PasswordAndSSHKey' })
+          this.$router.push({ name: 'SSHKeyList' })
           break
         case 'Preferences':
           this.$router.push({ name: 'Preferences' })
           break
         case 'logout':
           this.logout()
-          window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
           break
       }
     },
-    logout() {
+    async logout() {
+      const currentOrg = this.$store.getters.currentOrg
+      if (currentOrg.autoEnter) {
+        await this.$store.dispatch('users/setCurrentOrg', this.$store.getters.preOrg)
+      }
+      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     }
   }
 }

src/layout/components/NavHeader/SiteMessages.vue

@@ -70,7 +70,7 @@
           <span class="msg-detail-time">{{ formatDate(currentMsg.date_created) }}</span>
         </div>
         <div class="msg-detail-txt">
-          <span v-sanitize="currentMsg.content.message" />
+          <MarkDown :value="currentMsg.content.message" />
         </div>
       </div>
     </Dialog>
@@ -80,10 +80,14 @@
 <script>
 import { toSafeLocalDateStr } from '@/utils/time'
 import Dialog from '@/components/Dialog'
+import MarkDown from '@/components/Widgets/MarkDown'
 
 export default {
   name: 'SiteMessages',
-  components: { Dialog },
+  components: {
+    Dialog,
+    MarkDown
+  },
   data() {
     return {
       show: false,

src/layout/components/NavHeader/ViewSwitcher.vue

@@ -108,7 +108,7 @@ export default {
   methods: {
     async handleSelectView(key, keyPath) {
       const routeName = this.viewsMapper[key] || '/'
-      localStorage.setItem('PreView', key)
+      localStorage.setItem('preView', key)
       // Next 之前要重置 init 状态，否则这些路由守卫就不走了
       await store.dispatch('app/reset')
       if (!this.tipHasRead) {

src/layout/components/NavHeader/index.vue

@@ -176,7 +176,7 @@ export default {
 
         // 未找到与之对应的
         & ::v-deep .el-submenu__title {
-          font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+          font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
           padding: 0 8px;
           line-height: $headerHeight;
           height: $headerHeight;

src/layout/components/TabPage/index.vue

@@ -46,7 +46,7 @@
         <el-alert v-if="helpMessage" type="success">
           <span v-sanitize="helpMessage" class="announcement-main" />
         </el-alert>
-        <transition v-if="!loading" appear mode="out-in" name="fade-transform">
+        <transition appear mode="out-in" name="fade-transform">
           <slot>
             <keep-alive>
               <component :is="computeActiveComponent" />
@@ -83,16 +83,18 @@ export default {
   },
   data() {
     return {
-      loading: true,
+      loading: false,
-      toSentenceCase: toSentenceCase
+      toSentenceCase: toSentenceCase,
+      activeTab: this.activeMenu
     }
   },
   computed: {
     iActiveMenu: {
       get() {
-        return this.activeMenu
+        return this.activeTab
       },
       set(item) {
+        this.activeTab = item
         this.$emit('update:activeMenu', item)
       }
     },
@@ -119,16 +121,13 @@ export default {
   },
   watch: {
     $route(to, from) {
-      const activeTab = to.query?.tab
+      // 好像没必要
-      if (activeTab && this.iActiveMenu !== activeTab) {
+      // const activeTab = to.query?.tab
-        this.iActiveMenu = activeTab
+      // if (activeTab && this.iActiveMenu !== activeTab) {
-      }
+      //   this.iActiveMenu = activeTab
+      // }
     }
   },
-  activated() {
-    this.iActiveMenu = this.getPropActiveTab()
-    this.loading = false
-  },
   created() {
     this.iActiveMenu = this.getPropActiveTab()
     this.loading = false
@@ -136,15 +135,8 @@ export default {
   methods: {
     handleTabClick(tab) {
       this.$emit('tab-click', tab)
-      this.$emit('update:activeMenu', tab.name)
+      this.iActiveMenu = tab.name
-
       this.$cookie.set(this.$route.path, tab.name, 1)
-
-      if (this.$router.currentRoute.query[this.$route.path]) {
-        this.$router.push({
-          query: { ...this.$route.query, [this.$route.path]: '' }
-        })
-      }
     },
     getPropActiveTab() {
       let activeTab = ''

src/router/console/acls.js

@@ -201,7 +201,7 @@ export default [
             hidden: true,
             meta: {
               title: i18n.t('CommandGroupDetail'),
-              activeMenu: ''
+              activeMenu: '/console/perms/acls/cmd-acls'
             }
           },
           {

src/router/profile/index.js

@@ -28,13 +28,39 @@ export default {
     },
     {
       path: '/profile/password-and-ssh-key',
-      name: 'PasswordAndSSHKey',
+      component: empty,
-      component: () => import('@/views/profile/PasswordAndSSHKey/index'),
       meta: {
-        title: i18n.t('PasswordAndSSHKey'),
+        icon: 'personal'
-        icon: 'personal',
+      },
-        permissions: []
+      children: [
-      }
+        {
+          path: '',
+          component: () => import('@/views/profile/PasswordAndSSHKey/index'),
+          name: 'SSHKeyList',
+          icon: 'key',
+          meta: { title: i18n.t('PasswordAndSSHKey'), permissions: ['authentication.view_sshkey'] }
+        },
+        {
+          path: 'create',
+          component: () => import('@/views/profile/PasswordAndSSHKey/SSHKey/SSHKeyCreateUpdate.vue'),
+          name: 'SSHKeyCreate',
+          hidden: true,
+          meta: {
+            title: i18n.t('SSHKey'),
+            permissions: ['authentication.add_sshkey']
+          }
+        },
+        {
+          path: ':id/update',
+          component: () => import('@/views/profile/PasswordAndSSHKey/SSHKey/SSHKeyCreateUpdate.vue'),
+          name: 'SSHKeyUpdate',
+          hidden: true,
+          meta: {
+            title: i18n.t('SSHKey'),
+            permissions: ['authentication.change_sshkey']
+          }
+        }
+      ]
     },
     {
       path: '/profile/passkeys',

src/styles/index.scss

@@ -38,7 +38,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: auto;
   color: var(--color-text-primary);
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   line-height: 1.428;
 }
@@ -586,3 +586,16 @@ li.rmenu i.fa {
     color: var(--color-link);
   }
 }
+
+.el-table__row {
+  ::-webkit-scrollbar {
+    width: 6px; /* 设置垂直滚动条的宽度 */
+    height: 6px; /* 设置水平滚动条的高度 */
+  }
+}
+
+.black-theme-popover {
+  width: 300px;
+  max-height: 700px;
+  overflow-y: scroll;
+}

src/styles/menu.scss

@@ -23,6 +23,10 @@ $single-menu-height: 38px;
   }
 }
 
+.el-menu--vertical {
+  background-color: #fff;
+}
+
 .el-menu {
   border-right: none !important;
   background-color: inherit !important;
@@ -139,6 +143,10 @@ $single-menu-height: 38px;
       .nest-menu .level2-menu {
         line-height: $single-menu-height;
       }
+
+      .el-tooltip {
+        width: 55px !important;
+      }
     }
   }
 }

src/styles/ztree_icon.scss

@@ -112,15 +112,15 @@
     background: url('./icons/gpt.png') no-repeat center left transparent;
   }
 
-  &.WebCloud_ico_docu {
-    background: url('icons/cloud.png') no-repeat center left transparent;
-    background-size: contain;
-  }
-
   &.clickhouse_ico_docu {
     background: url('./icons/clickhouse.png') no-repeat center left transparent;
   }
 
+  &.WebCloud_ico_docu {
+    background: url('./icons/cloud.png') no-repeat center left transparent;
+    background-size: contain;
+  }
+
   &.ico_loading {
     background: url(./icons/loading.gif) no-repeat scroll 0 0 transparent;
   }

src/utils/auth.js

@@ -1,7 +1,7 @@
 import VueCookie from 'vue-cookie'
 
-const CURRENT_ORG_KEY = 'jms_current_org'
+const CURRENT_ORG_KEY = 'currentOrg'
-const CURRENT_ROLE_KEY = 'jms_current_role'
+const CURRENT_ROLE_KEY = 'currentRole'
 let cookieNamePrefix = VueCookie.get('SESSION_COOKIE_NAME_PREFIX')
 if (!cookieNamePrefix || ['""', "''"].indexOf(cookieNamePrefix) > -1) {
   cookieNamePrefix = ''
@@ -17,7 +17,7 @@ export function setTokenToCookie(value, expires) {
 }
 
 export function getCurrentRoleLocal(username) {
-  const key = CURRENT_ROLE_KEY + '_' + username
+  const key = CURRENT_ROLE_KEY + ':' + username
   const role = localStorage.getItem(key)
   if (role) {
     return parseInt(role) || null
@@ -26,12 +26,12 @@ export function getCurrentRoleLocal(username) {
 }
 
 export function saveCurrentRoleLocal(username, role) {
-  const key = CURRENT_ROLE_KEY + '_' + username
+  const key = CURRENT_ROLE_KEY + ':' + username
   return localStorage.setItem(key, role)
 }
 
 export function getCurrentOrgLocal(username) {
-  const key = CURRENT_ORG_KEY + '_' + username
+  const key = CURRENT_ORG_KEY + ':' + username
   const value = localStorage.getItem(key)
   try {
     return JSON.parse(value)
@@ -41,18 +41,18 @@ export function getCurrentOrgLocal(username) {
 }
 
 export function saveCurrentOrgLocal(username, org) {
-  const key = CURRENT_ORG_KEY + '_' + username
+  const key = CURRENT_ORG_KEY + ':' + username
   localStorage.setItem(key, JSON.stringify(org))
   VueCookie.set('X-JMS-ORG', org.id)
 }
 
 export function setPreOrgLocal(username, org) {
-  const key = 'PRE_ORG_' + username
+  const key = 'preOrg' + ':' + username
   localStorage.setItem(key, JSON.stringify(org))
 }
 
 export function getPreOrgLocal(username) {
-  const key = 'PRE_ORG_' + username
+  const key = 'preOrg' + ':' + username
   const value = localStorage.getItem(key)
   try {
     return JSON.parse(value)

src/utils/common.js

@@ -128,6 +128,8 @@ export function getErrorResponseMsg(error) {
     }).filter(i => i).join('; ')
   } else if (typeof data === 'string') {
     return data
+  } else {
+    msg = error.toString()
   }
   return msg
 }
@@ -310,4 +312,26 @@ export function toSentenceCase(string) {
   }).join(' ')
   return s[0].toUpperCase() + s.slice(1)
 }
+
 export { BASE_URL }
+
+export function openNewWindow(url) {
+  let count
+  let top = 50
+  count = parseInt(window.sessionStorage.getItem('newWindowCount'), 10)
+  if (isNaN(count)) {
+    count = 0
+  }
+  let left = 100 + count * 100
+  top = 50 + count * 50
+  if (left + screen.width / 3 > screen.width) {
+    // 支持两排足以
+    top = screen.height / 3
+    count = 1
+    left = 100
+  }
+  let params = 'toolbar=yes,scrollbars=yes,resizable=yes'
+  params = params + `,top=${top},left=${left},width=${screen.width / 3},height=${screen.height / 3}`
+  window.sessionStorage.setItem('newWindowCount', `${count + 1}`)
+  window.open(url, '_blank', params)
+}

src/utils/elTableTooltipPatch.js

@@ -26,7 +26,8 @@ Object.assign(Table.components.TableBody.methods, {
     const range = document.createRange()
     range.setStart(cellChild, 0)
     range.setEnd(cellChild, cellChild.childNodes.length)
-    const rangeWidth = range.getBoundingClientRect().width
+    // rangeWidth 有可能是小数，因此就会导致原本 rangeWidth + padding = cellChild.offsetWidth 的大于了 cellChild.offsetWidth
+    const rangeWidth = Math.floor(range.getBoundingClientRect().width)
     const padding = (parseInt(getStyle(cellChild, 'paddingLeft'), 10) || 0) +
         (parseInt(getStyle(cellChild, 'paddingRight'), 10) || 0)
     if (

src/utils/jms.js

@@ -109,7 +109,7 @@ export function isSameView(to, from) {
 
 export function getPropView() {
   const hasPermedViews = getPermedViews()
-  const preView = localStorage.getItem('PreView')
+  const preView = localStorage.getItem('preView')
   const hasPerm = hasPermedViews.indexOf(preView) > -1
   if (hasPerm) {
     return preView

src/utils/request.js

@@ -3,7 +3,6 @@ import i18n from '@/i18n/i18n'
 import { eventBus } from '@/utils/const'
 import { getTokenFromCookie } from '@/utils/auth'
 import { getErrorResponseMsg } from '@/utils/common'
-import { refreshSessionIdAge } from '@/api/users'
 import { MessageBox } from 'element-ui'
 import { message } from '@/utils/message'
 import store from '@/store'
@@ -102,20 +101,6 @@ export function flashErrorMsg({ response, error }) {
   }
 }
 
-let timer = null
-
-function refreshSessionAgeDelay(response) {
-  if (response.request.responseURL.indexOf('/users/profile/') !== -1) {
-    return
-  }
-  if (timer) {
-    clearTimeout(timer)
-  }
-  timer = setTimeout(function() {
-    refreshSessionIdAge()
-  }, 30 * 1000)
-}
-
 function ifConfirmRequired({ response, error }) {
   if (response.status !== 412) {
     return null
@@ -142,7 +127,6 @@ service.interceptors.response.use(
    */
   response => {
     // NProgress.done()
-    refreshSessionAgeDelay(response)
     const res = response.data
     store.dispatch('common/digestSQLQuery', response).then()
 

src/utils/startup.js

@@ -24,6 +24,9 @@ async function checkLogin({ to, from, next }) {
   } catch (e) {
     Vue.$log.error(e)
     const status = e.response.status
+    if (store.getters.currentOrg.autoEnter) {
+      await store.dispatch('users/setCurrentOrg', store.getters.preOrg)
+    }
     if (status === 401 || status === 403) {
       setTimeout(() => {
         window.location = process.env.VUE_APP_LOGIN_PATH

src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue

@@ -19,7 +19,7 @@ export default {
       initial: {
         is_periodic: false,
         password_rules: {
-          length: 16
+          length: 36
         },
         interval: 24,
         accounts: [],

src/views/accounts/AccountPush/AccountPushCreateUpdate.vue

@@ -21,7 +21,7 @@ export default {
       initial: {
         is_periodic: false,
         password_rules: {
-          length: 30
+          length: 36
         },
         interval: 24,
         secret_type: 'password',

src/views/accounts/const.js

@@ -4,7 +4,7 @@ import InputWithUnit from '@/components/Form/FormFields/InputWithUnit.vue'
 import store from '@/store'
 
 const validatorInterval = (rule, value, callback) => {
-  if (parseInt(value) < 1) {
+  if (isNaN(parseInt(value, 10)) || parseInt(value) < 1) {
     return callback(new Error(i18n.t('EnsureThisValueIsGreaterThanOrEqualTo1')))
   }
   callback()

src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue

@@ -60,7 +60,7 @@ export default {
           }
         },
         reviewers: {
-          hidden: (item) => !['review', 'warning'].includes(item.action),
+          hidden: (item) => !['review', 'warning', 'notify_and_warn'].includes(item.action),
           rules: [rules.RequiredChange],
           el: {
             value: [],

src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue

@@ -68,11 +68,6 @@ export default {
         }
       }
     }
-  },
-  activated() {
-    setTimeout(() => {
-      this.$refs.listTable.reloadTable()
-    }, 300)
   }
 }
 </script>

src/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index.vue

@@ -32,15 +32,9 @@ export default {
             title: this.$t('Basic'),
             name: 'Detail'
           }
-        ],
+        ]
-        actions: {
-        }
       }
     }
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/views/acl/CommandAcl/CommandGroup/CommandGroupList.vue

@@ -53,11 +53,6 @@ export default {
         }
       }
     }
-  },
+  }
-  computed: {}
 }
 </script>
-
-<style>
-
-</style>

src/views/acl/CommandAcl/index.vue

@@ -2,7 +2,6 @@
   <TabPage
     :active-menu.sync="config.activeMenu"
     :submenu="config.submenu"
-    @tab-click="handleTabClick"
   />
 </template>
 
@@ -35,20 +34,6 @@ export default {
         ]
       }
     }
-  },
-  mounted() {
-  },
-  methods: {
-    handleTabClick(tab) {
-      const query = _.cloneDeep(this.$route.query)
-      const newQuery = {
-        ...query,
-        tab: tab.name
-      }
-      this.$nextTick(() => {
-        this.$router.replace({ query: newQuery })
-      })
-    }
   }
 }
 </script>

src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue

@@ -47,6 +47,7 @@ export default {
     return {
       loading: true,
       platform: {},
+      changePlatformID: '',
       defaultConfig: {
         initial: {},
         platform: {},
@@ -131,7 +132,7 @@ export default {
       const { defaultConfig } = this
       const { node, platform } = this.$route?.query || {}
       const nodesInitial = node ? [node] : []
-      const platformId = platform || 'Linux'
+      const platformId = this.changePlatformID ? this.changePlatformID : (platform || 'Linux')
       const url = `/api/v1/assets/platforms/${platformId}/`
       this.platform = await this.$axios.get(url)
       const initial = {

src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue

@@ -25,17 +25,17 @@ export default {
       const platform = this.$route.query.type
       const baseFields = [[this.$t('Basic'), ['db_name']]]
       let tlsFields = ['use_ssl', 'ca_cert']
-      switch (platform) {
+      const platformFieldsMap = {
-        case 'redis':
+        redis: ['client_cert', 'client_key'],
-          tlsFields = tlsFields.concat(['client_cert', 'client_key'])
+        postgresql: ['client_cert', 'client_key', 'pg_ssl_mode'],
-          break
+        mysql: ['client_cert', 'client_key', 'allow_invalid_cert'],
-        case 'mysql':
+        mongodb: ['client_key', 'allow_invalid_cert']
-          tlsFields = tlsFields.concat(['client_cert', 'client_key', 'allow_invalid_cert'])
-          break
-        case 'mongodb':
-          tlsFields = tlsFields.concat(['client_key', 'allow_invalid_cert'])
-          break
       }
+
+      if (platformFieldsMap[platform]) {
+        tlsFields = tlsFields.concat(platformFieldsMap[platform])
+      }
+
       if (tlsFields.length > 2) {
         const secureField = [
           this.$t('Secure'), tlsFields, 2
@@ -52,7 +52,14 @@ export default {
         },
         use_ssl: {
           label: this.$t('UseSSL'),
-          component: 'el-switch'
+          component: 'el-switch',
+          on: {
+            change: ([event], updateForm) => {
+              updateForm({
+                pg_ssl_mode: event ? 'require' : 'prefer'
+              })
+            }
+          }
         },
         allow_invalid_cert: {
           label: this.$t('AllowInvalidCert'),

src/views/assets/Asset/AssetDetail/Account.vue

@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      title: this.$t('QuickTest'),
+      title: this.$t('Test'),
       templateDialogVisible: false,
       columnsDefault: ['name', 'username', 'asset'],
       headerExtraActions: [

src/views/assets/Asset/AssetList/AllList.vue

@@ -48,7 +48,8 @@ export default {
       },
       tableConfig: {
         url: tableUrl,
-        category: 'all'
+        category: 'all',
+        extraQuery: { 'order': '-date_updated' }
       },
       headerActions: {
         handleImportClick: ({ selectedRows }) => {

src/views/assets/Asset/AssetList/HostList.vue

@@ -61,7 +61,7 @@ export default {
                       row['auto_config'].ansible_enabled &&
                       row['auto_config'].ping_enabled,
                     callback: ({ row }) => {
-                      if (row.platform.name === 'Gateway') {
+                      if (row.platform.name.startsWith('Gateway')) {
                         this.GatewayVisible = true
                         const port = row.protocols.find(item => item.name === 'ssh').port
                         if (!port) {

src/views/assets/Asset/AssetList/components/BaseList.vue

@@ -191,7 +191,7 @@ export default {
                     row?.auto_config?.ansible_enabled &&
                     row?.auto_config?.ping_enabled,
                   callback: ({ row }) => {
-                    if (row.platform.name === 'Gateway') {
+                    if (row.platform.name.startsWith('Gateway')) {
                       this.GatewayVisible = true
                       const port = row.protocols.find(item => item.name === 'ssh').port
                       if (!port) {

src/views/assets/Asset/AssetList/components/PlatformDialog.vue

@@ -22,15 +22,17 @@
               :key="platform.id"
               :span="6"
             >
-              <el-card
+              <el-tooltip :content="platform.name" :open-delay="1000">
-                :style="{ borderLeftColor: randomBorderColor(index) }"
+                <el-card
-                class="platform-item"
+                  :style="{ borderLeftColor: randomBorderColor(index) }"
-                shadow="hover"
+                  class="platform-item"
-                @click.native="createAsset(platform)"
+                  shadow="hover"
-              >
+                  @click.native="createAsset(platform)"
-                <img :src="loadImage(platform)" alt="icon" class="asset-icon">
+                >
-                <span class="platform-name">{{ platform.name }}</span>
+                  <img :src="loadImage(platform)" alt="icon" class="asset-icon">
-              </el-card>
+                  <span class="platform-name">{{ platform.name }}</span>
+                </el-card>
+              </el-tooltip>
             </el-col>
           </el-collapse-item>
         </el-collapse>
@@ -195,7 +197,11 @@ export default {
   margin: 5px 0;
 
   & ::v-deep .el-card__body {
-    padding: 10px
+    padding: 10px;
+    flex-wrap: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   border-left: solid 4px;
@@ -230,14 +236,16 @@ export default {
 }
 
 .asset-icon {
-  width: 1.5em;
+  width: 2em;
-  height: 1.5em;
+  height: 2em;
   vertical-align: -0.2em;
   fill: currentColor;
-  overflow: hidden;
 }
 
 .platform-name {
   margin-left: 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 </style>

src/views/assets/Asset/AssetList/index.vue

@@ -89,14 +89,15 @@ export default {
   },
   methods: {
     handleTabClick(tab) {
-      const query = _.cloneDeep(this.$route.query)
+      // 这样不行，会闪
-      const newQuery = {
+      // const query = _.cloneDeep(this.$route.query)
-        ...query,
+      // const newQuery = {
-        tab: tab.name
+      //   ...query,
-      }
+      //   tab: tab.name
-      this.$nextTick(() => {
+      // }
-        this.$router.replace({ query: newQuery })
+      // this.$nextTick(() => {
-      })
+      //   this.$router.replace({ query: newQuery })
+      // })
     }
   }
 }

src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue

@@ -109,7 +109,7 @@ export default {
           }
         },
         {
-          title: this.$t('Timer'),
+          title: this.$t('TimerExecution'),
           attrs: {
             model: this.object.task,
             type: 'primary',
@@ -173,7 +173,7 @@ export default {
         },
         {
           key: this.$t('Region'),
-          value: this.object.task?.regions,
+          value: this.object.task?.regions_display,
           formatter(row, value) {
             return (<div>{
               value?.map((content) => {

src/views/assets/Cloud/Account/AccountDetail/TaskHistoryList.vue

@@ -64,8 +64,11 @@ export default {
             formatter: DateFormatter
           },
           {
-            prop: 'summary.triggerMode',
+            prop: 'trigger',
-            label: this.$t('TriggerMode')
+            label: this.$t('TriggerMode'),
+            formatter: row => {
+              return row.trigger.label
+            }
           },
           {
             prop: 'actions',

src/views/assets/Cloud/Account/components/ProviderPanel.vue

@@ -51,6 +51,7 @@ export default {
     }
   },
   data() {
+    console.log('ProviderPanel', this.providers)
     return {}
   },
   methods: {

src/views/assets/Cloud/Account/components/TimingPanel.vue

@@ -73,6 +73,7 @@ export default {
           btn.loading = true
         }
       })
+      form.value.interval = parseInt(form.value.interval, 10)
       this.$refs.form.$refs.form.dataForm.submitForm('form', false)
     },
     handleSubmitSuccess(res) {

src/views/assets/Cloud/Strategy/StrategyDetail/index.vue

@@ -31,6 +31,12 @@ export default {
           }
         ],
         actions: {
+          canUpdate: () => {
+            return this.Account.name !== 'default'
+          },
+          canDelete: () => {
+            return this.Account.name !== 'default'
+          },
           deleteSuccessRoute: 'CloudAccountList',
           updateCallback: () => {
             const id = this.$route.params.id

src/views/assets/Cloud/Strategy/components/ActionInput.vue

@@ -39,7 +39,8 @@ export default {
         submitBtnSize: 'mini',
         submitBtnText: this.$t('Add'),
         hasReset: false,
-        onSubmit: () => {},
+        onSubmit: () => {
+        },
         submitMethod: () => 'post',
         getUrl: () => '',
         cleanFormValue(data) {
@@ -86,7 +87,11 @@ export default {
                   this.formConfig.fieldsMeta.protocols.el.hidden = true
                 }
                 this.resourceType = val
-                this.formConfig.fieldsMeta.value.el.ajax.url = url
+                if (url) {
+                  this.formConfig.fieldsMeta.value.el.ajax.url = url
+                } else {
+                  this.formConfig.fieldsMeta.attr.el.remote = false
+                }
                 this.formConfig.fieldsMeta.value.el.options = options
               }
             }
@@ -151,21 +156,31 @@ export default {
       tableConfig: {
         columns: [
           { prop: 'attr', label: this.$t('ResourceType'), formatter: tableFormatter('resource_type') },
-          { prop: 'value', label: this.$t('Resource'), formatter: tableFormatter('resource', () => { return this.globalResource }) },
+          {
+            prop: 'value', label: this.$t('Resource'), formatter: tableFormatter('resource', () => {
+              return this.globalResource
+            })
+          },
           { prop: 'protocols', label: this.$t('Other'), formatter: tableFormatter('protocols') },
-          { prop: 'action', label: this.$t('Action'), align: 'center', width: '100px', formatter: (row, col, cellValue, index) => {
+          {
-            return (
+            prop: 'action',
-              <div className='input-button'>
+            label: this.$t('Action'),
-                <el-button
+            align: 'center',
-                  icon='el-icon-minus'
+            width: '100px',
-                  size='mini'
+            formatter: (row, col, cellValue, index) => {
-                  style={{ 'flexShrink': 0 }}
+              return (
-                  type='danger'
+                <div className='input-button'>
-                  onClick={ this.handleDelete(index) }
+                  <el-button
-                />
+                    icon='el-icon-minus'
-              </div>
+                    size='mini'
-            )
+                    style={{ 'flexShrink': 0 }}
-          } }
+                    type='danger'
+                    onClick={this.handleDelete(index)}
+                  />
+                </div>
+              )
+            }
+          }
         ],
         totalData: this.value || [],
         hasPagination: false
@@ -177,7 +192,9 @@ export default {
   },
   methods: {
     init() {
-      this.nameOptions.map((o) => { this.globalResource[o.value] = o.label })
+      this.nameOptions.map((o) => {
+        this.globalResource[o.value] = o.label
+      })
     },
     onSubmit() {
       this.$emit('input', this.tableConfig.totalData)
@@ -218,9 +235,11 @@ export default {
 ::v-deep .el-form-item:nth-child(-n+3) {
   width: 43.5%;
 }
+
 ::v-deep .el-form-item:last-child {
   width: 6%;
 }
+
 .action-input {
   margin-top: -10px;
 }

src/views/assets/Domain/DomainCreateUpdate.vue

@@ -30,7 +30,7 @@ export default {
               domain_enabled: true
             },
             canSelect: (row) => {
-              return row.platform?.name !== 'Gateway'
+              return !row.platform?.name.startsWith('Gateway')
             }
           }
         },