n20-common-lib 1.3.91 → 1.3.93

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -1,7 +1,7 @@
 /* 审批按钮组 */
 <template>
   <div>
-    <el-form label-position="right" label-width="5em">
+    <el-form label-position="right" :label-width="_lang === 'zh' ? '5em' : '10em'">
       <div v-if="taskId && showBtn" class="flex-box">
         <div v-if="authList.includes('isCarboncopy')" class="flex-1">
           <el-form-item :label="'抄送' | $lc" class="m-b">

package/src/components/FileImport/index.vue

@@ -1,6 +1,8 @@
 <template>
   <el-dropdown trigger="click" placement="bottom-start" @command="commandFn">
-    <el-button size="mini" type="primary">{{ '导入' | $lc }}</el-button>
+    <slot name="import-btn"
+      ><el-button size="mini" type="primary">{{ '导入' | $lc }}</el-button></slot
+    >
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="import">{{ '导入数据' | $lc }}</el-dropdown-item>
       <el-dropdown-item command="down">{{ '模板下载' | $lc }}</el-dropdown-item>

package/src/components/LoginTemporary/index.vue

@@ -15,7 +15,7 @@
       <h3 class="login-logo-text">{{ loginLogoText | $l }}</h3>
     </div>
     <!-- eslint-disable-next-line vue/no-v-html -->
-    <div doc="登录页标语" v-html="sloganHtml"></div>
+    <div doc="登录页标语" v-html="loginSloganHtml"></div>
     <loginForm
       v-if="operateType === 'login'"
       :login-types="loginTypes"
@@ -85,7 +85,7 @@ export default {
         loginLogoHeight: 'auto',
         loginLogoText: undefined,
         loginCopyright: undefined,
-        sloganHtml: undefined
+        loginSloganHtml: undefined
       },
       pageData: {
         LOGIN_MODE: undefined, // 登录方式
@@ -126,8 +126,8 @@ export default {
     loginCopyright() {
       return this.jsonData.loginCopyright || ''
     },
-    sloganHtml() {
-      return this.jsonData.sloganHtml || ''
+    loginSloganHtml() {
+      return this.jsonData.loginSloganHtml || ''
     }
   },
   created() {

package/src/utils/repairElementUI.js

@@ -94,9 +94,13 @@ export default function (ElementUI) {
       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 sortable = column.sortable ? 24 : 0
           let filters = column.filters ? 16 : 0
-          column.minWidth = Math.max(80, label.length * 14 + 22 + sortable + filters)
+          column.minWidth = Math.max(80, labelW + 22 + sortable + filters)
         } else {
           column.minWidth = 80
         }
@@ -143,3 +147,101 @@ export default function (ElementUI) {
     })
   }
 }
+
+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
+}