n20-common-lib 1.3.24 → 1.3.25

package/package.json

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

package/src/assets/css/cl-approve-card.scss

@@ -36,7 +36,7 @@
   }
 
   .n20-worker {
-    width: 150px;
+    // width: 150px;
     font-weight: initial;
     font-size: $--font-size-base;
     color: $--color-text-primary;
@@ -65,4 +65,4 @@
     color: $--color-text-regular;
     padding: 12px;
   }
-}
+}

package/src/assets/css/cl-expandable-pane.scss

@@ -9,11 +9,10 @@
   }
 
   .n20-tips {
-    width: 85%;
-    display: flex;
-    align-items: center;
     font-size: 14px;
     cursor: pointer;
+    display: flex;
+    align-items: center;
 
     &:hover {
       color: $--link-hover-color;
@@ -35,4 +34,4 @@
 
 .color-0 {
   color: $--color-text-placeholder;
-}
+}

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

@@ -9,7 +9,7 @@
   }
 
   .n20-tips {
-    font-size: 12px;
+    font-size: 14px;
     cursor: pointer;
 
     &:hover {
@@ -24,4 +24,4 @@
       transform: rotate(90deg);
     }
   }
-}
+}

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

@@ -1,4 +1,5 @@
 .n20-upload-drag {
+  display: inline-block;
   width: 650px;
   height: 356px;
 
@@ -7,6 +8,7 @@
     width: 100%;
     height: 100%;
   }
+
   .el-upload-dragger {
     width: 100%;
     height: 100%;
@@ -17,11 +19,13 @@
     align-items: center;
     justify-content: center;
   }
+
   .drag-icon {
     font-size: 48px;
     color: $--color-primary;
     margin-bottom: 20px;
   }
+
   .drag-text {
     font-size: 16px;
     font-weight: 400;
@@ -30,6 +34,7 @@
 
     margin-bottom: 4px;
   }
+
   .drag-tip {
     font-size: 14px;
     font-weight: 400;

package/src/assets/css/plain-text.scss

@@ -1,138 +1,36 @@
-$--md: 1440px;
-
-.plain-text {
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-  border: 1px solid #eeeeee;
-
-  .plain-text-item {
-    display: flex;
-    padding-top: 12px;
-    padding-bottom: 12px;
-    align-items: center;
-
-
-    .plain-text-item-label {
-      flex: 30%;
-      text-align: right;
-      color: $--color-text-regular;
-      padding-right: 22px;
-    }
-
-    .plain-text-item-content {
-      flex: 70%;
-      color: $--color-text-primary;
-      padding-left: 22px;
-    }
-  }
-}
-
-@media only screen and (max-width: $--md) {
-  .plain-text-item {
-    flex: 49%;
-    max-width: 50%;
-
-    .after-color {
-      width: 250px;
-      height: 24px;
-      line-height: 24px;
-      padding-left: 2px;
-      margin-bottom: 4px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      background-color: rgba(22, 119, 255, 0.1);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-
-    }
-
-    .before-color {
-      width: 250px;
-      height: 24px;
-      line-height: 24px;
-      padding-left: 2px;
-      text-decoration: line-through;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      background-color: rgba(255, 59, 48, 0.1)
-    }
-
-    &:nth-of-type(odd) {
-      border-right: 1px solid #eeeeee;
-    }
-  }
-
-  .plain-text-item:last-of-type {}
-
-  .plain-text:nth-child(even) {
-    border-right: 1px solid #eeeeee;
+.n20-descriptions {
+  .el-descriptions__table {
+    table-layout: fixed;
+    border: 1px solid #e4e7ed;
   }
-
-  .plain-text-item:nth-child(4n-1) {
-    background-color: rgba(0, 122, 255, 0.05);
+  .el-descriptions-item__cell {
+    width: 70px;
+    border-top: none !important;
+    border-left: none !important;
+    border-bottom: none !important;
+    color: $--color-text-primary;
   }
-
-  .plain-text-item:nth-child(4n) {
-    background-color: rgba(0, 122, 255, 0.05);
+  .el-descriptions-item__label {
+    width: 30px;
+    background: none !important;
+    border-right: none !important;
+    text-align: right !important;
+    color: $--color-text-regular;
   }
-}
-
-@media only screen and (min-width: $--md + 1px) {
-  .plain-text-item {
-    flex: 33%;
-    max-width: 33%;
-
-    .after-color {
-      min-width: 200px;
-      max-width: 280px;
-      width: 100%;
-      height: 24px;
-      line-height: 24px;
-      padding-left: 2px;
-      margin-bottom: 4px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      background-color: rgba(22, 119, 255, 0.1);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-
-    }
-
-    .before-color {
-      min-width: 200px;
-      max-width: 280px;
-      width: 100%;
-      height: 24px;
-      line-height: 24px;
-      padding-left: 2px;
-      text-decoration: line-through;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      background-color: rgba(255, 59, 48, 0.1)
-    }
-
-    &:nth-of-type(3n-1) {
-      border-right: 1px solid #eeeeee;
-      border-left: 1px solid #eeeeee;
-    }
+  .el-descriptions__table.is-bordered tbody:nth-of-type(even) {
+    background: var(--color-primary-005);
   }
 
-  .plain-text-item:nth-child(6n) {
-    background-color: rgba(0, 122, 255, 0.05);
+  .after-color {
+    padding-left: 2px;
+    padding-right: 4px;
+    background-color: var(--color-primary-01);
   }
 
-  .plain-text-item:nth-child(6n-1) {
-    background-color: rgba(0, 122, 255, 0.05);
+  .before-color {
+    padding-left: 2px;
+    padding-right: 4px;
+    text-decoration: line-through;
+    background-color: var(--color-danger-01);
   }
-
-  .plain-text-item:nth-child(6n-2) {
-    background-color: rgba(0, 122, 255, 0.05);
-  }
-}
+}

package/src/assets/css/rootvar.scss

@@ -37,12 +37,16 @@ $--color-FFBF00: #ffbf00;
   --color-danger-hover: #{$--color-danger-hover};
   --color-info-hover: #{$--color-info-hover};
 
+  --color-primary-005: #{rgba($--color-primary, 0.05)};
   --color-primary-01: #{rgba($--color-primary, 0.1)};
   --color-primary-04: #{rgba($--color-primary, 0.4)};
 
   --color-warning-01: #{rgba($--color-warning, 0.1)};
   --color-warning-04: #{rgba($--color-warning, 0.4)};
 
+  --color-danger-01: #{rgba($--color-danger, 0.1)};
+  --color-danger-04: #{rgba($--color-danger, 0.4)};
+
   --color-FFBF00: #{$--color-FFBF00};
   --color-FFBF00-hover: #{mix($--color-black, $--color-FFBF00, 10%)};
   --color-FFBF00-01: #{rgba($--color-FFBF00, 0.1)};

package/src/components/ApprovalButtons/index.vue

@@ -66,7 +66,7 @@ export default {
     btnList: {
       type: Array,
       default: () => {
-        return ['reject', 'rejectPre', 'approval']
+        return ['reject', 'rejectPre', 'approval', 'discard']
       }
     }
   },

package/src/components/ApprovalCard/index.vue

@@ -12,9 +12,9 @@
           <div>{{ item.endTime | dataF }}</div>
           <div>{{ item.endTime | timeF }}</div>
         </div>
-        <div class="">
-          <div class="flex-box flex-lr">
-            <div class="n20-worker m-r-s">
+        <div>
+          <div class="flex-box">
+            <div class="n20-worker flex-item m-r-s">
               <span class="worker-icon cl-icon-user"></span>
               <span>{{ item.assignee }}</span>
             </div>
@@ -31,7 +31,7 @@
               >
             </div>
           </div>
-          <div v-if="item.suggestion" class="n20-description-c flex-item">
+          <div v-if="item.suggestion" class="n20-description-c">
             {{ item.suggestion }}
           </div>
         </div>

package/src/components/ApprovalRecord/index.vue

@@ -33,7 +33,11 @@
       append-to-body
       top="10vh"
     >
-      <approvalImg class="text-c p-a" style="height: 70vh; overflow: auto" />
+      <approvalImg
+        class="text-c p-a"
+        :proc-inst-id="$route.query.processInstanceId"
+        style="height: 70vh; overflow: auto"
+      />
     </el-dialog>
   </div>
 </template>

package/src/components/Descriptions/index.vue

@@ -0,0 +1,42 @@
+<template>
+  <el-descriptions
+    class="n20-descriptions"
+    :column="column"
+    size="default"
+    border
+  >
+    <slot></slot>
+  </el-descriptions>
+</template>
+
+<script>
+export default {
+  name: 'Descriptions',
+  data() {
+    return {
+      column: 2
+    }
+  },
+  created() {
+    this.resize()
+    window.addEventListener('resize', this.resize)
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.resize)
+  },
+  methods: {
+    resize() {
+      let wW = document.documentElement.clientWidth
+      if (wW <= 1024) {
+        this.column = 1
+      } else if (wW > 1024 && wW <= 1600) {
+        this.column = 2
+      } else if (wW > 1600 && wW <= 1920) {
+        this.column = 3
+      } else if (wW > 1920) {
+        this.column = 4
+      }
+    }
+  }
+}
+</script>

package/src/components/ECharts/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div></div>
+  <div ref="chart"></div>
 </template>
 
 <script>
@@ -58,7 +58,7 @@ export default {
 
   methods: {
     initChart() {
-      this.chart = echarts.init(this.$el)
+      this.chart = echarts.init(this.$refs['chart'])
       this.setOption()
     },
 
@@ -84,19 +84,17 @@ export default {
     },
 
     xAxis({ xAxis }) {
-      xAxis =
-        xAxis && xAxis.length
-          ? xAxis.map((item) => merge({}, axisConfig, item))
-          : [merge({}, axisConfig, xAxis)]
+      xAxis = Array.isArray(xAxis)
+        ? xAxis.map((item) => merge({}, axisConfig, item))
+        : merge({}, axisConfig, xAxis)
 
       return { xAxis }
     },
 
     yAxis({ yAxis }) {
-      yAxis =
-        yAxis && yAxis.length
-          ? yAxis.map((item) => merge({}, axisConfig, item))
-          : [merge({}, axisConfig, yAxis)]
+      yAxis = Array.isArray(yAxis)
+        ? yAxis.map((item) => merge({}, axisConfig, item))
+        : merge({}, axisConfig, yAxis)
 
       return { yAxis }
     },
@@ -106,6 +104,7 @@ export default {
         const type = sery.type
         let config = {}
         if (type === 'bar') {
+          config = {}
         } else if (type === 'line') {
           config = {
             symbolSize: 6,

package/src/components/ECharts/mixins/resize.js

@@ -1,56 +1,23 @@
-import { debounce } from '../../../../nstc-g6/utils/debounce'
+import { addListener, removeListener } from 'resize-detector'
 
 export default {
-  data() {
-    return {
-      $_sidebarElm: null,
-      $_resizeHandler: null
-    }
-  },
   mounted() {
-    this.initListener()
+    addListener(this.$refs['chart'], this.resize)
   },
   activated() {
-    if (!this.$_resizeHandler) {
-      // avoid duplication init
-      this.initListener()
-    }
-
-    // when keep-alive chart activated, auto resize
-    this.resize()
-  },
-  beforeDestroy() {
-    this.destroyListener()
+    if (!this._canActivated) return
+    addListener(this.$refs['chart'], this.resize)
   },
   deactivated() {
-    this.destroyListener()
+    this._canActivated = true
+    removeListener(this.$refs['chart'], this.resize)
+  },
+  beforeDestroy() {
+    removeListener(this.$refs['chart'], this.resize)
   },
   methods: {
-    // use $_ for mixins properties
-    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
-    $_sidebarResizeHandler(e) {
-      if (e.propertyName === 'width') {
-        this.$_resizeHandler()
-      }
-    },
-    initListener() {
-      this.$_resizeHandler = debounce(() => {
-        this.resize()
-      }, 100)
-      window.addEventListener('resize', this.$_resizeHandler)
-
-      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
-      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
-    destroyListener() {
-      window.removeEventListener('resize', this.$_resizeHandler)
-      this.$_resizeHandler = null
-
-      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
-    },
     resize() {
-      const { chart } = this
-      chart && chart.resize()
+      this.chart && this.chart.resize()
     }
   }
 }

package/src/components/Expandable/main.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="n20-form-expandable-pane">
     <div class="n20-title flex-box flex-lr flex-v">
-      <span class="n20-tips" @click="getExpand">
+      <span class="n20-tips flex-item" @click="getExpand">
         <i
           v-if="icon"
           class="el-icon-caret-right color-0 m-r-b"

package/src/components/FileUploadTable/index.vue

@@ -297,7 +297,12 @@
         </component>
       </div>
     </el-dialog>
-    <Dialog title="附件批量上传" :visible.sync="visibleBatch" top="5vh">
+    <Dialog
+      title="附件批量上传"
+      :visible.sync="visibleBatch"
+      top="5vh"
+      width="60%"
+    >
       <cl-upload
         class="n20-upload-drag"
         :drag="true"
@@ -305,8 +310,9 @@
         :auto-upload="false"
         :multiple="true"
         :limit="10"
-        :list="currFileList"
+        :on-remove="onRemove"
         :on-change="onChange"
+        :on-success="onSuccess"
         :http-request="customUpload"
         accept=".rar,.zip,.doc,.docx,.pdf,image/*"
       >
@@ -457,15 +463,38 @@ export default {
 
           this.tableData = this.tableData.concat(flieList)
           this.visibleBatch = false
+          this.currFileList = []
         }
       }
     },
+    onRemove(file, filelist) {
+      this.currFileList = filelist
+      let params = this.uploadParams
+      let data = new FormData()
+      let dataArray = []
+      console.log(this.currFileList, 999)
+      this.currFileList.forEach((item) => {
+        data.append('file', item.raw)
+        let attno = null
+        dataArray.push({
+          ...params,
+          recordname: item.name,
+          fileSize: item.size,
+          memo: item.name,
+          attno
+        })
+      })
+      data.append('data', JSON.stringify(dataArray))
+      //档案生效时间-截止时间
+      data.append('date', `${this.getFormatDate()},2099-12-31 23:59:59`)
+      this.batchData = data
+    },
     onChange(file, filelist) {
       this.currFileList = filelist
-      console.log(filelist)
       let params = this.uploadParams
       let data = new FormData()
       let dataArray = []
+      console.log(this.currFileList, 999)
       this.currFileList.forEach((item) => {
         data.append('file', item.raw)
         let attno = null

package/src/components/Statis/index.vue

@@ -1,8 +1,18 @@
 <template>
   <div>
     <div v-if="size !== 'mini'" class="flex-box p-t-s p-b-s">
-      <statisItem type="当页合计" :list="pageList" :show-w="showW" />
-      <statisItem type="全部合计" :list="totalList" :show-w="showW" />
+      <statisItem
+        type="当页合计"
+        :list="pageList"
+        :show-w="showW"
+        :count-label="countLabel"
+      />
+      <statisItem
+        type="全部合计"
+        :list="totalList"
+        :show-w="showW"
+        :count-label="countLabel"
+      />
     </div>
     <div v-else class="n20-statis p-t-s p-b-s">
       <span class="m-r">
@@ -49,6 +59,10 @@ export default {
       type: [Boolean, String],
       default: false
     },
+    countLabel: {
+      type: Array,
+      default: undefined
+    },
     size: {
       type: String,
       default: undefined

package/src/components/Statis/statisItem.vue

@@ -4,7 +4,11 @@
     ><span class="stati-type stati-item-cell">{{ type }}</span
     ><span class="n20-statis-division p-l-s p-r-s stati-item-cell">|</span
     ><span v-for="(item, i) in list" :key="i" class="p-r stati-item-cell"
-      >{{ item.label }}:<span class="n20-primary">{{
+      >{{ item.label }}:<span
+        v-if="countLabel.includes(item.label)"
+        class="n20-primary"
+        >{{ item.value }}</span
+      ><span v-else class="n20-primary">{{
         item | numerify('0,0.00', showW)
       }}</span></span
     >
@@ -19,9 +23,7 @@ export default {
   name: 'StatisItem',
   filters: {
     numerify({ label, value, unit = '' }, f, w) {
-      if (label === '笔数') {
-        return value
-      } else if (!w) {
+      if (!w) {
         return numerify(value, f) + unit
       } else {
         if (value > n) {
@@ -48,6 +50,10 @@ export default {
     showW: {
       type: Boolean,
       default: false
+    },
+    countLabel: {
+      type: Array,
+      default: () => ['笔数']
     }
   }
 }

package/src/components/Statis/statisPopover.vue

@@ -6,6 +6,7 @@
       :title="i === 0 ? lists[0].title : undefined"
       :type="item.type"
       :list="item.list"
+      :count-label="countLabel"
     />
   </div>
 
@@ -23,6 +24,7 @@
         :title="i === 0 ? lists[0].title : undefined"
         :type="item.type"
         :list="item.list"
+        :count-label="countLabel"
       />
       <i class="rotating-icon n20-icon-nianfenqiehuan-youce"></i>
     </div>
@@ -35,6 +37,7 @@
           :title="i === 0 ? group.title : undefined"
           :type="item.type"
           :list="item.list"
+          :count-label="countLabel"
         />
       </div>
     </div>
@@ -50,6 +53,10 @@ export default {
     lists: {
       type: Array,
       default: () => []
+    },
+    countLabel: {
+      type: Array,
+      default: undefined
     }
   }
 }