n20-common-lib 2.9.13 → 2.9.14

package/src/components/TableSetSize/index.vue

@@ -22,7 +22,7 @@ export default {
     mini: {
       type: Object,
       default: () => ({
-        border: false,
+        border: true,
         size: 'mini',
         stripe: true
       })

package/src/components/Tree/index.vue

@@ -21,16 +21,21 @@
         <img :src="node.level == 1 ? folder : desc" class="m-r-ss" alt="" />
         <div
           v-title="
-            (data[props.value] ? '(' + data[props.value] + ') ' : '') +
-            data[props.label] +
-            (data && data.children && data.children.length > 0 ? '(' + data.children.length + ')' : '')
+            returnTitle(data) +
+            (props.total && data[props.children] && data[props.children].length > 0
+              ? '(' + data[props.total] + ')'
+              : data && data[props.children] && data[props.children].length > 0
+              ? '(' + data[props.children].length + ')'
+              : '')
           "
           :show-overflow-tooltip="true"
           class="cl-tree-item-label text-ellipsis"
         >
-          {{ (data[props.value] ? '(' + data[props.value] + ') ' : '') + data[props.label] }}
+          {{ returnTitle(data) }}
           {{
-            data && data[props.children] && data[props.children].length > 0
+            props.total && data[props.children] && data[props.children].length > 0
+              ? '(' + data[props.total] + ')'
+              : data && data[props.children] && data[props.children].length > 0
               ? '(' + data[props.children].length + ')'
               : ''
           }}
@@ -67,6 +72,10 @@
 export default {
   name: 'Tree',
   props: {
+    labelHasValue: {
+      type: Boolean,
+      default: true
+    },
     data: {
       type: Array,
       default: () => []
@@ -111,6 +120,13 @@ export default {
     this.setRefData()
   },
   methods: {
+    returnTitle(data) {
+      if (!this.labelHasValue) {
+        return data[this.props.label]
+      } else {
+        return (data[this.props.value] ? '(' + data[this.props.value] + ') ' : '') + data[this.props.label]
+      }
+    },
     setRefData() {
       const {
         store,

package/src/components/Upload/index.vue

@@ -19,7 +19,7 @@
   >
     <template slot="trigger">
       <slot name="trigger">
-        <el-input :value="fileNameC" :placeholder="placeholder" readonly :disabled="$attrs.disabled">
+        <el-input v-title :value="fileNameC" :placeholder="placeholder" readonly :disabled="$attrs.disabled">
           <template slot="suffix">
             <i
               v-if="fileNameC && showClear"
@@ -42,14 +42,14 @@
       :percent="percent"
       :width="width"
       title="文件导入"
-      :showErrorExport="showErrorExport"
+      :show-error-export="showErrorExport"
       :pagination="pagination"
       :footer-btn="footer"
       :validate-result="validateResult"
       :validate-confirm="validateConfirm"
       @importError="importError"
-    >
-    </uploadMsg>
+      @clearFiles="clearFiles"
+    />
   </el-upload>
 </template>
 
@@ -204,6 +204,9 @@ export default {
     }
   },
   methods: {
+    clearFiles() {
+      this.$refs['upload'].clearFiles()
+    },
     importError() {
       this.$emit('importError')
     },
@@ -298,6 +301,7 @@ export default {
         let Pro = axios.post(opt.action + '?r=' + Math.random(), FD, {
           headers: Object.assign(auth.setHeaders(this.headers), { 'Content-Type': 'multipart/form-data' }),
           loading: false,
+          timeout: 900000,
           onUploadProgress: (arg) => {
             if (opt.onProgress) {
               arg.percent = arg.progress * 100
@@ -327,13 +331,18 @@ export default {
       this.fileUrlC = response.data
       this.fileList = fileList
 
-      if (this.onSuccess) {
-        this.onSuccess(response, file, fileList)
-      }
-
       if (this.msgType === 'dialog') {
-        this.percent = 100
-        this.percentType = 'success'
+        if (response.code >= 900 || response.code === -1) {
+          this.percent = 99
+          this.percentType = 'error'
+        } else {
+          this.percent = 100
+          this.percentType = 'success'
+          if (this.onSuccess) {
+            this.onSuccess(response, file, fileList)
+          }
+        }
+
         this.percentMsg = response.msg || $lc('上传成功！')
       } else if (this.msgType === 'message') {
         if (!this.onSuccess) {
@@ -342,6 +351,12 @@ export default {
             message: response.msg,
             showClose: true
           })
+        } else {
+          this.onSuccess(response, file, fileList)
+        }
+      } else {
+        if (this.onSuccess) {
+          this.onSuccess(response, file, fileList)
         }
       }
     },

package/src/components/Upload/uploadMsg.vue

@@ -6,9 +6,9 @@
     :visible.sync="progressV"
     :title="title"
     append-to-body
-    @close="handleClose"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
+    @close="handleClose"
   >
     <div style="min-height: 28px">
       <template v-if="!hidePercent">
@@ -50,7 +50,7 @@
           <div class="bd-a">
             <div class="flex-box flex-lr flex-v m-t m-b p-l p-r">
               <span>{{ '无效数据详情' | $lc }}</span>
-              <el-button type="text" v-if="showErrorExport" @click="importError">{{ '导出错误数据' | $lc }}</el-button>
+              <el-button v-if="showErrorExport" type="text" @click="importError">{{ '导出错误数据' | $lc }}</el-button>
             </div>
             <el-table ref="tables" :key="index" :data="errorListC" border style="width: 100%" height="300px">
               <el-table-column
@@ -60,20 +60,22 @@
                 :label="column.label"
                 :width="column.width"
                 :align="column.align"
+                :header-align="column.headerAlign || 'center'"
                 :show-overflow-tooltip="column.showOverflowTooltip"
-                :formatter="column.formatter | colfF(column.formatterMap)"
               >
                 <template slot-scope="scope">
-                  <span v-html="scope.row[column.prop]"></span>
+                  <span v-if="column.formatter">{{ scope.row | colfFRow(column.formatter, column.formatterMap) }}</span>
+                  <!-- eslint-disable-next-line vue/no-v-html -->
+                  <span v-else v-html="scope.row[column.prop]"></span>
                 </template>
               </el-table-column>
             </el-table>
             <div v-if="pagination" class="flex-box flex-r m-t-ss m-b-ss">
               <Pagination
-                :pageObj="page"
+                :page-obj="page"
                 :page-key="{ no: 'current', size: 'pageSize', total: 'total' }"
                 @change="getList"
-              ></Pagination>
+              />
             </div>
           </div>
           <div class="color-warning m-t-s">{{ '上述数据输入有误，请修改导入文件中相关信息！' | $lc }}</div>
@@ -81,8 +83,9 @@
       </template>
     </div>
     <div slot="footer" style="height: 32px">
-      <template v-if="validateResult && footerBtn">
+      <template v-if="footerBtn">
         <el-button
+          v-if="validateResult.successNum > 0"
           type="primary"
           @click="
             () => {
@@ -111,10 +114,10 @@
 </template>
 
 <script>
-import cloneDeep from 'lodash/cloneDeep'
+import XEUtils from 'xe-utils'
 import { $lc } from '../../utils/i18n/index'
 import Pagination from '../Pagination/index.vue'
-import { colfF } from '../Table/filters.js'
+import { colfFRow } from '../Table/filters.js'
 export default {
   name: 'UploadMsg',
   components: { Pagination },
@@ -169,7 +172,7 @@ export default {
     }
   },
   filters: {
-    colfF
+    colfFRow
   },
   data() {
     return {
@@ -183,20 +186,6 @@ export default {
       index: 0
     }
   },
-  watch: {
-    errorList: {
-      handler() {
-        this.errorListC = this.errorList
-        this.page.total = this.tableData.length
-      }
-    },
-    page: {
-      handler(v) {
-        this.pageSize = v
-      },
-      deep: true
-    }
-  },
   computed: {
     progressV: {
       get() {
@@ -225,7 +214,8 @@ export default {
             }
             _errorList.push(temp)
           })
-          this.tableData = cloneDeep(_errorList)
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.tableData = XEUtils.clone(_errorList, true)
           const startIndex = (this.page.current - 1) * this.page.pageSize
           const endIndex = startIndex + this.page.pageSize
           return this.pagination ? this.tableData.slice(startIndex, endIndex) : this.tableData
@@ -238,6 +228,20 @@ export default {
       }
     }
   },
+  watch: {
+    errorList: {
+      handler() {
+        this.errorListC = this.errorList
+        this.page.total = this.tableData.length
+      }
+    },
+    page: {
+      handler(v) {
+        this.pageSize = v
+      },
+      deep: true
+    }
+  },
   methods: {
     importError() {
       this.$emit('importError')
@@ -253,6 +257,7 @@ export default {
     },
     handleClose() {
       this.progressV = false
+      this.$emit('clearFiles')
     },
     getList() {
       const startIndex = (this.page.current - 1) * this.page.pageSize

package/src/components/operatingStatus/index.vue

@@ -10,10 +10,9 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
-import axios from '../../utils/axios'
+import XEUtils from 'xe-utils'
 import getJsonc from '../../assets/getJsonc.js'
-import cloneDeep from 'lodash/cloneDeep'
+import axios from '../../utils/axios'
 let enumData = {
   D001: '营业阶段',
   D002: '日终阶段',
@@ -64,7 +63,7 @@ export default {
         onMsg: true
       })
       this.tips = data
-      this.list = cloneDeep(data)
+      this.list = XEUtils.clone(data, true)
         .map((tip) => {
           return `${tip.updateTime || tip.createtime}${tip.busNname}${enumData[tip.busState]}${
             tip.busCode.includes('CENTER') ? '(' + tip.currency + ')' : ''

package/src/directives/VTitle/index.js

@@ -40,13 +40,24 @@ function tipShow(el, arg) {
   let text = undefined
 
   if (el.$tooltipTitle) {
-    if (!el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth) {
+    // 修改这里的判断逻辑
+    const shouldShowTooltip =
+      !el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth || el.offsetWidth < el.scrollWidth
+
+    if (shouldShowTooltip) {
       text = el.$tooltipTitle
     }
   } else {
     let _input = el.querySelector('.el-input__inner')
-    if (_input && _input.clientWidth < _input.scrollWidth) {
-      text = _input.value
+    if (_input) {
+      // 修改输入框的判断逻辑
+      const inputShouldShow = _input.clientWidth < _input.scrollWidth || _input.offsetWidth < _input.scrollWidth
+      if (inputShouldShow) {
+        text = _input.value
+      }
+    }
+    if (arg === 'tooltip' && (el.clientWidth < el.scrollWidth || el.offsetWidth < el.scrollWidth)) {
+      text = el.innerText
     }
   }
 
@@ -83,7 +94,6 @@ TitleDirective.install = (Vue) => {
       el.$tooltipTitle = binding.value
       let vmethods = vnode.child ? vnode.child.$options : vnode.context.$options
       vmethods.deactivated || (vmethods.deactivated = [])
-
       vmethods.deactivated.push(tipHide.bind(null, el))
       el.$tipShow = () => tipShow(el, binding.arg)
       el.$tipHide = () => tipHide(el)
@@ -93,7 +103,7 @@ TitleDirective.install = (Vue) => {
     update: function (el, binding) {
       el.$tooltipTitle = binding.value
     },
-    unbind: function (el, binding) {
+    unbind: function (el) {
       tipHide(el)
       el.removeEventListener('mouseenter', el.$tipShow)
       el.removeEventListener('mouseleave', el.$tipHide)

package/src/directives/watermark/index.js

@@ -1,69 +1,153 @@
-const addWaterMarker = (str, parentNode, font, textColor) => {
-  const args = arguments[0]
-  let can = document.createElement('canvas')
-  const __wm = document.querySelector('.n20_v_watermark')
-  let div = __wm || document.createElement('div')
-
-  can.width = 220
-  can.height = 180
-  can.style.display = 'none'
-  let cans = can.getContext('2d')
-  cans.rotate((-20 * Math.PI) / 180)
-  cans.font = font || '16px Microsoft JhengHei'
-  cans.fillStyle = textColor || 'rgba(180, 180, 180, 0.3)'
-  cans.textAlign = 'left'
-  cans.textBaseline = 'Middle'
-  cans.fillText(str, can.width / 10, can.height / 2)
-  const styleStr = `
-          position:absolute;
-          top:0;
-          left:0;
-          width:100%;
-          height:100%;
-          inset:0;
-          z-index:99999;
-          pointer-events:none;
-          background-repeat:repeat;
-          background-image:url('${can.toDataURL('image/png')}')`
-  div.setAttribute('style', styleStr)
-  div.classList.add('n20_v_watermark')
-  if (!__wm) {
-    parentNode.style.position = 'relative'
-    parentNode.insertBefore(div, parentNode.firstChild)
+class Watermark {
+  constructor() {
+    if (Watermark.instance) {
+      return Watermark.instance
+    }
+
+    this.isGlobalWatermarkActive = false
+    this.globalObserver = null
+    this.defaultOptions = {
+      text: '', // 水印文本
+      font: '16px Microsoft JhengHei', // 字体
+      textColor: 'rgba(180, 180, 180, 0.3)', // 文字颜色
+      width: 220, // 水印宽度
+      height: 180, // 水印高度
+      rotate: -20, // 旋转角度
+      zIndex: 99999, // z-index
+      global: false // 是否全局应用
+    }
+
+    Watermark.instance = this
   }
-  const MutationObserver = window.MutationObserver || window.WebKitMutationObserver
-  if (MutationObserver) {
-    let mo = new MutationObserver(function () {
-      const __wm = document.querySelector('.n20_v_watermark')
-      // 只在__wm元素变动才重新调用 __canvasWM
-      if ((__wm && __wm.getAttribute('style') !== styleStr) || !__wm) {
-        // 避免一直触发
-        mo.disconnect()
-        mo = null
-        addWaterMarker(str, parentNode, font, textColor)
-      }
-    })
 
-    mo.observe(parentNode, {
-      attributes: true,
-      subtree: true,
-      childList: true
+  createWatermarkCanvas(options) {
+    const can = document.createElement('canvas')
+    can.width = options.width
+    can.height = options.height
+    can.style.display = 'none'
+
+    const ctx = can.getContext('2d')
+    ctx.rotate((options.rotate * Math.PI) / 180)
+    ctx.font = options.font
+    ctx.fillStyle = options.textColor
+    ctx.textAlign = 'left'
+    ctx.textBaseline = 'Middle'
+    // 支持换行符分割文本
+    const lines = options.text.split('\n')
+    const lineHeight = parseInt(options.font) * 1.2 // 行高设为字体大小的1.2倍
+    const startY = can.height / 2 - ((lines.length - 1) * lineHeight) / 2
+
+    lines.forEach((line, index) => {
+      ctx.fillText(line, can.width / 10, startY + index * lineHeight)
     })
+
+    return can.toDataURL('image/png')
   }
 
-  parentNode.style.position = 'relative'
-  parentNode.insertBefore(div, parentNode.firstChild)
-}
+  createWatermarkContainer(options) {
+    const div = document.createElement('div')
+    div.className = 'n20_v_watermark'
+
+    const style = `
+      position:absolute;
+      top:0;
+      left:0;
+      width:100%;
+      height:100%;
+      inset:0;
+      z-index:${options.zIndex};
+      pointer-events:none;
+      background-repeat:repeat;
+      background-image:url('${this.createWatermarkCanvas(options)}')`
+
+    div.setAttribute('style', style)
+    return div
+  }
+
+  clearWatermark() {
+    const watermarks = document.querySelectorAll('.n20_v_watermark')
+    watermarks.forEach((wm) => wm.remove())
+    if (this.globalObserver) {
+      this.globalObserver.disconnect()
+      this.globalObserver = null
+    }
+    this.isGlobalWatermarkActive = false
+  }
+
+  addWatermark(el, options) {
+    // 如果全局水印已激活且当前不是全局调用，则跳过
+    if (this.isGlobalWatermarkActive && el !== document.body) {
+      return
+    }
 
-const watermark = {
-  install: function (Vue) {
+    const parent = el || document.body
+    const watermark = this.createWatermarkContainer(options)
+
+    parent.style.position = 'relative'
+    parent.insertBefore(watermark, parent.firstChild)
+
+    // 如果是全局水印，设置状态
+    if (el === document.body) {
+      this.isGlobalWatermarkActive = true
+    }
+
+    // 监听DOM变化
+    const MutationObserver = window.MutationObserver || window.WebKitMutationObserver
+    if (MutationObserver) {
+      const observer = new MutationObserver(() => {
+        const wm = document.querySelector('.n20_v_watermark')
+        if (!wm || wm.getAttribute('style') !== watermark.getAttribute('style')) {
+          observer.disconnect()
+          this.addWatermark(el, options)
+        }
+      })
+
+      observer.observe(parent, {
+        attributes: true,
+        subtree: true,
+        childList: true
+      })
+
+      // 如果是全局水印，保存observer
+      if (el === document.body) {
+        this.globalObserver = observer
+      }
+    }
+  }
+
+  install(Vue, options = {}) {
+    // 合并配置
+    const config = { ...this.defaultOptions, ...options }
+
+    // 全局应用
+    if (config.global) {
+      this.clearWatermark()
+      this.addWatermark(document.body, config)
+    }
+
+    // 指令方式
     Vue.directive('watermark', {
-      inserted: function (el, binding) {
-        console.log(el, binding)
-        addWaterMarker(binding.value.text, el, binding.value.font, binding.value.textColor)
+      inserted: (el, binding) => {
+        if (this.isGlobalWatermarkActive) return
+
+        const directiveOptions = typeof binding.value === 'string' ? { text: binding.value } : binding.value
+        this.addWatermark(el, { ...config, ...directiveOptions, global: false })
+      },
+      unbind: (el) => {
+        if (!this.isGlobalWatermarkActive) {
+          this.clearWatermark()
+        }
       }
     })
   }
+
+  static getInstance() {
+    if (!Watermark.instance) {
+      Watermark.instance = new Watermark()
+    }
+    return Watermark.instance
+  }
 }
 
+const watermark = Watermark.getInstance()
 export default watermark