n20-common-lib 1.3.36 → 1.3.39

package/src/components/Button/button-group.vue

@@ -44,9 +44,6 @@ export default {
         })
       }
 
-
-
-
       if (btnt.includes('pass')) {
         btns.push({
           emit: 'pass',
@@ -128,8 +125,6 @@ export default {
         btns.push({ emit: 'information', label: '附件信息', plain: true })
       }
 
-
-
       if (btnt.includes('orderCancel')) {
         btns.push({
           emit: 'orderCancel',
@@ -146,7 +141,6 @@ export default {
         btns.push({ emit: 'back', label: '返回', plain: true })
       }
 
-
       return btns
     }
   }

package/src/components/DatePicker/index.vue

@@ -7,6 +7,7 @@
     :value="value"
     :clearable="clearable"
     v-on="$listeners"
+    @change="changeFn"
   />
 </template>
 
@@ -22,6 +23,11 @@ export default {
       type: Boolean,
       default: true
     }
+  },
+  methods: {
+    changeFn(val) {
+      this.$emit('change', val)
+    }
   }
 }
 </script>

package/src/components/DatePicker/por.vue

@@ -159,8 +159,10 @@ export default {
         if (this.type === 'daterange' || this.type === 'monthrange') {
           this.$emit('update:start-date', val ? val[0] : null)
           this.$emit('update:end-date', val ? val[1] : null)
+          this.$emit('change', val)
         } else {
           this.$emit('input', val)
+          this.$emit('change', val)
         }
       }
     }

package/src/components/ECharts/index.vue

@@ -165,4 +165,3 @@ export default {
   }
 }
 </script>
-

package/src/components/EventBubble/demo/a.vue

@@ -26,4 +26,4 @@ export default {
     })
   }
 }
-</script>
+</script>

package/src/components/EventBubble/demo/b.vue

@@ -9,4 +9,4 @@ import cC from './c.vue'
 export default {
   components: { cC }
 }
-</script>
+</script>

package/src/components/EventBubble/demo/c.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-box flex-v">
-    <label>标题</label><el-input class="flex-item m-l" v-model="title" />
+    <label>标题</label><el-input v-model="title" class="flex-item m-l" />
     <EventBubble :data-custom="{ title: title }" data-event="demoEv" />
   </div>
 </template>
@@ -15,4 +15,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/FileImport/index.vue

@@ -1,9 +1,108 @@
 <template>
-  <div>待完善</div>
+  <el-dropdown trigger="click" placement="bottom-start" @command="commandFn">
+    <el-button size="mini" type="primary">导入</el-button>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item command="import">导入数据</el-dropdown-item>
+      <el-dropdown-item command="down">模板下载</el-dropdown-item>
+    </el-dropdown-menu>
+    <div style="display: none">
+      <cl-upload
+        v-if="!uploadHttpRequest"
+        v-bind="uploadProps"
+        :validate-result="validateResult"
+      >
+        <span ref="upload-trigger" slot="trigger">upload</span>
+      </cl-upload>
+      <uploadMsg
+        v-else
+        title="导入文件"
+        :visible.sync="errorV"
+        :validate-result="validateResult"
+        :hide-percent="true"
+      />
+    </div>
+  </el-dropdown>
 </template>
 
 <script>
+import axios from '../../utils/axios'
+import downloadBlob from '../../utils/downloadBlob'
+import uploadMsg from '../Upload/uploadMsg.vue'
 export default {
-  name: 'FileImport'
+  name: 'FileImport',
+  components: { uploadMsg },
+  props: {
+    templateUrl: {
+      type: String,
+      default: ''
+    },
+    fileName: {
+      type: String,
+      default: '下载.xlsx'
+    },
+    uploadHttpRequest: {
+      type: Function,
+      default: undefined
+    },
+    validateResult: {
+      type: Object,
+      default: undefined
+    },
+    validateDialog: {
+      type: Boolean,
+      default: false
+    },
+    uploadProps: {
+      type: Object,
+      default: undefined
+    },
+    uploadOn: {
+      type: Object,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      errorV: false
+    }
+  },
+  watch: {
+    validateDialog(val) {
+      this.errorV = val
+    }
+  },
+  methods: {
+    commandFn(val) {
+      val === 'import' && this.importFn()
+      val === 'down' && this.downFn()
+    },
+    importFn() {
+      this.$emit('update:validateResult', undefined)
+
+      if (!this.uploadHttpRequest) {
+        this.$refs['upload-trigger'].click()
+        return
+      }
+      let input = document.createElement('input')
+      input.type = 'file'
+      input.accept = '.xlsx,.xls,.csv'
+
+      input.addEventListener('change', (event) => {
+        this.uploadHttpRequest && this.uploadHttpRequest(event.target.files[0])
+      })
+
+      input.click()
+      this.$nextTick(() => {
+        input = undefined
+      })
+    },
+    downFn() {
+      axios
+        .get(this.templateUrl, null, { responseType: 'blob' })
+        .then((blob) => {
+          downloadBlob(blob, this.fileName)
+        })
+    }
+  }
 }
 </script>

package/src/components/Filters/form-item-input.vue

@@ -183,4 +183,3 @@ export default {
   }
 }
 </script>
-

package/src/components/Filters/indexO.vue

@@ -1,19 +1,22 @@
 <template>
   <el-popover
+    v-model="showPop"
     :width="width"
     placement="bottom-end"
     title="筛选"
-    v-model="showPop"
-    @after-leave="
-      showMore = false
-    "
     trigger="manual"
+    @after-leave="showMore = false"
   >
     <span slot="reference">
-      <el-button  @click="clickBtn" icon="n20-icon-iconfontshaixuan" plain onlyicon size="mini"
+      <el-button
+        icon="n20-icon-iconfontshaixuan"
+        plain
+        onlyicon
+        size="mini"
+        @click="clickBtn"
     /></span>
 
-    <div class="n20-filter p-a-s" v-click-outside="clickOut">
+    <div v-click-outside="clickOut" class="n20-filter p-a-s">
       <slot></slot>
       <el-button
         v-if="$slots.more"
@@ -67,7 +70,7 @@ export default {
   data() {
     return {
       showMore: false,
-      showPop:false
+      showPop: false
     }
   },
   mounted() {},
@@ -89,10 +92,10 @@ export default {
     clickOut() {
       let elPoppers = []
       document
-          .querySelectorAll('.el-popper,.el-dialog__wrapper')
-          .forEach((e) => {
-            e.style.display !== 'none' && elPoppers.push(e)
-          })
+        .querySelectorAll('.el-popper,.el-dialog__wrapper')
+        .forEach((e) => {
+          e.style.display !== 'none' && elPoppers.push(e)
+        })
 
       if (elPoppers.length <= 1) {
         this.showPop = false
@@ -101,4 +104,3 @@ export default {
   }
 }
 </script>
-

package/src/components/FlowStep/index.vue

@@ -1,63 +1,86 @@
 <template>
-   <div class="n20-steps-area">
+  <div class="n20-steps-area">
     <div class="n20-steps">
-     <div
-        :class="['n20-steps-item',
-      { 'finished': current > n,
-       'process': current === n && n !== totalSteps,
-       'last-process': current === totalSteps && n === totalSteps,
-       'middle-wait': current < n && n !== totalSteps,
-       'last-wait': current < n && n === totalSteps,
-      }
-     ]"
+      <div
         v-for="n in totalSteps"
         :key="n"
-        @click="onChange(n)">
-      <div class="n20-steps-icon">
-       <span :class="['n20-u-icon',{'n20-icon-danxuankuang-yixuanzhong': current === n && n !== totalSteps||  current === totalSteps && n === totalSteps},]" v-if="current<=n"></span>
-       <span class="n20-u-icon n20-icon-fankui-chenggongkongxin" v-else></span>
-      </div>
-      <div class="n20-steps-content">
-       <div class="n20-steps-title">{{ stepsLabel[n-1] || 'S ' + n }}</div>
-       <div class="n20-steps-description">{{ stepsDesc[n-1] || 'Desc ' + n }}</div>
+        :class="[
+          'n20-steps-item',
+          {
+            finished: current > n,
+            process: current === n && n !== totalSteps,
+            'last-process': current === totalSteps && n === totalSteps,
+            'middle-wait': current < n && n !== totalSteps,
+            'last-wait': current < n && n === totalSteps
+          }
+        ]"
+        @click="onChange(n)"
+      >
+        <div class="n20-steps-icon">
+          <span
+            v-if="current <= n"
+            :class="[
+              'n20-u-icon',
+              {
+                'n20-icon-danxuankuang-yixuanzhong':
+                  (current === n && n !== totalSteps) ||
+                  (current === totalSteps && n === totalSteps)
+              }
+            ]"
+          ></span>
+          <span
+            v-else
+            class="n20-u-icon n20-icon-fankui-chenggongkongxin"
+          ></span>
+        </div>
+        <div class="n20-steps-content">
+          <div class="n20-steps-title">{{ stepsLabel[n - 1] || 'S ' + n }}</div>
+          <div class="n20-steps-description">
+            {{ stepsDesc[n - 1] || 'Desc ' + n }}
+          </div>
+        </div>
       </div>
-     </div>
     </div>
-   </div>
+  </div>
 </template>
 <script>
 export default {
   name: 'FlowStep',
   props: {
-    stepsLabel: { // 步骤title数组
+    stepsLabel: {
+      // 步骤title数组
       type: Array,
       default: () => {
         return []
       }
     },
-    stepsDesc: { // 步骤description数组
+    stepsDesc: {
+      // 步骤description数组
       type: Array,
       default: () => {
         return []
       }
     },
-    totalSteps: { // 总的步骤数
+    totalSteps: {
+      // 总的步骤数
       type: Number,
       default: 3
     },
-    currentStep: { // 当前选中的步骤
+    currentStep: {
+      // 当前选中的步骤
       type: Number,
       default: 1
     }
   },
-  data () {
+  data() {
     return {
       // 若当前选中步骤超过总步骤数，则默认选择步骤1
       current: this.currentStep > this.totalSteps ? 1 : this.currentStep
     }
   },
   methods: {
-    onChange (index) { // 点击切换选择步骤
+    onChange(index) {
+      // 点击切换选择步骤
       console.log('index:', index)
       if (this.current !== index) {
         this.current = index
@@ -66,4 +89,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/InputNumber/index.vue

@@ -129,10 +129,13 @@ export default {
     },
     blurFn() {
       this.showStr = true
+      this.$emit('blur', this.value)
     },
     changeFn(val) {
       if (!val && val !== 0) {
-        return this.$emit('input', val)
+        this.$emit('input', val)
+        this.$emit('change', val)
+        return
       }
 
       switch (this.type) {
@@ -148,6 +151,7 @@ export default {
             this.$nextTick(() => {
               this.valueNum = nVar
               this.$emit('input', nVar)
+              this.$emit('change', nVar)
             })
           }
           break
@@ -162,6 +166,7 @@ export default {
             this.$nextTick(() => {
               this.valueNum = nVar
               this.$emit('input', nVar)
+              this.$emit('change', nVar)
             })
           }
           break

package/src/components/InputNumber/numberRange.vue

@@ -6,7 +6,8 @@
       :max="endValue || endValue === 0 ? endValue : $attrs.max"
       :type="type"
       style="width: calc(50% - 8px)"
-      @input="(val) => $emit('update:start-value', val)"
+      @input="startChange"
+      @blur="blurFn"
     />
     <span class="numbre-range text-c" style="display: inline-block; width: 16px"
       >-</span
@@ -17,7 +18,8 @@
       :min="startValue || startValue === 0 ? startValue : $attrs.min"
       :type="type"
       style="width: calc(50% - 8px)"
-      @input="(val) => $emit('update:end-value', val)"
+      @input="endChange"
+      @blur="blurFn"
     />
   </div>
 </template>
@@ -42,6 +44,19 @@ export default {
       type: String,
       default: 'money'
     }
+  },
+  methods: {
+    startChange(val) {
+      this.$emit('update:start-value', val)
+      this.$emit('change', [this.startValue, this.endValue])
+    },
+    endChange(val) {
+      this.$emit('update:end-value', val)
+      this.$emit('change', [this.startValue, this.endValue])
+    },
+    blurFn() {
+      this.$emit('blur', [this.startValue, this.endValue])
+    }
   }
 }
 </script>

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

@@ -64,13 +64,7 @@
           <div class="flex-column flex-l">
             <span
               v-title="userInfo.companyName"
-              class="
-                flex-item
-                text-ellipsis
-                m-l m-b-ss
-                font-size-small
-                color-primary
-              "
+              class="flex-item text-ellipsis m-l m-b-ss font-size-small color-primary"
               :show-overflow-tooltip="true"
               >{{ userInfo.companyName }}</span
             >

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

@@ -166,5 +166,4 @@ export default {
 }
 </script>
 
-<style>
-</style>
+<style></style>

package/src/components/Layout/index.vue

@@ -508,7 +508,7 @@ function getShowUuid(uuid, list) {
     return menu.hide ? menu.pid : menu.uuid
   }
 
-  let pid = uuid.replace(/\/[^\/]+\/*$/, '')
+  let pid = uuid.replace(/\/[^/]+\/*$/, '')
   if (pid !== '' && pid !== '/') {
     return getShowUuid(pid, list)
   }

package/src/components/LoginTemporary/index.vue

@@ -52,6 +52,7 @@
 <script>
 import getJsonc from '../../assets/getJsonc'
 import realUrl from '../../assets/realUrl'
+import axios from '../../utils/axios'
 
 import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
@@ -84,46 +85,56 @@ export default {
       operateType: 'login'
     }
   },
-  async created() {
+  created() {
     this.removeStorage()
-    await this.init()
-    this.setConfig()
+    this.init()
   },
   methods: {
-    async init() {
-      const { data } = await this.$axios.get(`/bems/1.0/sysSetting/list`)
-      if (data) {
-        this.getdata(data)
-        this.getLogoImag()
-      }
+    init() {
+      axios
+        .get(`/bems/1.0/sysSetting/list`, null, {
+          loading: false,
+          noMsg: true
+        })
+        .then(({ data }) => {
+          this.getdata(data)
+        })
+        .finally(() => {
+          this.setConfig()
+        })
+
+      this.getLogoImag()
     },
     async getLogoImag() {
-      const login = await this.$axios.get(
-        `/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE`,
-        {},
-        { config: { responseType: 'arraybuffer' } }
-      )
-      this.BgImage = window.URL.createObjectURL(new Blob([login]))
-      const company = await this.$axios.get(
-        `/bems/1.0/attach/COMPANY_LOGOE`,
-        {},
-        {
-          config: { responseType: 'arraybuffer' }
-        }
-      )
-      this.LogoImage = window.URL.createObjectURL(new Blob([company]))
+      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) {
-      for (const i of list) {
-        if (i.pmName == 'LOGIN_MODE') {
-          this.LOGIN_MODE = i.pmValue.split(',')
-          console.log(this.LOGIN_MODE)
-        } else if (i.pmName == 'MAIN_PAGE_TEXT') {
-          this.MAIN_PAGE_TEXT = i.pmValue
-        } else if (i.pmName == 'SYSTEM_NAME') {
-          this.SYSTEM_NAME = i.pmValue
+      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
         }
-      }
+      })
     },
     setConfig() {
       getJsonc('/server-config.jsonc').then(({ _layoutData = {} }) => {

package/src/components/LoginTemporary/retrievePw.vue

@@ -133,14 +133,14 @@ export default {
             )
           )
         } else if (
-          this.dataForm.passwordStrength == 2 &&
+          Number(this.dataForm.passwordStrength) === 2 &&
           !/^(((?=.*[0-9])(?=.*[a-zA-Z])|(?=.*[0-9])(?=.*[^\s0-9a-zA-Z])|(?=.*[a-zA-Z])(?=.*[^\s0-9a-zA-Z]))[^\s]+)$/.test(
             value
           )
         ) {
           callback(new Error(`密码至少包括数字,字母,特殊符号其中两种`))
         } else if (
-          this.dataForm.passwordStrength == 3 &&
+          Number(this.dataForm.passwordStrength) === 3 &&
           !/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{0,}$/.test(
             value
           )
@@ -269,7 +269,10 @@ export default {
             .get(
               `/bems/prod_1.0/uas/api/authorization/captcha/${this.updateForm[type]}/1`,
               null,
-              { loading: false, noMsg: true }
+              {
+                loading: false,
+                noMsg: true
+              }
             )
             .then(() => {
               this.$message.success(

package/src/components/MoreTab/index.vue

@@ -1,7 +1,4 @@
-/**
- * author: zhengwei
- * tiem: 2021-8-31
- */
+/** * author: zhengwei * tiem: 2021-8-31 */
 <template>
   <div class="__common-layout-pageTabs">
     <el-scrollbar>

package/src/components/PageHeader/index.vue

@@ -22,7 +22,10 @@ export default {
         return '返回'
       }
     },
-    content: String,
+    content: {
+      type: String,
+      default: ''
+    },
     disable: {
       type: Boolean,
       default: false
@@ -33,4 +36,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/SecondaryTab/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-tabs
     :value="init"

package/src/components/SelectLazy/index.vue

@@ -63,6 +63,7 @@ export default {
   methods: {
     change(val) {
       this.$emit('input', val)
+      this.$emit('change', val)
     },
     lazyGet() {
       this.$emit('scroll-bottom')
@@ -71,5 +72,4 @@ export default {
 }
 </script>
 
-<style>
-</style>
+<style></style>

package/src/components/Sifting/index.vue

@@ -95,5 +95,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>