n20-common-lib 2.2.38 → 2.2.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.38",
+  "version": "2.2.40",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Filters/index.vue

@@ -3,7 +3,7 @@
     ref="popover"
     v-model="showPop"
     trigger="manual"
-    :width="width"
+    :width="widthAs"
     :title="'筛选' | $lc"
     :popper-class="popperClass"
     placement="bottom-end"
@@ -16,7 +16,7 @@
       v-if="showPopC"
       v-click-outside="clickOut"
       class="n20-filter p-a-s p-b-0"
-      :label-width="labelWidth"
+      :label-width="labelWidthAs + 'px'"
       @submit.native.prevent
     >
       <template v-if="!type">
@@ -83,6 +83,8 @@
 import formItemInput from './form-item-input.vue'
 import footerBox from '../FooterBox/index.vue'
 import showColumn, { getColumns } from '../ShowColumn/index.vue'
+import getWidth from '../../utils/asciiWidth'
+
 export default {
   name: 'Filters',
   components: {
@@ -93,7 +95,7 @@ export default {
   props: {
     width: {
       type: Number,
-      default: 310
+      default: undefined
     },
     defaultShow: {
       type: Number,
@@ -109,7 +111,7 @@ export default {
     },
     labelWidth: {
       type: [String, Number],
-      default: '5em'
+      default: undefined
     },
     type: {
       type: String,
@@ -166,6 +168,25 @@ export default {
     },
     pageId() {
       return 'filter:' + this.filterId
+    },
+    labelWidthAs() {
+      if (this.labelWidth !== undefined) return this.labelWidth
+
+      if (this.type === 'remote') {
+        let maxW = Math.max(4 * 14, ...this.remoteList.map((r) => getWidth(r.label)))
+        return maxW + 14
+      } else {
+        let maxW = Math.max(4 * 14, ...this.minList.map((r) => getWidth(r.label)))
+        if (this.showMore) {
+          maxW = Math.max(maxW, ...this.moreList.map((r) => getWidth(r.label)))
+        }
+        return maxW + 14
+      }
+    },
+    widthAs() {
+      if (this.width !== undefined) return this.width
+
+      return this.labelWidthAs + 240
     }
   },
   methods: {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -164,7 +164,7 @@
         </el-dropdown-item>
         <el-dropdown-item _command="systemSet">
           <el-dropdown trigger="hover" size="medium" placement="left-start" style="width: 100%" @command="setUserFn">
-            <div class="flex-box flex-v">
+            <div class="flex-box flex-v" @click.stop>
               <span>{{ '系统设置' | $lc }}</span>
               <i class="el-icon-caret-right m-l-auto m-r-0"></i>
             </div>

package/src/components/SelectTree/index.vue

@@ -32,7 +32,7 @@
       :default-expanded-keys="expandedKeys"
       :highlight-current="!multiple"
       :show-checkbox="multiple"
-      :check-strictly="true"
+      :check-strictly="checkStrictly"
       :expand-on-click-node="multiple"
       :filter-node-method="filterNode"
       :size="size"
@@ -94,6 +94,10 @@ export default {
       type: Array,
       default: () => []
     },
+    checkStrictly: {
+      type: Boolean,
+      default: true
+    },
     props: {
       type: Object,
       default: () => ({

package/src/components/Table/index.vue

@@ -3,6 +3,7 @@
     v-if="!bigData"
     ref="el-table"
     :key="colsKey"
+    :class="{ 'cell-default-set--': cellDefault, 'clear-in-form-margin': clearInFormMargin }"
     :header-cell-style="{ 'text-align': 'center' }"
     :data="data"
     :height="height"
@@ -152,6 +153,14 @@ export default {
     showSetsize: {
       type: Boolean,
       default: false
+    },
+    cellDefault: {
+      type: Boolean,
+      default: false
+    },
+    clearInFormMargin: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -246,3 +255,11 @@ export default {
   }
 }
 </script>
+<style>
+.cell-default-set-- .el-table__body .el-table__cell .cell:empty::before {
+  content: '--';
+}
+.clear-in-form-margin .el-table__body .el-table__cell .cell .el-form-item {
+  margin-bottom: 0;
+}
+</style>

package/src/utils/asciiWidth.js

@@ -0,0 +1,107 @@
+// 设置表头最小宽度,保证表头不换行
+const ASCII_W = {
+  ' ': 4.125,
+  0: 8.21875,
+  1: 8.21875,
+  2: 8.21875,
+  3: 8.21875,
+  4: 8.21875,
+  5: 8.21875,
+  6: 8.21875,
+  7: 8.21875,
+  8: 8.21875,
+  9: 8.21875,
+  '!': 4.375,
+  '"': 6.109375,
+  '#': 8.9375,
+  $: 8.21875,
+  '%': 12.46875,
+  '&': 12.1875,
+  "'": 3.59375,
+  '(': 4.6875,
+  ')': 4.6875,
+  '*': 6.375,
+  '+': 10.390625,
+  ',': 3.375,
+  '-': 6.0625,
+  '.': 3.375,
+  '/': 5.984375,
+  ':': 3.375,
+  ';': 3.375,
+  '<': 10.390625,
+  '=': 10.390625,
+  '>': 10.390625,
+  '?': 6.765625,
+  '@': 14.4375,
+  A: 9.859375,
+  B: 8.796875,
+  C: 9.375,
+  D: 10.671875,
+  E: 7.703125,
+  F: 7.4375,
+  G: 10.421875,
+  H: 10.828125,
+  I: 4.125,
+  J: 5.546875,
+  K: 8.890625,
+  L: 7.1875,
+  M: 13.6875,
+  N: 11.390625,
+  O: 11.421875,
+  P: 8.578125,
+  Q: 11.421875,
+  R: 9.140625,
+  S: 8.09375,
+  T: 8.03125,
+  U: 10.453125,
+  V: 9.46875,
+  W: 14.25,
+  X: 9.03125,
+  Y: 8.453125,
+  Z: 8.6875,
+  '[': 4.6875,
+  '\\': 5.828125,
+  ']': 4.6875,
+  '^': 10.390625,
+  _: 6.28125,
+  '`': 4.140625,
+  a: 7.75,
+  b: 8.953125,
+  c: 7.03125,
+  d: 8.96875,
+  e: 7.953125,
+  f: 4.859375,
+  g: 8.96875,
+  h: 8.625,
+  i: 3.734375,
+  j: 3.75,
+  k: 7.625,
+  l: 3.734375,
+  m: 13.125,
+  n: 8.640625,
+  o: 8.90625,
+  p: 8.953125,
+  q: 8.96875,
+  r: 5.40625,
+  s: 6.546875,
+  t: 5.21875,
+  u: 8.640625,
+  v: 7.359375,
+  w: 11.0625,
+  x: 7.109375,
+  y: 7.421875,
+  z: 6.890625,
+  '{': 4.6875,
+  '|': 3.78125,
+  '}': 4.6875,
+  '~': 10.390625
+}
+
+export default function getWidth(label) {
+  label = label || ''
+  let labels = label.match(/./gu) || []
+  let labelW = 0
+  labels.forEach((s) => (labelW += ASCII_W[s] || 14))
+
+  return labelW
+}

package/src/utils/repairElementUI.js

@@ -38,104 +38,8 @@ setPropsDefault(ElementUI.Dialog, {
   }
 })
 
-// 设置表头最小宽度,保证表头不换行
-const ASCII_W = {
-  ' ': 4.125,
-  0: 8.21875,
-  1: 8.21875,
-  2: 8.21875,
-  3: 8.21875,
-  4: 8.21875,
-  5: 8.21875,
-  6: 8.21875,
-  7: 8.21875,
-  8: 8.21875,
-  9: 8.21875,
-  '!': 4.375,
-  '"': 6.109375,
-  '#': 8.9375,
-  $: 8.21875,
-  '%': 12.46875,
-  '&': 12.1875,
-  "'": 3.59375,
-  '(': 4.6875,
-  ')': 4.6875,
-  '*': 6.375,
-  '+': 10.390625,
-  ',': 3.375,
-  '-': 6.0625,
-  '.': 3.375,
-  '/': 5.984375,
-  ':': 3.375,
-  ';': 3.375,
-  '<': 10.390625,
-  '=': 10.390625,
-  '>': 10.390625,
-  '?': 6.765625,
-  '@': 14.4375,
-  A: 9.859375,
-  B: 8.796875,
-  C: 9.375,
-  D: 10.671875,
-  E: 7.703125,
-  F: 7.4375,
-  G: 10.421875,
-  H: 10.828125,
-  I: 4.125,
-  J: 5.546875,
-  K: 8.890625,
-  L: 7.1875,
-  M: 13.6875,
-  N: 11.390625,
-  O: 11.421875,
-  P: 8.578125,
-  Q: 11.421875,
-  R: 9.140625,
-  S: 8.09375,
-  T: 8.03125,
-  U: 10.453125,
-  V: 9.46875,
-  W: 14.25,
-  X: 9.03125,
-  Y: 8.453125,
-  Z: 8.6875,
-  '[': 4.6875,
-  '\\': 5.828125,
-  ']': 4.6875,
-  '^': 10.390625,
-  _: 6.28125,
-  '`': 4.140625,
-  a: 7.75,
-  b: 8.953125,
-  c: 7.03125,
-  d: 8.96875,
-  e: 7.953125,
-  f: 4.859375,
-  g: 8.96875,
-  h: 8.625,
-  i: 3.734375,
-  j: 3.75,
-  k: 7.625,
-  l: 3.734375,
-  m: 13.125,
-  n: 8.640625,
-  o: 8.90625,
-  p: 8.953125,
-  q: 8.96875,
-  r: 5.40625,
-  s: 6.546875,
-  t: 5.21875,
-  u: 8.640625,
-  v: 7.359375,
-  w: 11.0625,
-  x: 7.109375,
-  y: 7.421875,
-  z: 6.890625,
-  '{': 4.6875,
-  '|': 3.78125,
-  '}': 4.6875,
-  '~': 10.390625
-}
+import getWidth from './asciiWidth'
+
 setMethodsDefault(ElementUI.TableColumn, {
   setColumnWidth(column) {
     if (this.realWidth) {
@@ -146,10 +50,7 @@ setMethodsDefault(ElementUI.TableColumn, {
     }
     if (!column.minWidth) {
       if (!column.width) {
-        let label = column.label || ''
-        let labels = label.match(/./gu) || []
-        let labelW = 0
-        labels.forEach((s) => (labelW += ASCII_W[s] || 14))
+        let labelW = getWidth(column.label)
 
         let sortable = column.sortable ? 24 : 0
         let filters = column.filters ? 16 : 0