n20-common-lib 1.2.41 → 1.2.44

package/package.json

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

package/src/components/Layout/AsideNav/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-menu
+    id="layout-sider"
     class="layout-aside flex-column"
     :collapse="collapse"
     :default-active="activeNav"

package/src/components/LoginTemporary/form.vue

@@ -293,7 +293,7 @@ export default {
                 mobile: type === 'phone' ? this.form[type] : '',
                 username: type !== 'phone' ? this.form[type] : ''
               },
-              { loading: false, noMsg: true }
+              { loading: false }
             )
             .then(() => {
               this.$message.success(
@@ -303,9 +303,6 @@ export default {
             .catch(() => {
               clearTimeout(this.setTimeNum)
               this.codeNum = '验证码'
-              this.$message.warning(
-                `${typeName}: ${this.form[type]} 验证码发送失败`
-              )
             })
         }
       })
@@ -382,12 +379,9 @@ export default {
         this.loadingV = false
         this.theType = 'accountPthon'
 
-        this.sendMsg('username', '账户')
         this.outTime(60)
         return
-      }
-      // 签名验签
-      else if (cL.data === false) {
+      } else if (cL.data === false /* 签名验签 */) {
         // 获取线上签名uDn
         let uDn = await axios.get(
           `/bems/prod_1.0/dssc/sign/getUserDn/${username}/password`,
@@ -519,7 +513,9 @@ export default {
       let username = this.userNo
       let { data } = await axios.get(
         // '/bems/prod_1.0/user/api/userController/userCltAdDep/' + username
-        '/bems/prod_1.0/user/api/userController/userCltAdRole/' + username
+        '/bems/prod_1.0/user/api/userController/userCltAdRole/' + username,
+        null,
+        { loading: false }
       )
       let userInfo = data || { uname: username }
 

package/src/components/LoginTemporary/index.vue

@@ -107,8 +107,8 @@ export default {
 <style scoped>
 .login-logo-box {
   position: absolute;
-  top: 26px;
-  left: 26px;
+  top: 88px;
+  left: 116px;
   color: #ffffff;
 }
 .login-logo-hr {
@@ -121,7 +121,7 @@ export default {
 }
 .login-form {
   position: absolute;
-  top: 20%;
+  top: 25%;
   right: 10%;
   width: 324px;
   min-height: 360px;

package/src/components/LoginTemporary/qrcode.vue

@@ -1,90 +1,90 @@
-<template>
-  <div v-loading="loadingV">
-    <canvas
-      ref="qr-canvas"
-      style="display: block; width: 212px; height: 212px; margin: 0 auto"
-    ></canvas>
-    <div
-      class="text-r"
-      style="font-size: 12px; color: #3d4a57; margin-bottom: -8px"
-    >
-      请使用网银移动端扫码免Ukey登录<el-button
-        class="m-l-s"
-        type="text"
-        @click="refreshQrCode"
-      >
-        <i class="el-icon-refresh"></i>
-        刷新</el-button
-      >
-    </div>
-  </div>
-</template>
-<script>
-import QRCode from 'qrcode'
-import axios from '../../utils/axios'
-
-export default {
-  data() {
-    this.timeA = undefined
-    return {
-      loadingV: false,
-      qrCode: ''
-    }
-  },
-  created() {
-    this.getQrcode()
-  },
-  beforeDestroy() {
-    clearTimeout(this.timeA)
-  },
-  methods: {
-    getQrcode() {
-      this.loadingV = true
-      let loading = () => {
-        setTimeout(() => {
-          this.loadingV = false
-        }, 500)
-      }
-
-      axios
-        .get('/bems/prod_1.0/uas/api/qrCode', null, { loading })
-        .then(({ data }) => {
-          this.qrCode = data.qrCode
-
-          let qrCanvas = this.$refs['qr-canvas']
-          let width = qrCanvas.clientWidth
-
-          QRCode.toCanvas(this.$refs['qr-canvas'], this.qrCode, {
-            width: width,
-            height: width,
-            margin: 1
-          })
-
-          this.getQrCodePwd()
-        })
-    },
-    refreshQrCode() {
-      this.getQrcode()
-    },
-    getQrCodePwd() {
-      axios
-        .get(`/bems/prod_1.0/uas/api/qrCode/${this.qrCode}`, null, {
-          loading: false
-        })
-        .then(({ data }) => {
-          clearTimeout(this.timeA)
-          if (data.status === 3) {
-            this.QrcodeLogin(data)
-          } else {
-            this.timeA = setTimeout(() => {
-              this.getQrCodePwd()
-            }, 2000)
-          }
-        })
-    },
-    QrcodeLogin({ userNo, qrcode }) {
-      this.$emit('qrcode-login', { userNo, qrcode })
-    }
-  }
-}
-</script>
+<template>
+  <div v-loading="loadingV">
+    <canvas
+      ref="qr-canvas"
+      style="display: block; width: 212px; height: 212px; margin: 0 auto"
+    ></canvas>
+    <div
+      class="text-r"
+      style="font-size: 12px; color: #3d4a57; margin-bottom: -8px"
+    >
+      请使用网银移动端扫码免Ukey登录<el-button
+        class="m-l-s"
+        type="text"
+        @click="refreshQrCode"
+      >
+        <i class="el-icon-refresh"></i>
+        刷新</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import QRCode from 'qrcode'
+import axios from '../../utils/axios'
+
+export default {
+  data() {
+    this.timeA = undefined
+    return {
+      loadingV: false,
+      qrCode: ''
+    }
+  },
+  created() {
+    this.getQrcode()
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeA)
+  },
+  methods: {
+    getQrcode() {
+      this.loadingV = true
+      let loading = () => {
+        setTimeout(() => {
+          this.loadingV = false
+        }, 500)
+      }
+
+      axios
+        .get('/bems/prod_1.0/uas/api/qrCode', null, { loading })
+        .then(({ data }) => {
+          this.qrCode = data.qrCode
+
+          let qrCanvas = this.$refs['qr-canvas']
+          let width = qrCanvas.clientWidth
+
+          QRCode.toCanvas(this.$refs['qr-canvas'], this.qrCode, {
+            width: width,
+            height: width,
+            margin: 1
+          })
+
+          this.getQrCodePwd()
+        })
+    },
+    refreshQrCode() {
+      this.getQrcode()
+    },
+    getQrCodePwd() {
+      axios
+        .get(`/bems/prod_1.0/uas/api/qrCode/${this.qrCode}`, null, {
+          loading: false
+        })
+        .then(({ data }) => {
+          clearTimeout(this.timeA)
+          if (data.status === 3) {
+            this.QrcodeLogin(data)
+          } else {
+            this.timeA = setTimeout(() => {
+              this.getQrCodePwd()
+            }, 2000)
+          }
+        })
+    },
+    QrcodeLogin({ userNo, qrcode }) {
+      this.$emit('qrcode-login', { userNo, qrcode })
+    }
+  }
+}
+</script>

package/src/components/LoginTemporary/utils.js

@@ -1,73 +1,73 @@
-import forEachs from '../../utils/forEachs'
-import list2tree from '../../utils/list2tree'
-
-export function siteTree2menus(siteTree) {
-  let list_1 = []
-
-  forEachs(siteTree, (item) => {
-    if (item.resType === '1' || item.resType === '2') {
-      list_1.push(item)
-    }
-  })
-
-  let list_2 = []
-  list_1.forEach((item) => {
-    let menuObj = {
-      menuid: item.menuid,
-      pmid: item.pmid,
-      sortnum: item.sortnum ? Number(item.sortnum) : item.menuid,
-      appNo: item.appNo || undefined,
-      title: item.label
-    }
-    if (/^http(s)?:|\/\//.test(item.pageurl)) {
-      menuObj.href = item.pageurl
-    } else {
-      menuObj.route = item.pageurl
-    }
-
-    if (/\//.test(item.logo)) {
-      menuObj.iconUrl = item.logo
-    } else {
-      menuObj.iconClass = item.logo
-    }
-
-    if (item.resType === '2') {
-      menuObj.hide = true
-    }
-
-    list_2.push(menuObj)
-  })
-
-  return list2tree(list_2, 'menuid', 'pmid', 'children', 'sortnum')
-}
-
-export function siteTree2RelaNos(siteTree) {
-  let relaNos = []
-  siteTree.forEach((m) => {
-    let oRelaObj = relaNos.find((item) => item.appNo === m.appNo)
-    if (oRelaObj) {
-      m.treeno && oRelaObj.relaNos.push(m.treeno)
-      if (Array.isArray(m.children)) {
-        forEachs(m.children, (item) => {
-          item.treeno && oRelaObj.relaNos.push(item.treeno)
-        })
-      }
-    } else {
-      oRelaObj = {
-        appNo: m.appNo,
-        label: m.label,
-        pageurl: m.pageurl,
-        relaNos: []
-      }
-
-      m.treeno && oRelaObj.relaNos.push(m.treeno)
-      if (Array.isArray(m.children)) {
-        forEachs(m.children, (item) => {
-          item.treeno && oRelaObj.relaNos.push(item.treeno)
-        })
-      }
-      relaNos.push(oRelaObj)
-    }
-  })
-  return relaNos
-}
+import forEachs from '../../utils/forEachs'
+import list2tree from '../../utils/list2tree'
+
+export function siteTree2menus(siteTree) {
+  let list_1 = []
+
+  forEachs(siteTree, (item) => {
+    if (item.resType === '1' || item.resType === '2') {
+      list_1.push(item)
+    }
+  })
+
+  let list_2 = []
+  list_1.forEach((item) => {
+    let menuObj = {
+      menuid: item.menuid,
+      pmid: item.pmid,
+      sortnum: item.sortnum ? Number(item.sortnum) : item.menuid,
+      appNo: item.appNo || undefined,
+      title: item.label
+    }
+    if (/^http(s)?:|\/\//.test(item.pageurl)) {
+      menuObj.href = item.pageurl
+    } else {
+      menuObj.route = item.pageurl
+    }
+
+    if (/\//.test(item.logo)) {
+      menuObj.iconUrl = item.logo
+    } else {
+      menuObj.iconClass = item.logo
+    }
+
+    if (item.resType === '2') {
+      menuObj.hide = true
+    }
+
+    list_2.push(menuObj)
+  })
+
+  return list2tree(list_2, 'menuid', 'pmid', 'children', 'sortnum')
+}
+
+export function siteTree2RelaNos(siteTree) {
+  let relaNos = []
+  siteTree.forEach((m) => {
+    let oRelaObj = relaNos.find((item) => item.appNo === m.appNo)
+    if (oRelaObj) {
+      m.treeno && oRelaObj.relaNos.push(m.treeno)
+      if (Array.isArray(m.children)) {
+        forEachs(m.children, (item) => {
+          item.treeno && oRelaObj.relaNos.push(item.treeno)
+        })
+      }
+    } else {
+      oRelaObj = {
+        appNo: m.appNo,
+        label: m.label,
+        pageurl: m.pageurl,
+        relaNos: []
+      }
+
+      m.treeno && oRelaObj.relaNos.push(m.treeno)
+      if (Array.isArray(m.children)) {
+        forEachs(m.children, (item) => {
+          item.treeno && oRelaObj.relaNos.push(item.treeno)
+        })
+      }
+      relaNos.push(oRelaObj)
+    }
+  })
+  return relaNos
+}

package/src/utils/repairElementUI.js

@@ -7,6 +7,12 @@ function setPropsDefault(component, props) {
     c_props[key] = Object.assign({}, c_props[key], props[key])
   })
 }
+function setMethodsDefault(component, methods) {
+  let c_methods = component.methods
+  Object.keys(methods).forEach((key) => {
+    c_methods[key] = methods[key]
+  })
+}
 
 function repairPopper() {
   if (!Popper.prototype.repairR) {
@@ -63,4 +69,27 @@ export default function (ElementUI) {
       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 sortable = column.sortable ? 24 : 0
+          let filters = column.filters ? 16 : 0
+          column.minWidth = Math.max(80, label.length * 14 + 22 + sortable + filters)
+        } else {
+          column.minWidth = 80
+        }
+      }
+      column.realWidth = column.width === undefined ? column.minWidth : column.width
+      return column
+    }
+  })
 }

package/src/components/NstcG6Components/NstcDialog/NstcDialog.vue

@@ -1,185 +0,0 @@
-<template>
-  <el-dialog
-      class="Nstc-dialog"
-      v-drag
-      :visible.sync="dialogVisible"
-      v-bind="$attrs"
-      :center="center"
-      :show-close="showClose"
-      :custom-class="customClass"
-      :append-to-body="toBody"
-      :close-on-click-modal="closeOnClickModal"
-      :close-on-press-escape="closeOnPressEscape"
-      :before-close="()=>{handleClose()}"
-      v-on="$listeners"
-  >
-    <template slot="title">
-      <span class="el-dialog__title">{{ title }}</span>
-      <button class="el-dialog__headerbtn" @click="handleClose">
-        <i class="el-dialog__close el-icon-close"></i>
-      </button>
-    </template>
-    <slot></slot>
-
-    <slot name="after"></slot>
-    <div
-        v-if="showFooter"
-        slot="footer"
-        class="dialog-footer"
-    >
-      <el-button
-          v-if="footerHandlers.confirm"
-          type="primary"
-          :disabled="footerHandlers.confirm.disabled || confirmDisabledFlag"
-          :class="footerHandlers.confirm.className"
-          @click="handleConfirm"
-      >
-        {{ footerHandlers.confirm.text || '确认' }}
-      </el-button>
-      <el-button
-          v-if="footerHandlers.cancel"
-          plain
-          :class="footerHandlers.cancel.className"
-          @click="handleClose"
-      >
-        {{ footerHandlers.cancel.text || '取消' }}
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  name: 'NstcDialog',
-  props: {
-    value: {
-      type: Boolean,
-      default: false
-    },
-
-    title: {
-      type: String,
-      default: ''
-    },
-
-    center: {
-      type: Boolean,
-      default: false
-    },
-
-    footerHandlers: {
-      type: Object,
-      default:  () => {
-        return {
-          confirm: {
-            text: '', //this.$t('common_w_0002')
-            className: '',
-            disabled: false
-          },
-          cancel: {
-            text: '', // this.t('common_w_0003')
-            className: '',
-            disabled: false
-          }
-        }
-      },
-
-    },
-    toBody: {
-      type: Boolean,
-      default: true
-    },
-    customClass: {
-      type: String,
-      default: ''
-    },
-
-    showFooter: {
-      type: Boolean,
-      default: true
-    },
-
-    showClose: {
-      type: Boolean,
-      default: false
-    },
-
-    /** 是否在点击确认按钮后关闭弹窗 */
-    closeAfterConfirm: {
-      type: Boolean,
-      default: true
-    },
-
-    /** 是否在点击确认按钮后立即关闭弹窗 */
-    immediateCloseAfterHandler: {
-      type: Boolean,
-      default: false
-    },
-
-    closeOnClickModal: {
-      type: Boolean,
-      default: false
-    },
-
-    closeOnPressEscape: {
-      type: Boolean,
-      default: false
-    },
-
-    confirmDisabledFlag: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    dialogVisible: {
-      get() {
-        return this.value
-      },
-      set(val) {
-        this.$emit('input', val)
-      }
-    }
-  },
-  methods: {
-    handleConfirm() {
-      this.handleListeners('confirm')
-    },
-
-    handleClose() {
-      this.handleListeners('cancel')
-    },
-
-    async handleListeners(type) {
-      this.loading = true
-      try {
-        const listener = this.$listeners[type]
-        const closeAfterListener = this.closeAfterConfirm || type === 'cancel'
-
-        if (this.immediateCloseAfterHandler) {
-          if (closeAfterListener) {
-            this.dialogVisible = false
-          }
-
-          listener && await listener()
-        } else {
-          listener && await listener()
-
-          if (closeAfterListener) {
-            this.dialogVisible = false
-          }
-        }
-      } catch (err) {
-        console.error(err)
-
-        err && err.type === 'VALIDATE_ERROR' && this.$message({
-          type: 'warning',
-          message: err.msg
-        })
-      } finally {
-        this.loading = false
-      }
-    }
-  }
-}
-</script>