fix(ui) (#13)

veops · Feb 4, 2024 · ca84203 · ca84203
1 parent 357880d
commit ca84203
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/oneterm-ui/src/modules/oneterm/views/assets/assets/account.vue b/oneterm-ui/src/modules/oneterm/views/assets/assets/account.vue
@@ -13,8 +13,8 @@
             <treeselect
               class="custom-treeselect custom-treeselect-bgcAndBorder"
               :style="{
-                '--custom-height': '24px',
-                lineHeight: '24px',
+                '--custom-height': '32px',
+                lineHeight: '32px',
                 '--custom-bg-color': '#fff',
                 '--custom-border': '1px solid #d9d9d9',
               }"
@@ -51,8 +51,8 @@
             <treeselect
               class="custom-treeselect custom-treeselect-bgcAndBorder"
               :style="{
-                '--custom-height': '24px',
-                lineHeight: '24px',
+                '--custom-height': '32px',
+                lineHeight: '32px',
                 '--custom-bg-color': '#fff',
                 '--custom-border': '1px solid #d9d9d9',
               }"
@@ -95,11 +95,13 @@
               :placeholder="`${$t(`placeholder2`)}`"
               class="custom-treeselect custom-treeselect-bgcAndBorder"
               :style="{
-                '--custom-height': '24px',
-                lineHeight: '24px',
+                '--custom-height': '32px',
+                lineHeight: '32px',
                 '--custom-bg-color': '#fff',
                 '--custom-border': '1px solid #d9d9d9',
+                '--custom-multiple-lineHeight': '18px',
               }"
+              :limit="1"
             />
           </td>
           <td>

diff --git a/oneterm-ui/src/modules/oneterm/views/assets/security/command.vue b/oneterm-ui/src/modules/oneterm/views/assets/security/command.vue
@@ -214,7 +214,7 @@ export default {
       return null
     },
     changeEnable(row) {
-      putCommandById(row.id, { ...row, enable: Number(!row.enable) }).then(() => {
+      putCommandById(row.id, { ...row, enable: Boolean(!row.enable) }).then(() => {
         this.$message.success(this.$t('editSuccess'))
         this.updateTableData()
       })

diff --git a/oneterm-ui/src/style/global.less b/oneterm-ui/src/style/global.less
@@ -887,6 +887,9 @@ body {
     border: none;
     box-shadow: 0px 4px 6px rgba(78, 94, 160, 0.25) !important;
   }
+  .vue-treeselect__limit-tip-text {
+    margin: 0;
+  }
 }
 
 // 自定义背景颜色和border

diff --git a/oneterm-ui/src/views/setting/components/employeeTreeSelect.vue b/oneterm-ui/src/views/setting/components/employeeTreeSelect.vue
@@ -10,7 +10,7 @@
     :noOptionsText="$t('cs.components.empty')"
     :class="className ? className : 'ops-setting-treeselect'"
     value-consists-of="LEAF_PRIORITY"
-    :limit="20"
+    :limit="limit"
     :limitText="(count) => `+ ${count}`"
     v-bind="$attrs"
     appendToBody
@@ -60,6 +60,10 @@ export default {
       type: String,
       default: 'employee_id',
     },
+    limit: {
+      type: Number,
+      default: 20,
+    },
   },
   data() {
     return {}