n20-common-lib 1.3.187 → 1.3.188

package/package.json

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

package/src/components/Empty/index.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="n20-empty">
     <img :src="src || imgSrc" :style="{ height: `${height}px`, width: `${width}px` }" />
-    <slot name="content"></slot>
+    <slot name="content">
+      <span style="color: #cacaca">{{ content }}</span>
+    </slot>
   </div>
 </template>
 
@@ -24,6 +26,10 @@ export default {
     width: {
       type: Number,
       default: 351
+    },
+    content: {
+      type: String,
+      default: ''
     }
   },
   data() {

package/src/components/Filters/index.vue

@@ -230,8 +230,8 @@ export default {
     },
     setRemoteChange(list) {
       this.remoteList = list
+      this.clear(list)
       setTimeout(() => this.$refs['popover'].updatePopper(), 360)
-      this.clear()
     }
   }
 }

package/src/components/Upload/index.vue

@@ -238,9 +238,18 @@ export default {
       } else {
         let FD = new FormData()
         FD.append(opt.filename, opt.file)
-        if (opt.data) {
-          for (let k in opt.data) {
-            FD.append(k, opt.data[k])
+
+        let data
+        if (window._fileData) {
+          data = window._fileData
+          delete window._fileData
+        } else {
+          data = opt.data
+        }
+
+        if (data) {
+          for (let k in data) {
+            FD.append(k, data[k])
           }
         }
 

package/src/components/Upload/uploadMsg.vue

@@ -1,5 +1,12 @@
 <template>
-  <el-dialog v-drag :visible.sync="progressV" :title="title" append-to-body>
+  <el-dialog
+    v-drag
+    :visible.sync="progressV"
+    :title="title"
+    append-to-body
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
     <template v-if="!hidePercent">
       <p v-if="!percentType">系统处理中，请稍等......</p>
       <div v-else>
@@ -78,6 +85,7 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 export default {
+  name: 'UploadMsg',
   props: {
     title: {
       type: String,

package/src/components/WorkCard/index.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="work-card flex-column p-a m-a-0">
+    <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>
+        </el-badge>
+        <el-link v-if="showMore" class="m-l-auto" :underline="false" @click="$emit('more')"
+          >更多<i class="el-icon-arrow-right"></i
+        ></el-link>
+      </div>
+    </slot>
+    <div class="flex-item" style="height: 80%">
+      <clEmpty v-if="isEmpty" type="empty" :width="150" :height="150" style="height: 100%">
+        <span slot="content" class="event-card--empty-title">暂无数据</span>
+      </clEmpty>
+      <slot v-else></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import clEmpty from '../Empty/index.vue'
+export default {
+  name: 'WorkCard',
+  components: {
+    clEmpty
+  },
+  props: {
+    header: {
+      type: String,
+      default: undefined
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    badgeNum: {
+      type: Number,
+      default: 0
+    },
+    isEmpty: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      showMore: false
+    }
+  },
+  mounted() {
+    if (this.$listeners.more) {
+      this.showMore = true
+    }
+  }
+}
+</script>
+
+<style>
+.work-card {
+  height: 100%;
+}
+.work-card ::v-deep .el-badge__content {
+  line-height: 14px;
+}
+
+.work-card--empty-title {
+  color: #cacaca;
+  padding-bottom: 80px;
+  margin-top: -16px;
+}
+</style>

package/src/index.js

@@ -60,6 +60,8 @@ import SelectDatePicker from './components/DateSelect/index.vue'
 import QuarterDatePicker from './components/DateSelect/quarterDatePicker.vue'
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
 import TableTransfer from './components/TableTransfer/index.vue'
+import WorkCard from './components/WorkCard/index.vue'
+import UploadMsg from './components/Upload/uploadMsg.vue'
 
 // ECharts 不要打包进来
 import Stamp from './components/Stamp/index.vue'
@@ -166,6 +168,8 @@ const components = [
   QuarterDatePicker,
   BusiDatePicker,
   TableTransfer,
+  WorkCard,
+  UploadMsg,
   /* old */
   TableO,
   FiltersO,
@@ -290,6 +294,8 @@ export {
   QuarterDatePicker,
   BusiDatePicker,
   TableTransfer,
+  WorkCard,
+  UploadMsg,
   /* 中建科 */
   ApprovalCardZjk,
   ApproveCardZjk,

package/src/plugins/Sign/NetSM3/index.js

@@ -214,7 +214,7 @@ export async function getSign(plain, dn) {
     })
   })
 
-  if (checkRes) {
+  if (checkRes != 'checkRes') {
     switch (checkRes) {
       case 'dnListEmpty':
         Message.warning('没有匹配到证书!')

package/src/utils/repairElementUI.js

@@ -1,18 +1,5 @@
-/* 对ElementUI硬优化 */
-import Popper from 'element-ui/lib/utils/popper.js'
-
 import Vue from 'vue'
-import FilterPanel from './tableheaderFilterpanel.vue'
-
-function hasClass(el, cls) {
-  if (!el || !cls) return false
-  if (cls.indexOf(' ') !== -1) throw new Error('className should not contain space.')
-  if (el.classList) {
-    return el.classList.contains(cls)
-  } else {
-    return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1
-  }
-}
+import ElementUI from 'element-ui'
 
 function setPropsDefault(component, props) {
   let c_props = component.props
@@ -27,127 +14,31 @@ function setMethodsDefault(component, methods) {
   })
 }
 
-function repairPopper() {
-  if (!Popper.prototype.repairR) {
-    Popper.prototype.repairR = true
-
-    let __getBoundaries = Popper.prototype._getBoundaries
-    Popper.prototype._getBoundaries = function (data, padding, boundariesElement) {
-      const boundaries = __getBoundaries.call(this, data, padding, boundariesElement)
+// setPropsDefault(ElementUI.Table, {
+//   tooltipEffect: {
+//     default: 'light'
+//   }
+// })
 
-      if (this._options.boundariesElement === 'viewport') {
-        const root = window
-        const body = root.document.body
-        const html = root.document.documentElement
-        let width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth)
-        let height = Math.max(
-          body.scrollHeight,
-          body.offsetHeight,
-          html.clientHeight,
-          html.scrollHeight,
-          html.offsetHeight
-        )
-
-        boundaries.right = boundaries.right - root.document.documentElement.clientWidth + width
-        boundaries.bottom = boundaries.bottom - root.document.documentElement.clientHeight + height
-      }
-      return boundaries
-    }
+setPropsDefault(ElementUI.TableColumn, {
+  filterPlacement: {
+    default: 'bottom'
   }
-}
-
-export default function (ElementUI) {
-  repairPopper()
-
-  // setPropsDefault(ElementUI.Table, {
-  //   tooltipEffect: {
-  //     default: 'light'
-  //   }
-  // })
-
-  setPropsDefault(ElementUI.TableColumn, {
-    filterPlacement: {
-      default: 'bottom'
-    }
-  })
+})
 
-  setPropsDefault(ElementUI.Dropdown, {
-    placement: {
-      default: 'bottom'
-    }
-  })
-
-  setPropsDefault(ElementUI.Dialog, {
-    appendToBody: {
-      default: true
-    }
-  })
-  // 设置表头最小宽度,保证表头不换行
-  setMethodsDefault(ElementUI.TableColumn, {
-    setColumnWidth(column) {
-      if (this.realWidth) {
-        column.width = this.realWidth
-      }
-      if (this.realMinWidth) {
-        column.minWidth = this.realMinWidth
-      }
-      if (!column.minWidth) {
-        if (!column.width) {
-          let label = column.label || ''
-          let labels = label.match(/./gu) || []
-          let labelW = 0
-          labels.forEach((s) => (labelW += ASCII_W[s] || 14))
-
-          let sortable = column.sortable ? 24 : 0
-          let filters = column.filters ? 16 : 0
-          column.minWidth = Math.max(80, labelW + 22 + sortable + filters)
-        } else {
-          column.minWidth = 80
-        }
-      }
-      column.realWidth = column.width === undefined ? column.minWidth : column.width
-      return column
-    }
-  })
-
-  // 美化表头搜索
-  if (ElementUI.Table.components.TableHeader) {
-    setMethodsDefault(ElementUI.Table.components.TableHeader, {
-      handleFilterClick(event, column) {
-        event.stopPropagation()
-        const target = event.target
-        let cell = target.tagName === 'TH' ? target : target.parentNode
-        if (hasClass(cell, 'noclick')) return
-        cell = cell.querySelector('.el-table__column-filter-trigger') || cell
-        const table = this.$parent
-
-        let filterPanel = this.filterPanels[column.id]
-
-        if (filterPanel && column.filterOpened) {
-          filterPanel.showPopper = false
-          return
-        }
-
-        if (!filterPanel) {
-          filterPanel = new Vue(FilterPanel)
-          this.filterPanels[column.id] = filterPanel
-          if (column.filterPlacement) {
-            filterPanel.placement = column.filterPlacement
-          }
-          filterPanel.table = table
-          filterPanel.cell = cell
-          filterPanel.column = column
-          !this.$isServer && filterPanel.$mount(document.createElement('div'))
-        }
+setPropsDefault(ElementUI.Dropdown, {
+  placement: {
+    default: 'bottom'
+  }
+})
 
-        setTimeout(() => {
-          filterPanel.showPopper = true
-        }, 16)
-      }
-    })
+setPropsDefault(ElementUI.Dialog, {
+  appendToBody: {
+    default: true
   }
-}
+})
 
+// 设置表头最小宽度,保证表头不换行
 const ASCII_W = {
   ' ': 4.125,
   0: 8.21875,
@@ -245,3 +136,111 @@ const ASCII_W = {
   '}': 4.6875,
   '~': 10.390625
 }
+setMethodsDefault(ElementUI.TableColumn, {
+  setColumnWidth(column) {
+    if (this.realWidth) {
+      column.width = this.realWidth
+    }
+    if (this.realMinWidth) {
+      column.minWidth = this.realMinWidth
+    }
+    if (!column.minWidth) {
+      if (!column.width) {
+        let label = column.label || ''
+        let labels = label.match(/./gu) || []
+        let labelW = 0
+        labels.forEach((s) => (labelW += ASCII_W[s] || 14))
+
+        let sortable = column.sortable ? 24 : 0
+        let filters = column.filters ? 16 : 0
+        column.minWidth = Math.max(80, labelW + 22 + sortable + filters)
+      } else {
+        column.minWidth = 80
+      }
+    }
+    column.realWidth = column.width === undefined ? column.minWidth : column.width
+    return column
+  }
+})
+
+// 美化表头搜索
+import FilterPanel from './tableheaderFilterpanel.vue'
+function hasClass(el, cls) {
+  if (!el || !cls) return false
+  if (cls.indexOf(' ') !== -1) throw new Error('className should not contain space.')
+  if (el.classList) {
+    return el.classList.contains(cls)
+  } else {
+    return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1
+  }
+}
+if (ElementUI.Table.components.TableHeader) {
+  setMethodsDefault(ElementUI.Table.components.TableHeader, {
+    handleFilterClick(event, column) {
+      event.stopPropagation()
+      const target = event.target
+      let cell = target.tagName === 'TH' ? target : target.parentNode
+      if (hasClass(cell, 'noclick')) return
+      cell = cell.querySelector('.el-table__column-filter-trigger') || cell
+      const table = this.$parent
+
+      let filterPanel = this.filterPanels[column.id]
+
+      if (filterPanel && column.filterOpened) {
+        filterPanel.showPopper = false
+        return
+      }
+
+      if (!filterPanel) {
+        filterPanel = new Vue(FilterPanel)
+        this.filterPanels[column.id] = filterPanel
+        if (column.filterPlacement) {
+          filterPanel.placement = column.filterPlacement
+        }
+        filterPanel.table = table
+        filterPanel.cell = cell
+        filterPanel.column = column
+        !this.$isServer && filterPanel.$mount(document.createElement('div'))
+      }
+
+      setTimeout(() => {
+        filterPanel.showPopper = true
+      }, 16)
+    }
+  })
+}
+
+/* 对ElementUI硬优化 */
+import Popper from 'element-ui/lib/utils/popper.js'
+function repairPopper() {
+  if (!Popper.prototype.repairR) {
+    Popper.prototype.repairR = true
+
+    let __getBoundaries = Popper.prototype._getBoundaries
+    Popper.prototype._getBoundaries = function (data, padding, boundariesElement) {
+      const boundaries = __getBoundaries.call(this, data, padding, boundariesElement)
+
+      if (this._options.boundariesElement === 'viewport') {
+        const root = window
+        const body = root.document.body
+        const html = root.document.documentElement
+        let width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth)
+        let height = Math.max(
+          body.scrollHeight,
+          body.offsetHeight,
+          html.clientHeight,
+          html.scrollHeight,
+          html.offsetHeight
+        )
+
+        boundaries.right = boundaries.right - root.document.documentElement.clientWidth + width
+        boundaries.bottom = boundaries.bottom - root.document.documentElement.clientHeight + height
+      }
+      return boundaries
+    }
+  }
+}
+
+export default function () {
+  repairPopper()
+}

package/src/utils/xls2json.js

@@ -34,7 +34,12 @@ export default async function toJson(file, name) {
     rowsc.forEach((r) => {
       let row = []
       cols.forEach((c) => {
-        row.push(r[c])
+        let d = r[c]
+        if (d instanceof Date && d.getHours() === 23 && d.getMinutes() === 59) {
+          d.setDate(d.getDate() + 1)
+          d.setHours(0, 0, 0)
+        }
+        row.push(d)
       })
       rows.push(row)
     })