n20-common-lib 2.2.23 → 2.2.25

package/package.json

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

package/src/components/ApprovalCard/index.vue

@@ -121,6 +121,10 @@ export default {
     procInstId: {
       type: String,
       default: undefined
+    },
+    hideLoading: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -132,9 +136,13 @@ export default {
   created() {
     if (this.procInstId) {
       axios
-        .get(`/bems/activiti/sample/Q003?r=${Math.random()}`, {
-          procInstId: this.procInstId
-        })
+        .get(
+          `/bems/activiti/sample/Q003?r=${Math.random()}`,
+          {
+            procInstId: this.procInstId
+          },
+          { loading: !this.hideLoading }
+        )
         .then(({ data = [] }) => {
           let approvalData = []
           data.forEach((item) => {

package/src/components/ApprovalRecord/approvalImg.vue

@@ -20,6 +20,10 @@ export default {
     procInstId: {
       type: String,
       default: ''
+    },
+    hideLoading: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -34,9 +38,13 @@ export default {
   methods: {
     getSvg() {
       axios
-        .get('/bems/activiti/sample/Q004', {
-          procInstId: this.procInstId || this.$route.query.processInstanceId
-        })
+        .get(
+          '/bems/activiti/sample/Q004',
+          {
+            procInstId: this.procInstId || this.$route.query.processInstanceId
+          },
+          { loading: !this.hideLoading }
+        )
         .then(({ data }) => {
           if (data) {
             let file = new File([data], '流程图.svg', {
@@ -53,7 +61,7 @@ export default {
           {
             procInstId: this.procInstId || this.$route.query.processInstanceId
           },
-          { noMsg: true }
+          { noMsg: true, loading: !this.hideLoading }
         )
         .then((res) => {
           this.dataPro = res.data

package/src/components/ApprovalRecord/flowDialog.vue

@@ -2,7 +2,12 @@
   <div>
     <el-button plain size="mini" :disabled="false" @click="imgV = true">{{ '流程图查看' | $lc }}</el-button>
     <el-dialog :title="'查看流程' | $lc" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
-      <approvalImg :proc-inst-id="procInstId" class="text-c p-a" style="height: 70vh; overflow: auto" />
+      <approvalImg
+        :proc-inst-id="procInstId"
+        :hide-loading="hideLoading"
+        class="text-c p-a"
+        style="height: 70vh; overflow: auto"
+      />
     </el-dialog>
   </div>
 </template>
@@ -18,6 +23,10 @@ export default {
     procInstId: {
       type: String,
       default: ''
+    },
+    hideLoading: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/InputNumber/index.vue

@@ -8,7 +8,6 @@
       :placeholder="phd"
       :clearable="isClearable"
       :validate-event="false"
-      @clear="closeFn"
       @focus="focusFn"
       @input="inputFn"
       @blur="blurFn"
@@ -197,9 +196,12 @@ export default {
       let val = N(valStr)
       if (isNaN(val)) {
         this.valueStr = ''
-        this.$emit('input', undefined)
-        this.$emit('change', undefined)
-        this.dispatch('ElFormItem', 'el.form.change', [undefined])
+        let oVal = this.value
+        if (oVal || oVal === 0) {
+          this.$emit('input', undefined)
+          this.$emit('change', undefined)
+          this.dispatch('ElFormItem', 'el.form.change', [undefined])
+        }
         return
       }
 
@@ -225,15 +227,13 @@ export default {
 
       this.$nextTick(() => {
         let nVar = Number(nStr)
-        this.$emit('input', nVar)
-        this.$emit('change', nVar)
-
-        this.dispatch('ElFormItem', 'el.form.change', [nVar])
+        let oVal = this.value
+        if (oVal !== nVar) {
+          this.$emit('input', nVar)
+          this.$emit('change', nVar)
+          this.dispatch('ElFormItem', 'el.form.change', [nVar])
+        }
       })
-    },
-    closeFn() {
-      this.$emit('input', undefined)
-      this.$emit('change', undefined)
     }
   }
 }

package/src/utils/relaNo.js

@@ -16,7 +16,7 @@ export function setRela() {
   let _relaNos = getItem('relaNos') // sessionStorage.getItem('relaNos')
   if (_relaNos) {
     let relaNos = _relaNos
-    relaObj = relaNos.find((r) => r.appNo === name)
+    relaObj = relaNos.find((r) => r.appNo === name) || { appNo: name, relaNos: [] }
     let relaNosG = getItem('relaNosGlobal')
 
     console.log({ relaObj, relaNosGlobal: relaNosG }, 'has权限列表')
@@ -30,8 +30,11 @@ export function setRela() {
     forEachs(resources, (item) => {
       relaNos.push(item.relaNo)
     })
-    relaObj.relaNos = relaNos
-    relaObj.relaNosGlobal = relaNos
+    relaObj = {
+      appNo: name,
+      relaNos: relaNos,
+      relaNosGlobal: relaNos
+    }
   }
 }