n20-common-lib 2.5.2 → 2.5.3-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.2",
+  "version": "2.5.3-beta",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -116,4 +116,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/assets/css/_coreLib.scss

@@ -41,7 +41,7 @@
 @import './select.scss';
 @import './plain-text.scss';
 @import './cl-date-quarter.scss';
-
+@import './work-card.scss';
 /* 临时引入 */
 @import '../../components/ChildRange/style.scss';
 @import '../../components/PageHeader/style.scss';

package/src/assets/css/work-card.scss

@@ -0,0 +1,49 @@
+.work-card {
+  height: 100%;
+  &-title {
+    font-weight: 500;
+  }
+  &-more.el-link.el-link--default {
+    color: $--color-text-secondary;
+  }
+  .el-table td.el-table__cell,
+  .el-table th.el-table__cell.is-leaf {
+    border-bottom: none;
+  }
+  .el-table td.el-table__cell .cell {
+    .el-button--primary {
+      color: var(--color-primary);
+      background-color: var(--color-primary-light-9);
+      border-color: var(--color-primary-light-9);
+    }
+    .el-button--primary:active,
+    .el-button--primary:focus,
+    .el-button--primary:hover {
+      background-color: var(--color-primary-light-7);
+      border-color: var(--color-primary-light-7);
+    }
+  }
+  .el-table--border:after,
+  .el-table--group:after,
+  .el-table:before {
+    content: '';
+    position: absolute;
+    background-color: $--color-white;
+    z-index: 1;
+  }
+}
+.work-card ::v-deep .el-badge__content {
+  line-height: 14px;
+}
+.work-card .el-badge__content.is-fixed {
+  position: absolute;
+  top: 0;
+  right: -1px;
+  transform: scale(0.7) translateY(-50%) translateX(100%);
+}
+
+.work-card--empty-title {
+  color: #cacaca;
+  padding-bottom: 80px;
+  margin-top: -16px;
+}

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

@@ -50,11 +50,8 @@
       width:
         form[item.value] && form[item.value].length > 0
           ? context.measureText(
-              item.options.find(
-                (r) =>
-                  r.value === form[item.value] ||
-                  (item.props && item.props.valueKey && r[item.props.valueKey] === form[item.value])
-              ).label
+              item.options.find((r) => r.value === form[item.value] || r[item.props?.valueKey] === form[item.value])
+                .label
             ).width *
               1.4 +
             48 +

package/src/components/AdvancedFilter/index.vue

@@ -25,7 +25,7 @@
       >
         <slot name="prefix"></slot>
       </div>
-      <template v-for="item in GroupData">
+      <template v-for="(item, i) in GroupData">
         <template v-if="item && item.slotName" :slot="item.slotName">
           <slot :name="item.slotName"></slot>
         </template>

package/src/components/ApprovalRecord/index.vue

@@ -1,6 +1,6 @@
 /* 审批记录 */
 <template>
-  <div v-if="buttonMode">
+  <div>
     <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,24 +30,12 @@
       <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'
-
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -59,10 +47,6 @@ export default {
     procInstId: {
       type: String,
       default: undefined
-    },
-    buttonMode: {
-      type: Boolean,
-      default: true
     }
   },
   data() {

package/src/components/Upload/index.vue

@@ -131,6 +131,10 @@ export default {
       type: Function,
       default: undefined
     },
+    beforeRemove: {
+      type: Function,
+      default: undefined
+    },
     beforeUpload: {
       type: Function,
       default: undefined
@@ -188,13 +192,24 @@ export default {
       this.$emit('importError')
     },
     clearFile() {
-      if (this.onRemove) {
-        this.onRemove(this.fileList[0], this.fileList)
+      if (!this.beforeRemove) {
+        if (this.onRemove) {
+          this.onRemove(this.fileList[0], this.fileList)
+        } else {
+          this.fileNameC = ''
+          this.fileUrlC = ''
+          this.fileList.pop()
+          console.log('删除上传')
+        }
       } else {
-        this.fileNameC = ''
-        this.fileUrlC = ''
-        this.fileList.pop()
-        console.log('删除上传')
+        const before = this.beforeRemove(fileList)
+        if (before && before.then) {
+          before.then(() => {
+            this.onRemove(this.fileList[0], this.fileList)
+          })
+        } else if (before !== false) {
+          this.onRemove(this.fileList[0], this.fileList)
+        }
       }
     },
     beforeUploadFn(file) {
@@ -333,8 +348,19 @@ export default {
       }
     },
     removeFn(file, fileList) {
-      if (this.onRemove) {
-        this.onRemove(file, fileList)
+      if (!this.beforeRemove) {
+        if (this.onRemove) {
+          this.onRemove(file, fileList)
+        }
+      } else {
+        const before = this.beforeRemove(file, fileList)
+        if (before && before.then) {
+          before.then(() => {
+            this.onRemove(file, fileList)
+          })
+        } else if (before !== false) {
+          this.onRemove(file, fileList)
+        }
       }
     },
     submit() {

package/src/components/WorkCard/index.vue

@@ -3,9 +3,9 @@
     <slot name="header">
       <div v-if="header" class="m-b flex-box">
         <el-badge :value="badgeNum" :hidden="!badgeNum">
-          <span class="f-s-m">{{ header }}</span>
+          <span class="f-s-m work-card-title">{{ header }}</span>
         </el-badge>
-        <el-link v-if="showMore" class="m-l-auto" :underline="false" @click="$emit('more')"
+        <el-link v-if="showMore" class="m-l-auto work-card-more" :underline="false" @click="$emit('more')"
           >{{ '更多' | $lc }}<i class="el-icon-arrow-right"></i
         ></el-link>
       </div>
@@ -56,24 +56,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.work-card {
-  height: 100%;
-}
-.work-card ::v-deep .el-badge__content {
-  line-height: 14px;
-}
-.work-card .el-badge__content.is-fixed {
-  position: absolute;
-  top: 0;
-  right: -1px;
-  transform: scale(0.7) translateY(-50%) translateX(100%);
-}
-
-.work-card--empty-title {
-  color: #cacaca;
-  padding-bottom: 80px;
-  margin-top: -16px;
-}
-</style>