n20-common-lib 2.6.2 → 2.6.3-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.2",
+  "version": "2.6.3-beta",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -54,15 +54,15 @@
     "lz-string": "^1.4.4",
     "normalize.css": "^8.0.1",
     "numerify": "*",
+    "nzh": "^1.0.12",
     "panzoom": "*",
     "qrcode": "*",
     "resize-detector": "*",
     "strip-json-comments": "*",
-    "v-viewer": "*",
+    "v-viewer": "1.6.4",
     "vuedraggable": "*"
   },
   "devDependencies": {
-    "element-ui": "^2.15.14",
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-flow-comments": "^7.14.5",
     "@vue/cli-plugin-babel": "~4.5.0",
@@ -76,6 +76,7 @@
     "copy-webpack-plugin": "^6.4.1",
     "core-js": "^3.6.5",
     "echarts": "^5.3.3",
+    "element-ui": "^2.15.14",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "exceljs": "^4.3.0",
@@ -116,4 +117,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/assets/css/cl-file-upload-table.scss

@@ -1,4 +1,4 @@
-.file-upload-table {
+.file-upload-table,n20-ElectronicArchive {
   .el-table {
     border-top: $--tab-border-line;
     border-left: $--tab-border-line;
@@ -29,4 +29,4 @@
   .el-upload {
     display: block;
   }
-}
+}

package/src/assets/css/cl-layout-header.scss

@@ -5,13 +5,16 @@ $--header-color: #3d4a57;
     width: auto;
     height: 26px;
   }
+
   .header-color {
     color: var(--header-color, $--header-color);
   }
+
   .el-divider {
     height: 26px;
     background-color: var(--header-color, #dcdfe6);
   }
+
   .header-title {
     margin: 0;
     padding: 0;
@@ -19,14 +22,17 @@ $--header-color: #3d4a57;
     font-weight: 600;
     color: var(--header-color, #000000);
   }
+
   .set-user-drop {
     margin-left: auto;
   }
+
   .set-user-btn {
     margin-left: auto;
     font-size: 20px;
     cursor: pointer;
   }
+
   .news-btn {
     font-size: 20px;
     margin-left: 24px;
@@ -42,9 +48,11 @@ $--header-color: #3d4a57;
     margin-right: 10px;
     cursor: pointer;
   }
+
   .el-badge {
     .el-badge__content {
       line-height: 14px;
+      height: 14px;
     }
   }
 }
@@ -53,26 +61,32 @@ $--header-color: #3d4a57;
   .el-tabs__item {
     width: 170px !important;
     padding: 0;
+
     .el-badge {
       .el-badge__content {
         line-height: 14px;
       }
+
       .el-badge__content.is-fixed {
         top: 8px !important;
       }
     }
   }
+
   .notice-list {
     height: 240px;
     overflow-x: hidden;
     overflow-y: auto;
   }
+
   .notice-item {
     cursor: pointer;
+
     &:hover {
       color: $--color-primary;
     }
   }
+
   .unread-notice {
     color: var(--color-danger);
   }
@@ -89,6 +103,7 @@ $--header-color: #3d4a57;
   color: $--color-white;
   border-radius: $--border-radius-base;
   cursor: pointer;
+
   &:hover {
     transform: scale(1.05);
   }
@@ -97,6 +112,7 @@ $--header-color: #3d4a57;
 .header-hdyy {
   color: $--header-color !important;
   border-color: $--header-color !important;
+
   &:hover {
     color: $--color-primary !important;
     border-color: $--color-primary !important;
@@ -105,19 +121,18 @@ $--header-color: #3d4a57;
 
 .user-info-drop-menu-new {
   width: 302px;
-  height: 492px;
+  // height: 492px;
   padding: 0;
   background: #ffffff;
   border: none;
   border-radius: 8px;
   box-shadow: 0px 0px 20px 4px rgba(0, 0, 0, 0.2);
+
   .el-dropdown-menu__item {
     line-height: 37px;
   }
 }
-.user-info-drop-menu-new.user-info-drop_height {
-  height: 522px;
-}
+
 
 .uif-user-w {
   box-sizing: border-box;
@@ -125,6 +140,7 @@ $--header-color: #3d4a57;
   padding-top: 24px;
   background-size: 100% 100%;
 }
+
 .uif-img-w {
   width: 54px;
   height: 54px;
@@ -137,6 +153,7 @@ $--header-color: #3d4a57;
     width: 100%;
     height: 100%;
   }
+
   ._edit {
     display: none;
 
@@ -153,12 +170,14 @@ $--header-color: #3d4a57;
     left: 0;
     top: 0;
   }
+
   &:hover {
     ._edit {
       display: block;
     }
   }
 }
+
 .uif-name {
   margin-top: 12px;
   margin-bottom: 4px;
@@ -168,6 +187,7 @@ $--header-color: #3d4a57;
   text-align: center;
   color: #333333;
 }
+
 .uif-gs {
   margin-bottom: 4px;
   height: 17px;
@@ -176,6 +196,7 @@ $--header-color: #3d4a57;
   text-align: center;
   color: #333333;
 }
+
 .uif-js {
   margin-bottom: 10px;
   height: 17px;
@@ -184,12 +205,14 @@ $--header-color: #3d4a57;
   text-align: center;
   color: #333333;
 }
+
 .uif-by {
   height: 17px;
   line-height: 17px;
   font-size: 12px;
   text-align: center;
   color: #999999;
+
   ._edit {
     display: inline-block;
     width: 12px;
@@ -199,12 +222,14 @@ $--header-color: #3d4a57;
     opacity: 0;
     cursor: pointer;
   }
+
   &:hover {
     ._edit {
       opacity: 1;
     }
   }
 }
+
 .uif-ydn {
   height: 17px;
   line-height: 17px;
@@ -213,6 +238,7 @@ $--header-color: #3d4a57;
   text-align: right;
   color: #999999;
 }
+
 .uby-w {
   box-sizing: border-box;
   width: 406px;
@@ -222,11 +248,13 @@ $--header-color: #3d4a57;
   box-shadow: 0px 0px 20px 4px rgba(0, 0, 0, 0.2);
   padding: 26px 28px 14px;
 }
+
 .uby-h {
   font-size: 16px;
   font-weight: normal;
   color: #333333;
 }
+
 .uby-h-icon {
   display: inline-block;
   width: 28px;
@@ -236,9 +264,10 @@ $--header-color: #3d4a57;
   font-size: 28px;
   color: $--color-primary;
 }
+
 .uby-b {
   margin-top: 10px;
   margin-left: 34px;
   line-height: 20px;
   color: #333333;
-}
+}

package/src/assets/css/cl-message.scss

@@ -57,6 +57,60 @@
   }
 }
 
+.ElectronicArchive_msgboxPor.el-message-box {
+  box-sizing: border-box;
+  padding: 32px 32px 24px;
+
+  .el-message-box__header {
+    padding: 0;
+    margin-bottom: 12px;
+
+    .n20-icon-xinxi {
+      color: #ffbf00;
+    }
+
+    .el-message-box__status.el-icon-warning {
+      color: #ffbf00;
+    }
+  }
+
+  .el-message-box__content {
+    padding: 0;
+    margin-top: 12px;
+    margin-bottom: 12px;
+  }
+
+  .el-message-box__btns {
+    margin-top: 0;
+    padding-left: 0;
+    padding-right: 0;
+    display: flex;
+    justify-content: center;
+    flex-direction: row-reverse;
+
+    .el-button.el-button--default:hover {
+      color: var(--color-primary);
+      background: #ffffff;
+      border-color: var(--color-primary);
+    }
+
+    .el-button.el-button--primary:hover {
+      background: var(--color-primary-hover);
+      color: #fff;
+      border-color: var(--color-primary-hover);
+    }
+
+    & .el-button+.el-button {
+      margin-left: 0;
+      margin-right: 16px;
+    }
+  }
+
+  .el-message-box__headerbtn {
+    top: -15px;
+    right: -15px;
+  }
+}
 .header-show-icon {
   .el-message-box__title {
     justify-content: flex-start;
@@ -157,4 +211,4 @@
 
 .el-message-box__status.el-icon-info {
   color: $--messagebox-warning-color;
-}
+}

package/src/assets/css/filter.scss

@@ -104,7 +104,7 @@
       }
 
       .el-input--suffix .el-input__inner {
-        padding-right: 20px;
+        padding-right: 26px;
       }
     }
 

package/src/components/AdvancedFilter/formItemRender.vue

@@ -85,6 +85,7 @@ export default {
         case 'text':
         case 'number':
         case 'text':
+        case 'numberrange':
           return $lc('请输入')
         case 'select':
         case 'search':
@@ -111,14 +112,14 @@ export default {
       if (!type) {
         return context.measureText(value).width * 1.4 + 55
       }
-      return (context.measureText(value).width * 1.4 + 65) * 2
+      return (context.measureText(value).width * 1.4 + 100) * 2
     }
 
     const calcWidth = (value, type) => {
       let W = null
       if (!value) {
         if (type) {
-          return w + 110 + 'px'
+          return Number(w) + 110 + 'px'
         }
         return w + 'px'
       }
@@ -130,7 +131,7 @@ export default {
         }
       } else {
         if (type) {
-          W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 40 + 100
+          W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 150
         } else {
           W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 40
         }
@@ -322,16 +323,18 @@ export default {
         const inputRangeProps = {
           startValue: form[item.startValue],
           endValue: form[item.endValue],
-          isClearable: (item.props && item.props.isClearable) ?? true,
+
           // 将 props 对象中的属性应用到 inputRange 上
           ...item.props
         }
         elementDom = h('InputNumberRange', {
           directives: [{ name: 'rule-key', value: 'startValue' }],
           attrs: {
+            ...item.props,
             ruleField: true,
             'rule-form': 'ruleValidate',
             rules: item.rules,
+            isClearable: (item.props && item.props.isClearable) ?? true,
             ruleErrorHide: item.ruleErrorHide
           },
           style: {
@@ -345,6 +348,7 @@ export default {
             'update:end-value': (value) => {
               this.$set(form, item.endValue, value)
             },
+            clear: this.handleClear,
             blur: this.handleBlur,
             ...item.on
           },

package/src/components/AdvancedFilter/index.vue

@@ -52,7 +52,7 @@ import axios from '../../utils/axios.js'
 import { $lc } from '../../utils/i18n/index.js'
 import cloneDeep from 'lodash/cloneDeep'
 import _debounce from 'lodash/debounce'
-import { getOnlyKey } from './utils'
+import { getOnlyKey, setOptionsMap, getOptionsMap } from './utils'
 const prefixCls = 'n20-advanced-filter'
 export default {
   name: 'AdvancedFilter',
@@ -125,13 +125,17 @@ export default {
       return getOnlyKey(this.onlyKey, data)
     },
     setOptions(id, opts) {
+      setOptionsMap(id, opts)
+      this.setChoices(id, opts)
+    },
+    setChoices(id, data) {
       let item = this.GroupData.find((f) => f[this.onlyKey] === id)
       if (item) {
-        item.options = opts || []
+        item.options = data || []
       } else {
         item = this.GroupData.find((f) => f.value === id)
         if (item) {
-          item.options = opts || []
+          item.options = data || []
         }
       }
     },
@@ -143,7 +147,11 @@ export default {
         if (Array.isArray(this.model[item.value])) {
           return this.model[item.value].length > 0 ? this.prefixCls + '-active' : ''
         } else {
-          return this.model[item.value] ? this.prefixCls + '-active' : ''
+          return this.model[item.value] !== null &&
+            this.model[item.value] !== undefined &&
+            this.model[item.value] !== ''
+            ? this.prefixCls + '-active'
+            : ''
         }
       }
       let flag = ''
@@ -165,7 +173,7 @@ export default {
     handleClose(item) {
       switch (item.type) {
         case 'select':
-          this.model[item.value] = item.multiple ? [] : null
+          this.$set(this.model, item.value, item.multiple ? [] : null)
           break
         case 'text':
         case 'search':
@@ -176,22 +184,27 @@ export default {
         case 'month':
         case 'radio':
         case 'week':
-          this.model[item.value] = null
+          this.$set(this.model, item.value, null)
+
           break
         case 'checkbox':
-          this.model[item.value] = []
-
+          this.$set(this.model, item.value, [])
           break
         case 'numberrange':
-          this.model[item.startValue] = null
-          this.model[item.endValue] = null
+          this.$set(this.model, item.startValue, null)
+          this.$set(this.model, item.endValue, null)
+
           break
         case 'daterange':
         case 'datetimerange':
         case ' monthrange':
-          this.model[item.startDate] = null
-          this.model[item.endDate] = null
+          this.$set(this.model, item.startDate, null)
+          this.$set(this.model, item.endDate, null)
           break
+        case 'slot': {
+          this.$set(this.model, item.value, null)
+          break
+        }
       }
       let data = this.GroupData.filter((s) => {
         return s.id !== item.id
@@ -201,7 +214,7 @@ export default {
           this.getFilterList()
         }
       })
-      this.$emit('change', this.model)
+      this.$emit('clean', this.model)
     },
     cleared() {
       this.$emit('clear')
@@ -288,6 +301,14 @@ export default {
           this.checkList = this.GroupData.map((res) => res.id)
           this.checkC = cloneDeep(this.checkList)
         })
+        .finally(() => {
+          for (const key in getOptionsMap()) {
+            if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
+              const data = getOptionsMap()[key]
+              this.setChoices(key, data)
+            }
+          }
+        })
     }
   }
 }

package/src/components/AdvancedFilter/utils.js

@@ -2,3 +2,11 @@ export const getOnlyKey = (key, data) => {
   if (!key) return Date.now().toString(36) + Math.random().toString(36).substr(2, 5)
   return data[key]
 }
+let options = {}
+export const setOptionsMap = (key, value) => {
+  options[key] = value
+}
+
+export const getOptionsMap = () => {
+  return options
+}

package/src/components/Anchor/index.vue

@@ -7,7 +7,7 @@
       :style="{ width: navWidth }"
       @click="activitFn"
     />
-    <div ref="anchor-content" class="flex-item" style="height: 100%; overflow: auto">
+    <div ref="anchor-content" :class="['flex-item', parentClass]" style="height: 100%; overflow: auto">
       <slot></slot>
     </div>
     <AnchorSidebar
@@ -40,6 +40,10 @@ export default {
       type: String,
       default: 'right'
     },
+    parentClass: {
+      type: String,
+      default: undefined
+    },
     navWidth: {
       type: String,
       default: '110px'

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -3,6 +3,7 @@
     <el-select
       v-model="approveMsgSlt"
       class="w-100p"
+      style="max-width: 80vw"
       clearable
       :multiple="multiple"
       collapse-tags

package/src/components/DateSelect/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="n20-date-select">
     <el-select v-model="type" placeholder="请选择" style="width: 65px" @change="dateTypeSelectChange">
-      <el-option v-for="(item, index) in timing" :key="index" :label="item.label" :value="item.value" />
+      <el-option
+        v-for="(item, index) in timing.filter((item) => selectList.includes(item.label))"
+        :key="index"
+        :label="item.label"
+        :value="item.value"
+      />
     </el-select>
     <el-date-picker
       v-if="type === 'day'"
@@ -91,7 +96,7 @@ export default {
     },
     selectList: {
       type: Array,
-      default: () => []
+      default: () => ['日', '周', '月', '季', '年']
     }
   },
   data() {
@@ -117,12 +122,14 @@ export default {
         this.$emit('update:selectType', this.timing.find((item) => item.value === v).label)
       },
       get() {
-        return this.timing.find((item) => item.label === this.selectType).value
+        return this.timing
+          .filter((item) => this.selectList.includes(item.label))
+          .find((item) => item.label === this.selectType).value
       }
     }
   },
   mounted() {
-    switch (this.selectType) {
+    switch (this.type) {
       case 'day':
         this.day = [this.value.startDate, this.value.endDate]
         break
@@ -141,6 +148,24 @@ export default {
     }
   },
   methods: {
+    matchArrays(arrayA, arrayB) {
+      const hashTable = new Map()
+      for (const element of arrayA) {
+        if (hashTable.has(element)) {
+          hashTable.set(element, hashTable.get(element) + 1)
+        } else {
+          hashTable.set(element, 1)
+        }
+      }
+      const result = []
+      for (const element of arrayB) {
+        if (hashTable.has(element.label) && hashTable.get(element.label) > 0) {
+          result.push(element)
+          hashTable.set(element.label, hashTable.get(element.label) - 1)
+        }
+      }
+      return result
+    },
     dateTypeSelectChange(value) {
       this.$emit('update:selectType', this.timing.find((item) => item.value === value).label)
       this.day = ''

package/src/components/DragList/index.vue

@@ -11,14 +11,14 @@
       <i class="n20-drag-icon n20-icon-tuodong"></i>
       <slot :item="item" :index="index">
         <span
-          @click="$emit('click', item)"
           v-hover-tooltip:158="item[labelKey] || item"
           class="text-ellipsis pointer color-primary"
+          @click="$emit('click', item)"
           >{{ item[labelKey] || item }}</span
         >
       </slot>
       <el-link
-        v-if="!disabled"
+        v-if="!disabled && !hideDelete"
         class="n20-icon-shanchu"
         :underline="false"
         :disabled="inSC && item.checked"
@@ -44,6 +44,10 @@ export default {
       type: String,
       default: 'dragBox'
     },
+    hideDelete: {
+      type: Boolean,
+      default: false
+    },
     disabled: {
       type: Boolean,
       default: false