n20-common-lib 1.3.62 → 1.3.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.62",
+  "version": "1.3.65",
   "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/components/FileUploadTable/index.vue

@@ -12,7 +12,9 @@
       </div>
 
       <el-table :data="tableData" :row-key="keys.rowKey" @selection-change="(selection) => (selectionList = selection)">
-        <slot name="selection-column"><el-table-column type="selection" width="50" align="center" /> </slot>
+        <slot name="selection-column">
+          <el-table-column type="selection" width="50" align="center" />
+        </slot>
         <template v-if="dataPorp.slotHeader">
           <el-table-column
             v-for="item in dataPorp.slotHeader"
@@ -137,7 +139,7 @@
               <clUpload
                 :ref="'upload' + $index"
                 class="n20-upload-table-up"
-                :file-name="row['_name'] || row[keys.name]"
+                :file-name="row | fileName(keys.url)"
                 :data="row['_fileData'] || fileData"
                 :msg-type="null"
                 :show-clear="false"
@@ -261,6 +263,7 @@
         :data="fileData"
         :headers="headers"
         :accept="fileAccept"
+        :size="fileSize"
         :http-request="uploadHttpRequest"
         :on-remove="(file) => $emit('on-remove', file)"
         :on-success="batchSuccess"
@@ -299,6 +302,16 @@ export default {
     },
     sizeFilter(type, typeOptions, fileSize) {
       return typeOptions.find((c) => c.type === type)?.size || fileSize
+    },
+    fileName(row, urlK) {
+      if (row['_name']) {
+        return row['_name']
+      } else if (row[urlK]) {
+        let urlArr = row[urlK].split('/')
+        let _n = urlArr[urlArr.length - 1]
+        return _n ? decodeURI(_n) : undefined
+      }
+      return undefined
     }
   },
   props: {
@@ -412,7 +425,7 @@ export default {
       if (_url) {
         let blob = await axios.get(_url, {}, { responseType: 'blob' })
         let url = URL.createObjectURL(blob)
-        let name = blob.name
+        let name = row['_name'] || blob.name
         let sameOrg = this.seeTypes.test(name) || this.seeTypes.test(_url)
         return {
           url,

package/src/components/InputNumber/index.vue

@@ -113,7 +113,7 @@ export default {
       }
       switch (this.type) {
         case 'rate':
-          return numerify(val, this.format || '0.00[00]')
+          return numerify(val, this.format || '0.0000')
         case 'money':
         default:
           return numerify(val, this.format || '0,0.00')

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

@@ -233,14 +233,24 @@ export default {
     }
   },
   created() {
-    getJsonc('/server-config.jsonc').then(({ _layoutData = {} }) => {
-      this.show = true
+    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting }) => {
+      let _loginSetting = loginSetting || _layoutData.loginSetting
 
       this.headerLogoUrl = realUrl(_layoutData.headerLogoUrl)
       this.headerUserUrl = realUrl(_layoutData.headerUserUrl)
       this.headerLogoWidth = _layoutData.headerLogoWidth
       this.headerLogoHeight = _layoutData.headerLogoHeight
       this.headerTitle = _layoutData.headerTitle
+
+      if (_loginSetting !== 'JSON') {
+        axios.get(`/bems/1.0/sysSetting/list`, null, { loading: false, noMsg: true }).then(({ data }) => {
+          this.headerTitle = data.find((d) => d.pmName === 'SYSTEM_NAME')?.pmValue || this.headerTitle
+
+          this.show = true
+        })
+      } else {
+        this.show = true
+      }
     })
   },
   methods: {

package/src/components/LoginTemporary/index.vue

@@ -2,31 +2,23 @@
   <div v-if="alV" v-loading="alV" class="login-wrap">
     <loginForm
       ref="login-form"
-      :login-types="LOGIN_MODE || loginTypes"
+      :login-types="loginTypes"
       :login-then="loginThen"
       class="login-form"
       style="display: none"
     />
   </div>
-  <div
-    v-else
-    class="login-wrap"
-    :style="{
-      backgroundImage: BgImage ? `url(${BgImage})` : `url(${loginBg})`
-    }"
-  >
+  <div v-else class="login-wrap" :style="{ backgroundImage: loginBg }">
     <div class="login-logo-box flex-box flex-v">
-      <img v-if="loginLogo" :src="LogoImage || loginLogo" :style="{ width: loginLogoWidth, height: loginLogoHeight }" />
+      <img v-if="loginLogo" :src="loginLogo" :style="{ width: loginLogoWidth, height: loginLogoHeight }" />
       <span v-if="loginLogo && loginLogoText" class="login-logo-hr m-l-s m-r-s"></span>
-      <h3 class="login-logo-text">
-        {{ SYSTEM_NAME || loginLogoText }}
-      </h3>
+      <h3 class="login-logo-text">{{ loginLogoText }}</h3>
     </div>
     <!-- eslint-disable-next-line vue/no-v-html -->
     <div doc="登录页标语" v-html="sloganHtml"></div>
     <loginForm
       v-if="operateType === 'login'"
-      :login-types="LOGIN_MODE || loginTypes"
+      :login-types="loginTypes"
       :login-then="loginThen"
       class="login-form"
       @changType="getChangetype"
@@ -45,6 +37,13 @@
       </div>
     </loginForm>
     <retrievePw v-if="operateType === 'retrievePw'" class="login-form" @changType="getChangetype" />
+    <div
+      v-if="loginCopyright"
+      class="login-copyright w-100p text-c color-placeholder"
+      style="position: absolute; bottom: 6px; left: 0"
+    >
+      {{ loginCopyright }}
+    </div>
   </div>
 </template>
 
@@ -77,98 +76,98 @@ export default {
   },
   data() {
     return {
-      loginTypes: ['account'],
-      LOGIN_MODE: ['account'],
-      MAIN_PAGE_TEXT: '',
-      SYSTEM_NAME: '',
-      BgImage: '',
-      LogoImage: '',
-      loginBg: undefined,
-      loginLogo: undefined,
-      loginLogoWidth: '60px',
-      loginLogoHeight: 'auto',
-      loginLogoText: '',
-      sloganHtml: '',
+      jsonData: {
+        loginTypes: ['account'],
+        loginBg: undefined,
+        loginLogo: undefined,
+        loginLogoWidth: '60px',
+        loginLogoHeight: 'auto',
+        loginLogoText: undefined,
+        loginCopyright: undefined,
+        sloganHtml: undefined
+      },
+      pageData: {
+        LOGIN_MODE: undefined, // 登录方式
+        SYSTEM_NAME: undefined, // 系统名称
+        MAIN_PAGE_TEXT: undefined, // 版权所有信息
+        BgImage: undefined,
+        LogoImage: undefined
+      },
       operateType: 'login',
       alV: false
     }
   },
-  created() {
-    if (this.autoLogin) {
-      this.autoLoginSC()
-      return
-    }
-    if (window.sessionStorage.getItem('_auto_login_ing_')) {
-      this.autoLoginSS()
-      return
+  computed: {
+    loginTypes() {
+      return this.pageData.LOGIN_MODE?.pmValue?.split(',') || this.jsonData.loginTypes || ['account']
+    },
+    loginBg() {
+      if (this.pageData.BgImage) {
+        return `url(${this.pageData.BgImage})`
+      } else if (this.jsonData.loginBg) {
+        return `url(${realUrl(this.jsonData.loginBg)})`
+      } else {
+        return 'none'
+      }
+    },
+    loginLogo() {
+      return this.pageData.LogoImage || (this.jsonData.loginLogo && realUrl(this.jsonData.loginLogo)) || undefined
+    },
+    loginLogoWidth() {
+      return this.jsonData.loginLogoWidth || '60px'
+    },
+    loginLogoHeight() {
+      return this.jsonData.loginLogoHeight || 'auto'
+    },
+    loginLogoText() {
+      return this.pageData.SYSTEM_NAME?.pmValue || this.jsonData.loginLogoText || ''
+    },
+    loginCopyright() {
+      return this.jsonData.loginCopyright || ''
+    },
+    sloganHtml() {
+      return this.jsonData.sloganHtml || ''
     }
-
+  },
+  created() {
+    if (this.autoLogin) return this.autoLoginSC()
+    if (window.sessionStorage.getItem('_auto_login_ing_')) return this.autoLoginSS()
     this.removeStorage()
+
     this.init()
   },
   methods: {
     async init() {
-      const { _layoutData } = await getJsonc('/server-config.jsonc')
-      if (_layoutData && _layoutData.loginSetting === 'JSON') {
-        return this.setConfig()
-      }
-
-      axios
-        .get(`/bems/1.0/sysSetting/list`, null, {
-          loading: false,
-          noMsg: true
+      const { _layoutData = {}, loginSetting } = await getJsonc('/server-config.jsonc')
+      let _loginSetting = loginSetting || _layoutData.loginSetting
+      if (_loginSetting !== 'JSON') {
+        let P_1 = axios.get(`/bems/1.0/sysSetting/list`, null, { loading: false, noMsg: true }).then(({ data }) => {
+          this.pageData.LOGIN_MODE = data.find((d) => d.pmName === 'LOGIN_MODE')
+          this.pageData.SYSTEM_NAME = data.find((d) => d.pmName === 'SYSTEM_NAME')
+          this.pageData.MAIN_PAGE_TEXT = data.find((d) => d.pmName === 'MAIN_PAGE_TEXT')
         })
-        .then(({ data }) => {
-          this.getdata(data)
+        let P_2 = this.getImg('/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE').then((url) => {
+          this.pageData.BgImage = url
         })
-        .finally(() => {
-          this.setConfig()
+        let P_3 = this.getImg('/bems/1.0/attach/COMPANY_LOGOE').then((url) => {
+          this.pageData.LogoImage = url
         })
 
-      this.getLogoImag()
-    },
-    async getLogoImag() {
-      axios
-        .get(`/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE`, null, {
-          responseType: 'blob',
-          loading: false,
-          noMsg: true
-        })
-        .then((blob) => {
-          this.BgImage = window.URL.createObjectURL(blob)
-        })
-      axios
-        .get(`/bems/1.0/attach/COMPANY_LOGOE`, null, {
-          responseType: 'blob',
-          loading: false,
-          noMsg: true
-        })
-        .then((blob) => {
-          this.LogoImage = window.URL.createObjectURL(blob)
-        })
-    },
-    getdata(list) {
-      list.forEach((item) => {
-        if (item.pmName === 'LOGIN_MODE') {
-          this.LOGIN_MODE = item.pmValue.split(',')
-        } else if (item.pmName === 'MAIN_PAGE_TEXT') {
-          this.MAIN_PAGE_TEXT = item.pmValue
-        } else if (item.pmName === 'SYSTEM_NAME') {
-          this.SYSTEM_NAME = item.pmValue
-        }
-      })
+        await Promise.all([P_1, P_2, P_3])
+        this.jsonData = _layoutData
+      } else {
+        this.jsonData = _layoutData
+      }
     },
-    setConfig() {
-      getJsonc('/server-config.jsonc').then(({ _layoutData = {} }) => {
-        _layoutData.loginTypes && (this.loginTypes = _layoutData.loginTypes)
-        this.loginBg = realUrl(_layoutData.loginBg)
-        this.loginLogo = realUrl(_layoutData.loginLogo)
-        this.loginLogoWidth = _layoutData.loginLogoWidth
-        this.loginLogoHeight = _layoutData.loginLogoHeight
-        this.loginLogoText = _layoutData.loginLogoText
-        this.sloganHtml = _layoutData.loginSloganHtml
-      })
+    async getImg(url) {
+      try {
+        let blob = await axios.get(url, null, { responseType: 'blob', loading: false, noMsg: true })
+        return window.URL.createObjectURL(blob)
+      } catch (error) {
+        return undefined
+      }
     },
+
     removeStorage() {
       for (let k in window.sessionStorage) {
         !['subEntry'].includes(k) && window.sessionStorage.removeItem(k)
@@ -177,6 +176,7 @@ export default {
     getChangetype(val) {
       this.operateType = val
     },
+
     autoLoginSC() {
       this.alV = true
       let alData = this.autoLoginDate

package/src/utils/axios.js

@@ -141,8 +141,8 @@ function request(opt) {
       .then((res) => {
         if (opt.responseType === 'blob') {
           let filename = getFilename(res.headers['content-disposition'])
-          filename && res.data && (res.data.name = filename)
-          resolve(res.data)
+          filename && res.data && (res.data.name = filename.replace(/"/g, ''))
+          res.data.size === 0 ? reject(opt.url + '请求返回文件大小0KB') : resolve(res.data)
         } else {
           if (typeof res.data === 'object' && res.data.data === undefined) {
             res.data.data = {}