n20-common-lib 1.3.61 → 1.3.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.61",
+  "version": "1.3.64",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -55,7 +55,6 @@
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.0.0-rc.6",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
     "clipboard": "^2.0.11",

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

@@ -26,16 +26,20 @@
     width: 25%;
 
     .el-checkbox__label {
+      display: inline-block;
+      width: calc(100% - 20px);
+      vertical-align: bottom;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
       color: $--color-text-primary;
     }
   }
 
   .n20-drag-list-item {
-
     a,
     i {
       color: $--color-text-placeholder;
-
     }
   }
-}
+}

package/src/assets/realUrl.js

@@ -1,6 +1,5 @@
 /* 前缀,针对乾坤做了处理 */
-const prefix =
-  window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
+const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
 export default function realUrl(url) {
   if (/^http(s)?:|\/\//.test(url)) {

package/src/components/Anchor/AnchorItem.vue

@@ -1,7 +1,5 @@
 <template>
-  <ExpandablePane :id="id" :default-expand.sync="show" :title="title"
-    ><slot></slot
-  ></ExpandablePane>
+  <ExpandablePane :id="id" :default-expand.sync="show" :title="title"><slot></slot></ExpandablePane>
 </template>
 
 <script>

package/src/components/Anchor/index.vue

@@ -1,18 +1,12 @@
 <template>
-  <el-scrollbar
-    :id="position === 'right' ? 'page-scrollbar' : 'page-scrollbar-left'"
-    style="height: 100%"
-  >
+  <el-scrollbar :id="position === 'right' ? 'page-scrollbar' : 'page-scrollbar-left'" style="height: 100%">
     <div v-if="position === 'right'" ref="Anchor">
       <slot></slot>
       <ul class="n20-anchor">
         <li
           v-for="(item, index) in AnchorNavList"
           :key="index"
-          :class="[
-            'n20-anchor-item',
-            value === item.id ? 'n20-anchor-activit' : ''
-          ]"
+          :class="['n20-anchor-item', value === item.id ? 'n20-anchor-activit' : '']"
           @click="getAnchorItem(item.id, index)"
         >
           {{ item.title }}
@@ -24,10 +18,7 @@
         <li
           v-for="(item, index) in AnchorNavList"
           :key="index"
-          :class="[
-            'n20-anchor-item',
-            value === item.id ? 'n20-anchor-activit' : ''
-          ]"
+          :class="['n20-anchor-item', value === item.id ? 'n20-anchor-activit' : '']"
           @click="getAnchorItem(item.id, index)"
         >
           {{ item.title }}
@@ -39,10 +30,7 @@
 </template>
 
 <script>
-import {
-  getScrollContainer,
-  vueDebounce
-} from '../../utils/getScrollContainer.js'
+import { getScrollContainer, vueDebounce } from '../../utils/getScrollContainer.js'
 
 export default {
   name: 'Anchor',
@@ -102,9 +90,7 @@ export default {
   methods: {
     // 初始化，获取电梯按钮数据，获取楼层高度映射
     init() {
-      let parentTop =
-        this.$refs.Anchor.getBoundingClientRect().top -
-        this.scrollWrap.getBoundingClientRect().top
+      let parentTop = this.$refs.Anchor.getBoundingClientRect().top - this.scrollWrap.getBoundingClientRect().top
       let list = this.$children[0].$children.map((item) => {
         let rect = item.$el.getBoundingClientRect()
         let itemScrollTop = item.$el.offsetTop
@@ -119,9 +105,7 @@ export default {
         }
       })
       // 去掉多余的节点
-      this.AnchorNavList = list.filter(
-        (val) => val.id !== undefined && val.title !== undefined
-      )
+      this.AnchorNavList = list.filter((val) => val.id !== undefined && val.title !== undefined)
     },
     //滚动的函数
     scrollFun(e) {

package/src/components/ApprovalButtons/index.vue

@@ -15,29 +15,11 @@
     </el-form>
 
     <div class="text-c">
-      <el-button
-        v-if="authList.includes('approval')"
-        type="primary"
-        @click="approvalFn"
-        >批 准</el-button
-      >
-      <el-button v-if="authList.includes('reject')" plain @click="rejectFn"
-        >驳回至发起人</el-button
-      >
-      <el-button
-        v-if="authList.includes('rejectPre')"
-        plain
-        @click="rejectPreFn"
-        >驳回至上一节点</el-button
-      >
+      <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">批 准</el-button>
+      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">驳回至发起人</el-button>
+      <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">驳回至上一节点</el-button>
 
-      <el-button
-        v-if="authList.includes('discard')"
-        type="danger"
-        plain
-        @click="discardFn"
-        >作 废</el-button
-      >
+      <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">作 废</el-button>
       <el-button plain @click="goFrom">返 回</el-button>
     </div>
   </div>
@@ -192,11 +174,9 @@ export default {
         return this.errMsgFn('驳回')
       }
       this.beforeFn(this.$attrs.beforeReject, () => {
-        axios
-          .post('/bems/activiti/admin/todo/reject', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, '驳回至发起人')
-          })
+        axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, '驳回至发起人')
+        })
       })
     },
     // 驳回到上一步
@@ -205,21 +185,17 @@ export default {
         return this.errMsgFn('驳回')
       }
       this.beforeFn(this.$attrs.beforeRejectPre, () => {
-        axios
-          .post('/bems/activiti/admin/todo/rejectpre', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, '驳回至上一节')
-          })
+        axios.post('/bems/activiti/admin/todo/rejectpre', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, '驳回至上一节')
+        })
       })
     },
     // 审批
     approvalFn() {
       this.beforeFn(this.$attrs.beforeRatify, () => {
-        axios
-          .post('/bems/activiti/admin/todo/advance', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, '批准')
-          })
+        axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, '批准')
+        })
       })
     },
     // 作废
@@ -228,11 +204,9 @@ export default {
         return this.errMsgFn('作废')
       }
       this.beforeFn(this.$attrs.beforeDiscard, () => {
-        axios
-          .post('/bems/activiti/admin/todo/cancle', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, '作废')
-          })
+        axios.post('/bems/activiti/admin/todo/cancle', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, '作废')
+        })
       })
     }
   }

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -368,24 +368,33 @@ setRejectLink(from, to) {
 .activiti-node-achieve rect,
 .activiti-node-achieve polygon,
 .activiti-line-achieve path {
-  stroke: var(--color-success) !important;
+  stroke: #3cb495 !important;
+}
+.activiti-node-achieve use {
+  fill: #3cb495 !important;
 }
 .activiti-node-reject circle,
 .activiti-node-reject rect {
-  stroke: var(--color-danger) !important;
+  stroke: #ea5454 !important;
+}
+.activiti-node-reject use {
+  fill: #ea5454 !important;
 }
 .activiti-node-at rect {
-  stroke: var(--color-primary-hover) !important;
+  stroke: #fe943c !important;
+}
+.activiti-node-at use {
+  fill: #fe943c !important;
 }
 .activiti-line-reject {
   fill: none;
   stroke-width: 1px;
-  stroke: var(--color-danger) !important;
+  stroke: #ea5454 !important;
   stroke-linejoin: round;
   /* marker-end: url('#sequenceflow-end-white-black-3aw0mc6w8vg7jarca1qf355gu'); */
 }
 .activiti-text-reject {
-  fill: var(--color-danger) !important;
+  fill: #ea5454 !important;
   font-family: Arial, sans-serif;
   font-size: 12px;
   font-weight: normal;

package/src/components/ApprovalRecord/flowDialog.vue

@@ -1,21 +1,8 @@
 <template>
   <div>
-    <el-button plain size="mini" :disabled="false" @click="imgV = true"
-      >流程图查看</el-button
-    >
-    <el-dialog
-      title="查看流程"
-      :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"
-      />
+    <el-button plain size="mini" :disabled="false" @click="imgV = true">流程图查看</el-button>
+    <el-dialog title="查看流程" :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" />
     </el-dialog>
   </div>
 </template>

package/src/components/ApprovalRecord/index.vue

@@ -3,36 +3,14 @@
   <div>
     <expandableWrap title="审批记录" :show-expand="false">
       <template slot="tips">
-        <el-button plain size="mini" :disabled="false" @click="cardV = true"
-          >审批进度查看</el-button
-        >
-        <el-button plain size="mini" :disabled="false" @click="imgV = true"
-          >流程图查看</el-button
-        >
+        <el-button plain size="mini" :disabled="false" @click="cardV = true">审批进度查看</el-button>
+        <el-button plain size="mini" :disabled="false" @click="imgV = true">流程图查看</el-button>
       </template>
     </expandableWrap>
-    <el-dialog
-      title="审批记录"
-      :visible.sync="cardV"
-      width="700"
-      class="p-a-0"
-      append-to-body
-      top="10vh"
-    >
-      <approvalCard
-        class="p-a"
-        :proc-inst-id="$route.query.processInstanceId"
-        style="height: 70vh; overflow: auto"
-      />
+    <el-dialog title="审批记录" :visible.sync="cardV" width="700" class="p-a-0" append-to-body top="10vh">
+      <approvalCard class="p-a" :proc-inst-id="$route.query.processInstanceId" style="height: 70vh; overflow: auto" />
     </el-dialog>
-    <el-dialog
-      title="查看流程"
-      :visible.sync="imgV"
-      width="65%"
-      class="p-a-0"
-      append-to-body
-      top="10vh"
-    >
+    <el-dialog title="查看流程" :visible.sync="imgV" width="65%" class="p-a-0" append-to-body top="10vh">
       <approvalImg
         class="text-c p-a"
         :proc-inst-id="$route.query.processInstanceId"

package/src/components/Button/index.vue

@@ -1,11 +1,5 @@
 <template>
-  <el-button
-    :type="oType"
-    :plain="plain"
-    :disabled="disabled"
-    v-bind="$attrs"
-    v-on="$listeners"
-  >
+  <el-button :type="oType" :plain="plain" :disabled="disabled" v-bind="$attrs" v-on="$listeners">
     <slot></slot>
   </el-button>
 </template>

package/src/components/CascaderArea/index.vue

@@ -51,49 +51,33 @@ export default {
     if (!window._china_area_tree_) {
       this.getAreaTree()
     } else {
-      this.areaTree = this.isUrban
-        ? window._china_urban_tree_
-        : window._china_area_tree_
+      this.areaTree = this.isUrban ? window._china_urban_tree_ : window._china_area_tree_
     }
   },
   methods: {
     getAreaTree() {
-      axios
-        .get('/bems/1.0/area', { isEnable: 1 }, { loading: false })
-        .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 noAreaTree = areaTree.filter((a) => a.regionLevel !== '1')
-          if (noAreaTree.length > 0) {
-            console.warn('这些区域找不到父级节点：', noAreaTree)
-          }
+      axios.get('/bems/1.0/area', { isEnable: 1 }, { loading: false }).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 noAreaTree = areaTree.filter((a) => a.regionLevel !== '1')
+        if (noAreaTree.length > 0) {
+          console.warn('这些区域找不到父级节点：', noAreaTree)
+        }
 
-          window._china_area_tree_ = areaTree.filter(
-            (a) => a.regionLevel === '1'
-          )
+        window._china_area_tree_ = areaTree.filter((a) => a.regionLevel === '1')
 
-          let urbanTree = list2tree(
-            dataUb.filter((d) => d.regionLevel !== '3'),
-            'regionNo',
-            'fatherNo',
-            'children',
-            'regionNo'
-          )
+        let urbanTree = list2tree(
+          dataUb.filter((d) => d.regionLevel !== '3'),
+          'regionNo',
+          'fatherNo',
+          'children',
+          'regionNo'
+        )
 
-          window._china_urban_tree_ = urbanTree.filter(
-            (a) => a.regionLevel === '1'
-          )
-          this.areaTree = this.isUrban
-            ? window._china_urban_tree_
-            : window._china_area_tree_
-        })
+        window._china_urban_tree_ = urbanTree.filter((a) => a.regionLevel === '1')
+        this.areaTree = this.isUrban ? window._china_urban_tree_ : window._china_area_tree_
+      })
     },
     updateArea() {
       this.getAreaTree()

package/src/components/ChildRange/index.vue

@@ -77,9 +77,7 @@ export default {
     // 根据精度保留数字
     toPrecision(num, precision) {
       if (precision === undefined) precision = 0
-      return parseFloat(
-        Math.round(num * Math.pow(10, precision)) / Math.pow(10, precision)
-      )
+      return parseFloat(Math.round(num * Math.pow(10, precision)) / Math.pow(10, precision))
     },
 
     handleBlurleft(event) {
@@ -124,10 +122,7 @@ export default {
 
       // 如果from > to 将from值替换成to
       if (typeof this.value2 === 'number') {
-        this.value1 =
-          parseFloat(this.value1) <= parseFloat(this.value2)
-            ? this.value1
-            : this.value2
+        this.value1 = parseFloat(this.value1) <= parseFloat(this.value2) ? this.value1 : this.value2
       }
       this.$emit('input', [this.value1, this.value2])
       this.$emit('changefrom', this.value1)
@@ -147,10 +142,7 @@ export default {
 
       // 如果to < tfrom 将to值替换成from
       if (typeof this.value1 === 'number') {
-        this.value2 =
-          parseFloat(this.value2) >= parseFloat(this.value1)
-            ? this.value2
-            : this.value1
+        this.value2 = parseFloat(this.value2) >= parseFloat(this.value1) ? this.value2 : this.value1
       }
       this.$emit('input', [this.value1, this.value2])
       this.$emit('changeright', this.value2)

package/src/components/DatePicker/por.vue

@@ -132,11 +132,7 @@ export default {
   data() {
     this.pickerOptions = {
       disabledDate: this.minNow ? disabledDate_1 : undefined,
-      shortcuts: this.showShortcut
-        ? this.type === 'date'
-          ? shortcuts_1
-          : shortcuts_2
-        : undefined
+      shortcuts: this.showShortcut ? (this.type === 'date' ? shortcuts_1 : shortcuts_2) : undefined
     }
 
     this.listeners = Object.assign({}, this.$listeners, { input: () => {} })

package/src/components/Descriptions/index.vue

@@ -1,10 +1,5 @@
 <template>
-  <el-descriptions
-    class="n20-descriptions"
-    :column="column"
-    size="default"
-    border
-  >
+  <el-descriptions class="n20-descriptions" :column="column" size="default" border>
     <slot></slot>
   </el-descriptions>
 </template>

package/src/components/DragList/index.vue

@@ -10,7 +10,7 @@
     <div v-for="(item, index) in list" :key="index" class="n20-drag-list-item">
       <i class="n20-drag-icon n20-icon-tuodong"></i>
       <slot :item="item" :index="index">
-        <span>{{ item[labelKey] || item }}</span>
+        <span class="text-ellipsis">{{ item[labelKey] || item }}</span>
       </slot>
       <el-link
         v-if="!disabled"
@@ -28,10 +28,7 @@ import importG from '../../utils/importGlobal.js'
 export default {
   name: 'DragList',
   components: {
-    vueDraggable: () =>
-      importG('vuedraggable', () =>
-        import(/*webpackChunkName: "vuedraggable"*/ 'vuedraggable')
-      )
+    vueDraggable: () => importG('vuedraggable', () => import(/*webpackChunkName: "vuedraggable"*/ 'vuedraggable'))
   },
   props: {
     list: {

package/src/components/ECharts/define.js

@@ -1,4 +1,3 @@
-
 const color = ['#83D0EF', '#63d9a0', '#73A0FA', '#99DCD2', '#C1C1C1', '#FFB59E', '#EF8787']
 
 const axisConfig = {
@@ -67,8 +66,4 @@ const pieConfig = {
   }
 }
 
-export {
-  color,
-  axisConfig,
-  pieConfig
-}
+export { color, axisConfig, pieConfig }

package/src/components/ECharts/index.vue

@@ -58,18 +58,13 @@ export default {
 
   methods: {
     async initChart() {
-      let echarts = await importG('echarts', () =>
-        import(/*webpackChunkName "echarts"*/ 'echarts')
-      )
+      let echarts = await importG('echarts', () => import(/*webpackChunkName "echarts"*/ 'echarts'))
       this.chart = echarts.init(this.$refs['chart'])
       this.setOption()
     },
 
     setOption() {
-      this.chart.setOption(
-        this.calcOption(this.option),
-        this.composedChartOption
-      )
+      this.chart.setOption(this.calcOption(this.option), this.composedChartOption)
     },
 
     grid({ grid = {} }) {
@@ -77,9 +72,7 @@ export default {
         containLabel: true
       }
 
-      grid = Array.isArray(grid)
-        ? grid.map((item) => merge({}, selfGrid, item))
-        : merge({}, selfGrid, grid)
+      grid = Array.isArray(grid) ? grid.map((item) => merge({}, selfGrid, item)) : merge({}, selfGrid, grid)
 
       return {
         grid
@@ -87,17 +80,13 @@ export default {
     },
 
     xAxis({ xAxis }) {
-      xAxis = Array.isArray(xAxis)
-        ? 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 = Array.isArray(yAxis)
-        ? yAxis.map((item) => merge({}, axisConfig, item))
-        : merge({}, axisConfig, yAxis)
+      yAxis = Array.isArray(yAxis) ? yAxis.map((item) => merge({}, axisConfig, item)) : merge({}, axisConfig, yAxis)
 
       return { yAxis }
     },

package/src/components/Empty/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="n20-empty">
-    <img
-      :src="src || imgSrc"
-      :style="{ height: `${height}px`, width: `${width}px` }"
-    />
+    <img :src="src || imgSrc" :style="{ height: `${height}px`, width: `${width}px` }" />
     <slot name="content"></slot>
   </div>
 </template>

package/src/components/Expandable/index.vue

@@ -8,10 +8,7 @@
         <slot name="tips"></slot>
         <span v-if="showExpand" class="n20-tips" @click="expand = !expand">
           <span>{{ expand ? '收起' : '展开' }}</span
-          ><i
-            class="el-icon-arrow-right m-l-ss"
-            :class="{ expand: expand }"
-          ></i>
+          ><i class="el-icon-arrow-right m-l-ss" :class="{ expand: expand }"></i>
         </span>
       </div>
     </div>

package/src/components/Expandable/main.vue

@@ -2,11 +2,7 @@
   <div class="n20-form-expandable-pane">
     <div class="n20-title flex-box flex-lr flex-v">
       <span class="n20-tips flex-item" @click="getExpand">
-        <i
-          v-if="icon"
-          class="el-icon-caret-right color-0 m-r-b"
-          :class="{ expand: expand }"
-        ></i>
+        <i v-if="icon" class="el-icon-caret-right color-0 m-r-b" :class="{ expand: expand }"></i>
         <slot name="title">
           <span>{{ title }}</span>
         </slot>

package/src/components/FileExportAsync/index.vue

@@ -17,12 +17,7 @@
       </div>
       <div class="flex-box m-b">
         <span class="m-r">导出进度</span>
-        <el-progress
-          class="flex-item"
-          :percentage="pgsVal"
-          :status="pgsStatus"
-          style="margin-right: -10px"
-        />
+        <el-progress class="flex-item" :percentage="pgsVal" :status="pgsStatus" style="margin-right: -10px" />
       </div>
       <span slot="footer">
         <el-button plain @click="exportCancel">取消</el-button>
@@ -181,9 +176,7 @@ export default {
     },
     closeWaitPop() {
       clearTimeout(this.waitTimer)
-      let confirmBtn = document.querySelector(
-        `.${this.waitClass} .el-button--primary`
-      )
+      let confirmBtn = document.querySelector(`.${this.waitClass} .el-button--primary`)
       confirmBtn && confirmBtn.click()
     }
   }