n20-common-lib 2.5.5-beta → 2.5.5-beta.1

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -66,19 +66,6 @@
         </el-form-item>
       </div>
       <div class="flex-box">
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
-          <el-input
-            ref="msg-input"
-            v-model="messageC"
-            type="textarea"
-            :placeholder="
-              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
-            "
-            :maxlength="messageMax"
-            show-word-limit
-            :autosize="{ rows: 1 }"
-          />
-        </el-form-item>
         <template v-if="taskId && showBtn">
           <show-app-opi
             v-if="opiAndUser || authList.includes('showAppOpi')"
@@ -96,6 +83,19 @@
             style="width: 18%"
           />
         </template>
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
+          <el-input
+            ref="msg-input"
+            v-model="messageC"
+            type="textarea"
+            :placeholder="
+              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
+            "
+            :maxlength="messageMax"
+            show-word-limit
+            :autosize="{ rows: 1 }"
+          />
+        </el-form-item>
       </div>
       <el-form-item v-if="fileKit || fileKitT" label="附加上传">
         <cl-upload

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -62,9 +62,10 @@ export default {
       }
     },
     changeFn() {
-      // if (this.approveMsgSlt?.length) {
-      this.$emit('update:message', this.approveMsgSlt.join('\n'))
-      // }
+      this.$emit(
+        'update:message',
+        Array.isArray(this.approveMsgSlt) ? this.approveMsgSlt.join('\n') : this.approveMsgSlt
+      )
     }
   }
 }

package/src/components/ApprovalRecord/index.vue

@@ -1,6 +1,6 @@
 /* 审批记录 */
 <template>
-  <div>
+  <div v-if="approvalMode === 'dialog' || !approvalMode">
     <expandableWrap :title="'审批记录' | $lc" :show-expand="false" :icon="false">
       <template slot="tips">
         <el-button plain size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
@@ -30,12 +30,24 @@
       <approvalImg class="text-c p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
     </el-dialog>
   </div>
+  <div v-else>
+    <expandableWrap title="审批记录">
+      <template slot="tips">
+        <el-button size="mini" plain @click="imgV = true">流程图查看</el-button>
+      </template>
+      <approvalCard :procInstId="procInstIdC" />
+      <el-dialog v-drag title="查看流程" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
+        <approvalImg class="text-c p-a" style="height: 70vh; overflow: auto" />
+      </el-dialog>
+    </expandableWrap>
+  </div>
 </template>
 
 <script>
 import expandableWrap from '../Expandable/main.vue'
 import approvalCard from '../ApprovalCard/index.vue'
 import approvalImg from './approvalImg.vue'
+import getJsonc from '../../assets/getJsonc'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -52,13 +64,19 @@ export default {
   data() {
     return {
       cardV: false,
-      imgV: false
+      imgV: false,
+      approvalMode: undefined
     }
   },
   computed: {
     procInstIdC() {
       return this.procInstId || this.$route.query.processInstanceId
     }
+  },
+  mounted() {
+    getJsonc('/server-config.jsonc').then(({ approvalMode }) => {
+      this.approvalMode = approvalMode
+    })
   }
 }
 </script>

package/src/components/CascaderArea/index.vue

@@ -36,6 +36,10 @@ export default {
       type: Boolean,
       default: false
     },
+    labelSort: {
+      type: Boolean,
+      default: false
+    },
     countryId: {
       type: String,
       default: 'CHN'
@@ -81,7 +85,14 @@ export default {
         .then(({ data }) => {
           let dataAr = JSON.parse(JSON.stringify(data))
           let dataUb = JSON.parse(JSON.stringify(data))
-          let areaTree = list2tree(dataAr, 'regionNo', 'fatherNo', 'children', 'regionNo')
+
+          let areaTree = list2tree(
+            dataAr,
+            'regionNo',
+            'fatherNo',
+            'children',
+            this.labelSort ? 'regionName' : 'regionNo'
+          )
           let noAreaTree = areaTree.filter((a) => a.regionLevel !== '1')
           if (noAreaTree.length > 0) {
             console.warn('这些区域找不到父级节点：', noAreaTree)
@@ -93,7 +104,7 @@ export default {
             'regionNo',
             'fatherNo',
             'children',
-            'regionNo'
+            this.labelSort ? 'regionName' : 'regionNo'
           )
 
           window[this.urbanKey] = urbanTree.filter((a) => a.regionLevel === '1')

package/src/components/ShowColumn/index.vue

@@ -69,6 +69,7 @@
       </div>
     </div>
     <div slot="footer" class="text-c">
+      <el-button type="primary" v-has="isHas" @click="handleInitialize">{{ '初始化' | $lc }}</el-button>
       <el-button type="primary" @click="setChange">{{ '确定' | $lc }}</el-button>
       <el-button plain @click="reset">{{ '恢复默认' | $lc }}</el-button>
     </div>
@@ -78,6 +79,7 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+
 import dialogWrap from '../Dialog/index.vue'
 import dragList from '../DragList/index.vue'
 export default {
@@ -124,6 +126,10 @@ export default {
     width: {
       type: String,
       default: '800px'
+    },
+    isHas: {
+      type: String,
+      default: undefined
     }
   },
   data() {
@@ -167,6 +173,31 @@ export default {
     }
   },
   methods: {
+    async handleInitialize() {
+      if (this.dragList.length < 1) {
+        this.$message.error(
+          `${$lc(`至少设置`)}${
+            this.isExport ? $lc('一列导出数据') : this.isFilter ? $lc('一个筛选条件') : $lc('一列显示列')
+          }!`
+        )
+        return
+      }
+      await this.$msgboxPor({
+        title: $lc('确认初始化吗？'),
+        message: $lc('初始化后将全局生效！'),
+        type: 'info',
+        confirmButtonText: $lc('确定'),
+        cancelButtonText: $lc('取消')
+      })
+
+      let list = []
+      let preCols = this.columns.filter((col) => col.static === 'pre')
+      let nextCols = this.columns.filter((col) => col.static === 'next')
+      list.push(...preCols, ...this.dragList, ...nextCols)
+      this.userNo = '_global_'
+      this.saveColumns(list)
+      this.visible = false
+    },
     popOpen() {
       this.dragList = this.checkColumns.filter((col) => !col.static)
     },
@@ -205,6 +236,7 @@ export default {
       list.push(...preCols, ...this.dragList, ...nextCols)
 
       // 自动保存设置的显示列
+      this.userNo = sessionStorage.getItem('userNo')
       !this.isExport && this.autoSave && this.saveColumns(list)
 
       this.$emit('setColumns', list)

package/src/components/TablePro/index.vue

@@ -19,7 +19,8 @@
         remote: true,
         trigger: 'cell',
         iconAsc: 'n20-icon-daoxu',
-        iconDesc: 'n20-icon-shunxu'
+        iconDesc: 'n20-icon-shunxu',
+        ...$attrs.sortConfig
       }"
       :filter-config="{ remote: true, iconNone: 'n20-icon-xiala-moren', iconMatch: 'n20-icon-xiala-moren' }"
       v-on="$listeners"

package/src/directives/VDrag/index.js

@@ -1,72 +1,72 @@
-/**
- * author: zhengwei
- * tiem: 2021-8-31
- * amend: 只注册到bind上,有问题;onXX会导致事件覆盖
- */
-// 封装全局弹窗拖拽指令 v-drag
-function dialogMoveFn(_this) {
-  var dialogDom = _this.parentNode
-  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
-  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
-}
-
-const dialogMove = {
-  install: function (Vue) {
-    Vue.directive('drag', {
-      update(el, binding) {
-        if (el.style.display === 'none') {
-          var dialogDom = el.querySelector('.el-dialog')
-          if (dialogDom) {
-            dialogDom.style.left = ''
-            dialogDom.style.top = ''
-          }
-        }
-        Vue.nextTick(function () {
-          var dialogHeader = el.querySelector('.el-dialog__header')
-          if (dialogHeader && !dialogHeader._hasMoveDir) {
-            var _this, pvrPageX, pvrPageY
-            dialogHeader._hasMoveDir = true
-            dialogHeader.style.cursor = 'move'
-
-            dialogHeader.addEventListener('mousedown', function (evt) {
-              var ev = evt || event
-              this.pageXc = this.pageYc = 0
-              _this = this
-              pvrPageX = ev.pageX
-              pvrPageY = ev.pageY
-              document.addEventListener('mousemove', mousemoveThisMove)
-              document.addEventListener('mouseup', mouseupThisMove)
-            })
-
-            var mousemoveThisMove = function (evt) {
-              var ev = evt || event
-              ev.stopPropagation()
-              ev.preventDefault()
-              if (
-                ev.clientX >= 0 &&
-                ev.clientY >= 0 &&
-                ev.clientX <= document.documentElement.clientWidth &&
-                ev.clientY <= document.documentElement.clientHeight
-              ) {
-                _this.pageXc = ev.pageX - pvrPageX
-                _this.pageYc = ev.pageY - pvrPageY
-                if (_this.pageXc !== 0 || _this.pageYc !== 0) {
-                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
-                }
-                pvrPageX = ev.pageX
-                pvrPageY = ev.pageY
-              }
-            }
-
-            var mouseupThisMove = function () {
-              document.removeEventListener('mousemove', mousemoveThisMove)
-              document.removeEventListener('mouseup', mouseupThisMove)
-            }
-          }
-        })
-      }
-    })
-  }
-}
-
-export default dialogMove
+/**
+ * author: zhengwei
+ * tiem: 2021-8-31
+ * amend: 只注册到bind上,有问题;onXX会导致事件覆盖
+ */
+// 封装全局弹窗拖拽指令 v-drag
+function dialogMoveFn(_this) {
+  var dialogDom = _this.parentNode
+  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
+  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
+}
+
+const dialogMove = {
+  install: function (Vue) {
+    Vue.directive('drag', {
+      update(el, binding) {
+        if (el.style.display === 'none') {
+          var dialogDom = el.querySelector('.el-dialog')
+          if (dialogDom) {
+            dialogDom.style.left = ''
+            dialogDom.style.top = ''
+          }
+        }
+        Vue.nextTick(function () {
+          var dialogHeader = el.querySelector('.el-dialog__header')
+          if (dialogHeader && !dialogHeader._hasMoveDir) {
+            var _this, pvrPageX, pvrPageY
+            dialogHeader._hasMoveDir = true
+            dialogHeader.style.cursor = 'move'
+
+            dialogHeader.addEventListener('mousedown', function (evt) {
+              var ev = evt || event
+              this.pageXc = this.pageYc = 0
+              _this = this
+              pvrPageX = ev.pageX
+              pvrPageY = ev.pageY
+              document.addEventListener('mousemove', mousemoveThisMove)
+              document.addEventListener('mouseup', mouseupThisMove)
+            })
+
+            var mousemoveThisMove = function (evt) {
+              var ev = evt || event
+              ev.stopPropagation()
+              ev.preventDefault()
+              if (
+                ev.clientX >= 0 &&
+                ev.clientY >= 0 &&
+                ev.clientX <= document.documentElement.clientWidth &&
+                ev.clientY <= document.documentElement.clientHeight
+              ) {
+                _this.pageXc = ev.pageX - pvrPageX
+                _this.pageYc = ev.pageY - pvrPageY
+                if (_this.pageXc !== 0 || _this.pageYc !== 0) {
+                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
+                }
+                pvrPageX = ev.pageX
+                pvrPageY = ev.pageY
+              }
+            }
+
+            var mouseupThisMove = function () {
+              document.removeEventListener('mousemove', mousemoveThisMove)
+              document.removeEventListener('mouseup', mouseupThisMove)
+            }
+          }
+        })
+      }
+    })
+  }
+}
+
+export default dialogMove

package/src/directives/VTitle/index.js

@@ -117,7 +117,6 @@ HoverTooltip.install = (Vue) => {
       el.$tipShow = () => tipShow(el, binding.arg)
       el.$tipHide = () => tipHide(el)
       el.addEventListener('mouseenter', () => {
-        console.log(getWidth(binding.value))
         if (getWidth(binding.value) > (binding.arg || 98)) {
           return el.$tipShow()
         }

package/src/i18n.json

@@ -2,6 +2,15 @@
   "筛选": {
     "en": "Filter"
   },
+  "初始化": {
+    "en": "Initialization"
+  },
+  "确认初始化吗？": {
+    "en": "Are you sure to initialize?"
+  },
+  "初始化后将全局生效！": {
+    "en": "After initialization, it will be global!"
+  },
   "数据请求": {
     "en": "Data request"
   },
@@ -1880,4 +1889,4 @@
   "请先勾选要删除的数据！": {
     "en": "Please select the data to be deleted first!"
   }
-}
+}

package/src/utils/list2tree.js

@@ -17,17 +17,29 @@ function list2tree(arr, id = 'id', pid = 'pId', children = 'children', sortk) {
     }
   })
   if (sortk !== undefined) {
-    arr.forEach((item) => {
-      if (hash[item[id]][children]) {
-        hash[item[id]][children].sort(function (n1, n2) {
-          return n1[sortk] - n2[sortk]
-        })
-      }
-    })
-
-    r.sort(function (n1, n2) {
-      return n1[sortk] - n2[sortk]
-    })
+    if (typeof sortk === 'string') {
+      arr.forEach((item) => {
+        if (hash[item[id]][children]) {
+          hash[item[id]][children].sort(function (n1, n2) {
+            return n1[sortk].localeCompare(n2[sortk])
+          })
+        }
+      })
+      r.sort(function (n1, n2) {
+        return n1[sortk].localeCompare(n2[sortk])
+      })
+    } else {
+      arr.forEach((item) => {
+        if (hash[item[id]][children]) {
+          hash[item[id]][children].sort(function (n1, n2) {
+            return n1[sortk] - n2[sortk]
+          })
+        }
+      })
+      r.sort(function (n1, n2) {
+        return n1[sortk] - n2[sortk]
+      })
+    }
   }
 
   return r