n20-common-lib 1.3.52 → 1.3.55

package/package.json

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

package/src/components/ApprovalCard/index.vue

@@ -29,6 +29,11 @@
                   >驳回</span
                 ></template
               >
+              <template v-else-if="item.result == status.invalid">
+                审批意见：<span class="n20-approval-reject"
+                  >作废</span
+                ></template
+              >
             </div>
           </div>
           <div v-if="item.suggestion" class="n20-description-c">
@@ -81,7 +86,8 @@ export default {
         submit: 1,
         approval: 2,
         reject: 3,
-        end: 4
+        invalid: 4,
+        end: 5
       })
     },
     approvalData: {
@@ -107,21 +113,21 @@ export default {
               assignee: item.assignee,
               suggestion: item.suggestion
             }
-            if ('approvalState' in item) {
+
+            if (item.taskName === '开始') {
+              _item.result = 1
+            } else if (item.taskName === '结束') {
+              _item.result = 5
+            } else if ('approvalState' in item) {
               _item.result = item.approvalState
+            } else if (!item.endTime) {
+              _item.result = 0
+            } else if (item.rejectFlag === 1) {
+              _item.result = 3
             } else {
-              if (item.taskName === '开始') {
-                _item.result = 1
-              } else if (item.taskName === '结束') {
-                _item.result = 4
-              } else if (!item.endTime) {
-                _item.result = 0
-              } else if (item.rejectFlag === 1) {
-                _item.result = 3
-              } else {
-                _item.result = 2
-              }
+              _item.result = 2
             }
+
             approvalData.push(_item)
           })
           this.approvalData.push(...approvalData)

package/src/components/ApprovalRecord/approvalImg.vue

@@ -24,7 +24,7 @@ export default {
   created() {
     axios
       .get('/bems/activiti/sample/Q004', {
-        procInstId: this.procInstId || this.$route.query.procInstId
+        procInstId: this.procInstId || this.$route.query.processInstanceId
       })
       .then(({ data }) => {
         if (data) {

package/src/components/Filters/form-item-input.vue

@@ -5,6 +5,9 @@
     :clearable="item | clearableF"
     style="width: 100%"
     v-bind="item.props"
+    :placeholder="
+      item.props && item.props.placeholder ? item.props.placeholder : '请输入'
+    "
     v-on="item.on"
   />
   <el-input

package/src/components/Filters/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-popover
+    ref="popover"
     v-model="showPop"
     trigger="manual"
     :width="width"
@@ -39,7 +40,7 @@
             <el-button
               class="p-t-0 m-b-s color-primary"
               type="text"
-              @click="showMore = !showMore"
+              @click="moreFn"
               ><span>更多条件</span
               ><i
                 :class="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
@@ -197,6 +198,14 @@ export default {
         this.showPop = false
       }
     },
+    moreFn() {
+      if (this.showMore) {
+        this.showMore = false
+      } else {
+        this.showMore = true
+        setTimeout(() => this.$refs['popover'].updatePopper(), 360)
+      }
+    },
     setOptions(key, opts) {
       let item = this.filterList.find((f) => f.value === key)
       if (item) {
@@ -205,11 +214,20 @@ export default {
     },
     getRemote() {
       this.$refs['setRemote'].getColumns().then((list) => {
-        this.remoteList = list || this.filterList.slice(0, this.defaultShow)
+        if (list) {
+          this.remoteList = list
+        } else {
+          let defaultList = this.filterList.filter((col) => col.isDefault)
+          this.remoteList = defaultList.length
+            ? defaultList
+            : this.filterList.slice(0, this.defaultShow)
+        }
+        setTimeout(() => this.$refs['popover'].updatePopper(), 360)
       })
     },
     setRemoteChange(list) {
       this.remoteList = list
+      setTimeout(() => this.$refs['popover'].updatePopper(), 360)
     }
   }
 }

package/src/components/ShowColumn/index.vue

@@ -174,8 +174,10 @@ export default {
       }
     },
     reset() {
-      ////
-      this.dragList = this.checkColumns.filter((col) => !col.static)
+      let dragList = this.columns.filter((col) => col.isDefault)
+      this.dragList = dragList.length
+        ? dragList
+        : this.checkColumns.filter((col) => !col.static)
     },
     setChange() {
       if (this.dragList.length < 1) {

package/src/components/Table/index.vue

@@ -8,7 +8,7 @@
     v-on="$listeners"
   >
     <template v-for="(item, i) in columns">
-      <slot v-if="item.slotName" :name="item.slotName"></slot>
+      <slot v-if="item.slotName" :name="item.slotName" :column="item"></slot>
       <el-table-column
         v-else-if="item.render"
         :key="'cl-table-' + i"