n20-common-lib 1.3.44 → 1.3.45

package/package.json

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

package/src/components/ApprovalRecord/approvalImgPro.vue

@@ -64,6 +64,7 @@
 </template>
 
 <script>
+import importG from '../../utils/importGlobal.js'
 import { tipShow, tipHide } from '../../directives/VTitle/index.js'
 export default {
   filters: {
@@ -101,11 +102,9 @@ export default {
     taskDefIdMap.forEach((obj) => {
       this.addEvent(obj)
     })
-    let panzoom = window._g_panzoom
-    if (!panzoom) {
-      const _module = await import(/*webpackChunkName: "g_panzoom"*/ 'panzoom')
-      panzoom = window._g_panzoom = _module.default
-    }
+    let { default: panzoom } = await importG('panzoom', () =>
+      import(/*webpackChunkName: "panzoom"*/ 'panzoom')
+    )
 
     this.svgPanzoom = panzoom(this.svgC, {
       maxZoom: this.max,

package/src/components/DragList/index.vue

@@ -24,21 +24,14 @@
 </template>
 
 <script>
+import importG from '../../utils/importGlobal.js'
 export default {
   name: 'DragList',
   components: {
-    vueDraggable: () => {
-      if (!window._g_vuedraggable) {
-        return import(
-          /*webpackChunkName: "g_vuedraggable"*/ 'vuedraggable'
-        ).then((_module) => {
-          window._g_vuedraggable = _module
-          return _module
-        })
-      } else {
-        return Promise.resolve(window._g_vuedraggable)
-      }
-    }
+    vueDraggable: () =>
+      importG('vuedraggable', () =>
+        import(/*webpackChunkName: "vuedraggable"*/ 'vuedraggable')
+      )
   },
   props: {
     list: {

package/src/components/ECharts/index.vue

@@ -5,6 +5,7 @@
 <script>
 import resize from './mixins/resize'
 import merge from 'lodash/merge'
+import importG from '../../utils/importGlobal.js'
 
 import { color, axisConfig, pieConfig } from './define'
 
@@ -57,13 +58,9 @@ export default {
 
   methods: {
     async initChart() {
-      let echarts = window._g_echarts
-      if (!echarts) {
-        const _module = await import(
-          /*webpackChunkName: "g_echarts"*/ 'echarts'
-        )
-        echarts = window._g_echarts = _module
-      }
+      let echarts = await importG('echarts', () =>
+        import(/*webpackChunkName "echarts"*/ 'echarts')
+      )
       this.chart = echarts.init(this.$refs['chart'])
       this.setOption()
     },

package/src/components/LoginTemporary/form.vue

@@ -177,6 +177,7 @@ import axios from '../../utils/axios'
 import auth from '../../utils/auth'
 import qrCode from './qrcode.vue'
 import { siteTree2menus, siteTree2RelaNos } from './utils'
+import importG from '../../utils/importGlobal.js'
 
 function encode(pwd = '', key = 0) {
   if (pwd === '') return ''
@@ -494,13 +495,12 @@ export default {
     async loginAfter(data) {
       auth.setToken(data.accessToken)
       try {
-        let decode = window._g_jsonwebtoken_decode
-        if (!decode) {
-          const _module = await import(
-            /*webpackChunkName: "g_jsonwebtoken_decode"*/ 'jsonwebtoken/decode'
+        let { default: decode } = await importG('jsonwebtoken/decode', () =>
+          import(
+            /*webpackChunkName: "jsonwebtoken_decode"*/ 'jsonwebtoken/decode'
           )
-          decode = window._g_jsonwebtoken_decode = _module.default
-        }
+        )
+
         let tokenObj = decode(data.accessToken)
         let userInfo = JSON.parse(tokenObj.user_name)
         this.userNo = userInfo.userNo

package/src/components/LoginTemporary/qrcode.vue

@@ -21,6 +21,7 @@
 </template>
 <script>
 import axios from '../../utils/axios'
+import importG from '../../utils/importGlobal.js'
 
 export default {
   data() {
@@ -52,14 +53,9 @@ export default {
 
           let qrCanvas = this.$refs['qr-canvas']
           let width = qrCanvas.clientWidth
-
-          let QRCode = window._g_qrcode
-          if (!QRCode) {
-            const _module = await import(
-              /*webpackChunkName: "g_qrcode"*/ 'qrcode'
-            )
-            QRCode = window._g_qrcode = _module.default
-          }
+          let { default: QRCode } = await importG('qrcode', () =>
+            import(/*webpackChunkName: "qrcode"*/ 'qrcode')
+          )
           QRCode.toCanvas(this.$refs['qr-canvas'], this.qrCode, {
             width: width,
             height: width,

package/src/components/TableOperateColumn/OperateBtns.vue

@@ -5,7 +5,7 @@
       :key="item.label"
       type="text"
       size="mini"
-      :disabled="item.disabled"
+      :disabled="item.disabled | dbdBtn(row)"
       @click="$emit('command', item.command)"
       >{{ item.label }}</el-button
     >
@@ -16,7 +16,7 @@
           v-for="item in moreBtns"
           :key="item.label"
           :command="item.command"
-          :disabled="item.disabled"
+          :disabled="item.disabled | dbdBtn(row)"
           >{{ item.label }}</el-dropdown-item
         >
       </el-dropdown-menu>
@@ -26,6 +26,17 @@
 
 <script>
 export default {
+  filters: {
+    dbdBtn(dbd, row) {
+      if (dbd === undefined || dbd === null) {
+        return false
+      } else if (typeof dbd === 'boolean') {
+        return dbd
+      } else if (typeof dbd === 'function') {
+        return dbd(row)
+      }
+    }
+  },
   props: {
     btnList: {
       type: Array,

package/src/index.js

@@ -1,3 +1,4 @@
+import './utils/importGlobal.js' // 联合加载组件保存位置
 /** 提供组件给外部使用的入口 */
 import ContentLoading from './components/ContentLoading/index.vue'
 import ContentNull from './components/ContentNull/index.vue'

package/src/utils/importGlobal.js

@@ -0,0 +1,16 @@
+window._g_import_g_ || (window._g_import_g_ = {})
+
+function importG(name, ipt) {
+  return new Promise((resolve, reject) => {
+    if (window._g_import_g_[name]) {
+      resolve(window._g_import_g_[name])
+    } else {
+      ipt().then((_module) => {
+        window._g_import_g_[name] = _module
+        resolve(_module)
+      })
+    }
+  })
+}
+
+export default importG

package/src/utils/toExcel.js

@@ -1,13 +1,13 @@
+import importG from './importGlobal.js'
+
 export default async function toExcel({
   columns = [],
   rows = [],
   name = 'sheet01'
 }) {
-  let ExcelJS = window._g_exceljs
-  if (!ExcelJS) {
-    const _module = await import(/*webpackChunkName: "g_exceljs"*/ 'exceljs')
-    ExcelJS = window._g_exceljs = _module.default
-  }
+  let { default: ExcelJS } = await importG('exceljs', () =>
+    import(/*webpackChunkName: "exceljs"*/ 'exceljs')
+  )
 
   // 创建工作簿
   const workbook = new ExcelJS.Workbook()

package/src/utils/xls2json.js

@@ -1,10 +1,9 @@
+import importG from './importGlobal.js'
+
 export default async function toJson(file, name) {
-  let _xlsx = window._g_xlsx
-  if (!_xlsx) {
-    const _module = await import(/*webpackChunkName: "g_xlsx"*/ 'xlsx')
-    _xlsx = window._g_xlsx = _module
-  }
-  const { read, utils } = _xlsx
+  const { read, utils } = await importG('xlsx', () =>
+    import(/*webpackChunkName: "xlsx"*/ 'xlsx')
+  )
 
   let pro = new Promise((resolve, reject) => {
     if (file instanceof Blob) {

package/src/utils/xlsx2json.js

@@ -1,9 +1,9 @@
+import importG from './importGlobal.js'
+
 export default async function toJson(file, name) {
-  let ExcelJS = window._g_exceljs
-  if (!ExcelJS) {
-    const _module = await import(/*webpackChunkName: "g_exceljs"*/ 'exceljs')
-    ExcelJS = window._g_exceljs = _module.default
-  }
+  let { default: ExcelJS } = await importG('exceljs', () =>
+    import(/*webpackChunkName: "exceljs"*/ 'exceljs')
+  )
 
   const workbook = new ExcelJS.Workbook()
   return new Promise((resolve, reject) => {