Fixed: Tree icons

v4.10.2

src/components/Apps/AccountSelect/dialog.vue

@@ -1,221 +0,0 @@
-<template>
-  <Dialog
-    :close-on-click-modal="false"
-    :title="$t('AssetAccount')"
-    custom-class="account-select-dialog"
-    top="2vh"
-    v-bind="$attrs"
-    width="1000px"
-    @cancel="handleCancel"
-    @close="handleClose"
-    @confirm="handleConfirm"
-    v-on="$listeners"
-  >
-    <AssetTreeTable
-      ref="ListPage"
-      :header-actions="headerActions"
-      :node-url="baseNodeUrl"
-      :sync-select-to-url="false"
-      :table-config="tableConfig"
-      :tree-setting="iTreeSetting"
-      :tree-url="`${baseNodeUrl}children/tree/`"
-      :url="baseUrl"
-      class="tree-table"
-      v-bind="$attrs"
-      @loaded="handleTableLoaded"
-      v-on="$listeners"
-    />
-  </Dialog>
-</template>
-
-<script>
-import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
-import Dialog from '@/components/Dialog/index.vue'
-
-export default {
-  componentName: 'AssetSelectDialog',
-  components: { AssetTreeTable, Dialog },
-  props: {
-    baseUrl: {
-      type: String,
-      default: '/api/v1/accounts/accounts/'
-    },
-    baseNodeUrl: {
-      type: String,
-      default: '/api/v1/assets/nodes/'
-    },
-    value: {
-      type: Array,
-      default: () => []
-    },
-    canSelect: {
-      type: Function,
-      default(row, index) {
-        return true
-      }
-    },
-    disabled: {
-      type: [Boolean, Function],
-      default: false
-    },
-    treeSetting: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    const vm = this
-    return {
-      isLoaded: false,
-      dialogVisible: false,
-      rowSelected: _.cloneDeep(this.value) || [],
-      rowsAdd: [],
-      tableConfig: {
-        url: this.baseUrl,
-        hasTree: true,
-        canSelect: this.canSelect,
-        columns: [
-          {
-            prop: 'name',
-            label: this.$t('Name'),
-            sortable: true
-          },
-          {
-            prop: 'username',
-            label: this.$t('Username'),
-            sortable: 'custom'
-          },
-          {
-            prop: 'asset.name',
-            label: this.$t('Asset'),
-            sortable: 'custom',
-            formatter: function(row) {
-              return row.asset.name
-            }
-          },
-          {
-            prop: 'asset.platform.name',
-            label: this.$t('Platform'),
-            sortable: true,
-            formatter: function(row) {
-              return row.asset.platform.name
-            }
-          },
-          {
-            prop: 'secret_type.label',
-            label: this.$t('SecretType'),
-            sortable: true,
-            formatter: function(row) {
-              return row.secret_type.label
-            }
-          },
-          {
-            prop: 'actions',
-            has: false
-          }
-        ],
-        listeners: {
-          'toggle-row-selection': (isSelected, row) => {
-            if (isSelected) {
-              vm.addRowToSelect(row)
-            } else {
-              vm.removeRowFromSelect(row)
-            }
-          }
-        }
-        // theRowDefaultIsSelected: (row) => {
-        //   return this.value.indexOf(row.id) > -1
-        // }
-      },
-      headerActions: {
-        hasLeftActions: false,
-        hasRightActions: false,
-        hasLabelSearch: true,
-        searchConfig: {
-          getUrlQuery: false
-        }
-      }
-    }
-  },
-  computed: {
-    iTreeSetting() {
-      return { ...this.treeSetting, selectSyncToRoute: false }
-    }
-  },
-  methods: {
-    handleTableLoaded() {
-      this.isLoaded = true
-    },
-    handleClose() {
-      this.$refs.ListPage.$refs.TreeList.componentKey += 1
-    },
-    handleConfirm() {
-      this.$emit('confirm', this.rowSelected, this.rowsAdd)
-      if (this.rowSelected.length > 0) {
-        this.handleClose()
-      }
-    },
-    handleCancel() {
-      this.$emit('cancel')
-      this.handleClose()
-    },
-    addRowToSelect(row) {
-      this.rowSelected.push(row.username)
-      this.rowsAdd.push(row)
-      // const selectValueIndex = this.rowSelected.indexOf(row.id)
-      // if (selectValueIndex === -1) {
-      //   this.rowSelected.push(row.id)
-      //   this.rowsAdd.push(row)
-      // }
-    },
-    removeRowFromSelect(row) {
-      const selectValueIndex = this.rowSelected.indexOf(row.username)
-      this.rowSelected.splice(selectValueIndex, 1)
-      // const selectValueIndex = this.rowSelected.indexOf(row.id)
-      // if (selectValueIndex > -1) {
-      //   this.rowSelected.splice(selectValueIndex, 1)
-      // }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page ::v-deep .page-heading {
-  display: none;
-}
-
-.el-dialog__wrapper ::v-deep .el-dialog__body {
-  padding: 0 0 0 3px;
-
-  .tree-table {
-    .search {
-    }
-
-    .left {
-      padding: 5px;
-    }
-
-    .right {
-      min-height: 500px;
-      overflow: auto;
-    }
-
-    .mini {
-      padding-top: 8px;
-    }
-
-    .transition-box {
-      padding: 10px 5px;
-    }
-  }
-}
-
-.page ::v-deep .treebox .ztree {
-
-}
-
-.account-select-dialog ::v-deep .el-icon-circle-check {
-  display: none;
-}
-</style>

src/components/Common/QuickActions/action.vue

@@ -1,23 +1,25 @@
 <template>
   <tr>
+    <td>{{ getActionTitle(action) }}</td>
     <td>
-      {{ getActionTitle(action) }}
-      <el-tooltip v-if="action.attrs.showTip" :content="action.attrs.tip" :open-delay="500" effect="dark">
-        <i class="fa fa-question-circle-o" />
-      </el-tooltip>
-    </td>
-    <td>
-      <span slot="reference">
-        <component
-          :is="iType"
-          v-model="action.attrs.model"
-          :title="label"
-          v-bind="action.attrs"
-          v-on="callbacks"
-        >
-          {{ label }}
-        </component>
-      </span>
+      <el-popover
+        :content="action.attrs.tip"
+        :disabled="!action.attrs.showTip"
+        placement="left-end"
+        trigger="hover"
+      >
+        <span slot="reference">
+          <component
+            :is="iType"
+            v-model="action.attrs.model"
+            :title="label"
+            v-bind="action.attrs"
+            v-on="callbacks"
+          >
+            {{ label }}
+          </component>
+        </span>
+      </el-popover>
     </td>
   </tr>
 </template>

src/components/Table/DrawerListTable/index.vue

@@ -196,23 +196,18 @@ export default {
       }
 
       let title = this.title
-
       if (!title && this.resource) {
         title = this.resource
       }
-
       if (!title) {
         title = this.$route.meta?.title
         title = title.replace('List', '').replace('列表', '')
         title = _.trimEnd(title, 's')
       }
-
       if (!title) {
         title = this.$t('NoTitle')
       }
-
       let actionLabel = ''
-
       if (action === 'clone' || action === 'create') {
         actionLabel = this.$t('Create')
       } else if (action === 'update') {
@@ -220,9 +215,7 @@ export default {
       } else if (action === 'detail') {
         actionLabel = this.$t('Detail')
       }
-
       title = actionLabel + this.$t('WordSep') + toLowerCaseExcludeAbbr(title)
-
       return title
     },
     getDefaultDrawer(action) {

src/components/Table/TagSearch/index.vue

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

src/layout/components/Page/PasswordExpireTip.vue

@@ -33,8 +33,8 @@ export default {
         return this.$t('PasswordExpired')
       }
       if (securityPasswordExpirationTime - intervalTime <= 5) {
-        return this.$t('PasswordWillExpiredPrefixMsg') + ' ' +
-          (securityPasswordExpirationTime - intervalTime) + ' ' +
+        return this.$t('PasswordWillExpiredPrefixMsg') +
+          (securityPasswordExpirationTime - intervalTime) +
           this.$t('PasswordWillExpiredSuffixMsg')
       }
       return false

src/views/accounts/AccountDiscover/DeleteDialog.vue

@@ -131,7 +131,7 @@ export default {
       })
     },
     handleConfirm() {
-      const url = `/api/v1/accounts/gathered-accounts/${this.account.id}/`
+      const url = '/api/v1/accounts/gathered-accounts/'
       this.$axios.delete(url, {
         params: {
           username: this.account.username,

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

@@ -98,21 +98,6 @@ export default {
               this.updateTaskData({ 'release_assets': val })
             }.bind(this)
           }
-        },
-        {
-          title: this.$t('IsAlwaysUpdate'),
-          type: 'switch',
-          attrs: {
-            showTip: true,
-            tip: this.$t('IsAlwaysUpdateHelpTip'),
-            model: this.object.task.is_always_update,
-            disabled: !this.hasEditPerm()
-          },
-          callbacks: {
-            change: function(val) {
-              this.updateTaskData({ 'is_always_update': val })
-            }.bind(this)
-          }
         }
       ],
       quickExecuteActions: [

src/views/perms/AssetPermission/components/AccountFormatter.vue

@@ -27,14 +27,8 @@
           <el-button size="mini" type="primary" @click="showTemplateDialog=true">
             {{ $t('TemplateAdd') }}
           </el-button>
-          <span v-if="showAddAccount">
-            <el-button size="mini" type="primary" @click="showAccountSelectDialog=true">
-              {{ $t('AssetAccount') }}
-            </el-button>
-          </span>
           <span class="help-block">
             {{ addTemplateHelpText }}
-            {{ addAccountSelectHelpText }}
           </span>
         </span>
       </div>
@@ -79,15 +73,6 @@
     >
       <ListTable ref="templateTable" v-bind="accountTemplateTable" />
     </Dialog>
-    <AccountSelectDialog
-      v-if="showAccountSelectDialog"
-      :value="value"
-      :visible.sync="showAccountSelectDialog"
-      v-bind="$attrs"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      v-on="$listeners"
-    />
   </el-form>
 </template>
 
@@ -107,11 +92,9 @@ import {
 } from '@/views/perms/const'
 import ListTable from '@/components/Table/ListTable'
 import Dialog from '@/components/Dialog'
-import AccountSelectDialog from '@/components/Apps/AccountSelect/dialog.vue'
 
 export default {
   components: {
-    AccountSelectDialog,
     TagInput,
     ListTable,
     Dialog
@@ -146,16 +129,6 @@ export default {
       default() {
         return this.$t('TemplateHelpText')
       }
-    },
-    addAccountSelectHelpText: {
-      type: String,
-      default() {
-        return this.$t('AccountSelectHelpText')
-      }
-    },
-    showAddAccount: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
@@ -167,7 +140,6 @@ export default {
       VIRTUAL: virtual,
       EXCLUDE: NotAccount,
       showTemplateDialog: false,
-      showAccountSelectDialog: false,
       realRadioSelected: this.ALL,
       realChoices: realChoices,
       virtualChecked: false,
@@ -308,19 +280,6 @@ export default {
 
       this.$emit('input', choicesSelected)
       this.$emit('change', choicesSelected)
-    },
-    handleConfirm(valueSelected, rowsAdd) {
-      if (valueSelected === undefined) { return }
-      const newUsernames = [...new Set(rowsAdd.map(row => row.username))]
-      this.specAccountsInput = [...new Set([...this.specAccountsInput, ...newUsernames])]
-      this.outputValue()
-      setTimeout(() => {
-        this.showAccountSelectDialog = false
-        this.outputValue()
-      }, 100)
-    },
-    handleCancel() {
-      this.showAccountSelectDialog = false
     }
   }
 }
@@ -374,33 +333,4 @@ export default {
   }
 }
 
-.el-dialog__wrapper ::v-deep .el-dialog__body {
-  padding: 0 0 0 3px;
-
-  .tree-table {
-    .left {
-      padding: 5px 0;
-
-      .ztree {
-        height: 100%;
-      }
-    }
-
-    .right {
-      .transition-box {
-        padding-left: 0;
-      }
-    }
-
-    .mini {
-      padding-top: 8px;
-      width: 1px;
-    }
-
-    .transition-box {
-      padding: 10px 5px;
-    }
-  }
-}
-
 </style>

src/views/settings/Applet/AppletHost/AppletHostDetail/Applets.vue

@@ -42,16 +42,9 @@ export default {
           'applet.display_name', 'applet.version',
           'date_updated', 'status', 'actions'
         ],
-        columnsShow: {
-          min: ['name', 'actions'],
-          default: [
-            'applet.display_name', 'status', 'actions'
-          ]
-        },
         columnsMeta: {
           'applet.display_name': {
             label: this.$t('DisplayName'),
-            width: '160px',
             formatter: DetailFormatter,
             formatterArgs: {
               drawer: true,
@@ -68,7 +61,7 @@ export default {
             label: this.$t('Version')
           },
           status: {
-            label: this.$t('Status'),
+            label: this.$t('PublishStatus'),
             formatter: (row) => {
               const typeMapper = {
                 'pending': 'success',
@@ -84,7 +77,7 @@ export default {
             label: this.$t('Date')
           },
           actions: {
-            width: '138px',
+            width: '160px',
             formatterArgs: {
               hasUpdate: false,
               hasDelete: false,