n20-common-lib 2.6.29 → 2.6.32

package/package.json

@@ -1,25 +1,26 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.29",
+  "version": "2.6.32",
   "private": false,
-  "main": "src/index.js",
   "scripts": {
-    "dev": "vue-cli-service serve --doc",
-    "build:docs": "vue-cli-service build --doc",
     "serve": "vue-cli-service serve",
-    "serve:theme": "vue-cli-service serve --testTheme",
-    "test": "vue-cli-service serve --test",
     "build": "node versionInfo.js && npm run build:css && vue-cli-service build --testTheme",
+    "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
-    "info": "node versionInfo.js",
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
-    "build:gzip": "vue-cli-service build --gzip",
-    "build:report": "vue-cli-service build --analy",
     "build:css": "node build_css",
-    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
     "build:doc": "node versionInfo.js && vue-cli-service build --testTheme",
-    "getI18n": "node ./node_modules/nstc-get-i18n"
+    "build:docs": "vue-cli-service build --doc",
+    "build:gzip": "vue-cli-service build --gzip",
+    "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy",
+    "build:report": "vue-cli-service build --analy",
+    "dev": "vue-cli-service serve --doc",
+    "getI18n": "node ./node_modules/nstc-get-i18n",
+    "info": "node versionInfo.js",
+    "serve:theme": "vue-cli-service serve --testTheme",
+    "test": "vue-cli-service serve --test"
   },
+  "main": "src/index.js",
   "files": [
     "src/_qiankun",
     "src/assets",
@@ -54,7 +55,7 @@
     "lz-string": "^1.4.4",
     "normalize.css": "^8.0.1",
     "numerify": "*",
-    "nzh": "1.0.12",
+    "nzh": "^1.0.12",
     "panzoom": "*",
     "qrcode": "*",
     "resize-detector": "*",
@@ -63,26 +64,31 @@
     "vuedraggable": "*"
   },
   "devDependencies": {
-    "element-ui": "^2.15.14",
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-flow-comments": "^7.14.5",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-unit-jest": "^5.0.8",
     "@vue/cli-service": "~4.5.0",
     "@vue/compiler-dom": "^3.2.47",
+    "@vue/test-utils": "^1.1.3",
+    "@vue/vue2-jest": "^27.0.0-alpha.2",
     "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
     "babel-plugin-component": "^1.1.1",
     "clipboard": "^2.0.11",
     "compression-webpack-plugin": "^3.1.0",
     "copy-webpack-plugin": "^6.4.1",
     "core-js": "^3.6.5",
     "echarts": "^5.3.3",
+    "element-ui": "^2.15.14",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "exceljs": "^4.3.0",
     "file-saver": "^2.0.5",
     "fuse.js": "^6.6.2",
     "html-webpack-tags-plugin": "^2.0.17",
+    "jest": "^27.0.5",
     "jszip": "^3.10.0",
     "lodash": "^4.17.21",
     "md2vue-loader": "file:./md2vue-loader",
@@ -103,6 +109,7 @@
     "vue": "^2.6.11",
     "vue-cli-plugin-axios": "~0.0.4",
     "vue-grid-layout": "^2.3.12",
+    "vue-jest": "^3.0.7",
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",

package/src/components/AdvancedFilter/formItemRender.vue

@@ -348,6 +348,7 @@ export default {
             'update:end-value': (value) => {
               this.$set(form, item.endValue, value)
             },
+            clear: this.handleClear,
             blur: this.handleBlur,
             ...item.on
           },

package/src/components/FileImport/index.vue

@@ -12,6 +12,7 @@
         v-if="!uploadHttpRequest"
         v-bind="uploadProps"
         :width="width"
+        :showErrorExport="showErrorExport"
         :validate-result="validateResult"
         :validate-confirm="validateConfirm"
         :pagination="pagination"
@@ -24,6 +25,7 @@
         :title="'导入文件' | $lc"
         :visible.sync="errorV"
         :width="width"
+        :showErrorExport="showErrorExport"
         :validate-result="validateResult"
         :hide-percent="true"
         :footer-btn="footer"
@@ -77,6 +79,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showErrorExport: {
+      type: Boolean,
+      default: false
+    },
     validateDialog: {
       type: Boolean,
       default: false

package/src/components/InputNumber/numberRange.vue

@@ -7,6 +7,7 @@
       :type="type"
       style="width: calc(50% - 8px)"
       @input="startChange"
+      @clear="$emit('clear')"
       @blur="blurFn"
     />
     <span class="numbre-range text-c" style="display: inline-block; width: 16px">-</span>
@@ -17,6 +18,7 @@
       :type="type"
       style="width: calc(50% - 8px)"
       @input="endChange"
+      @clear="$emit('clear')"
       @blur="blurFn"
     />
   </div>

package/src/components/Upload/index.vue

@@ -42,6 +42,7 @@
       :percent="percent"
       :width="width"
       title="文件导入"
+      :showErrorExport="showErrorExport"
       :pagination="pagination"
       :footer-btn="footer"
       :validate-result="validateResult"
@@ -169,6 +170,10 @@ export default {
     footer: {
       type: Object,
       default: undefined
+    },
+    showErrorExport: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/Upload/uploadMsg.vue

@@ -49,7 +49,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" @click="importError">{{ '导出错误数据' | $lc }}</el-button>
+              <el-button type="text" v-if="showErrorExport" @click="importError">{{ '导出错误数据' | $lc }}</el-button>
             </div>
             <el-table ref="tables" :key="index" :data="errorListC" border style="width: 100%" height="300px">
               <el-table-column
@@ -161,6 +161,10 @@ export default {
     hidePercent: {
       type: Boolean,
       default: false
+    },
+    showErrorExport: {
+      type: Boolean,
+      default: false
     }
   },
   filters: {
@@ -182,7 +186,7 @@ export default {
     errorList: {
       handler() {
         this.errorListC = this.errorList
-        this.page.total = Math.ceil(this.tableData.length / this.page.pageSize)
+        this.page.total = this.tableData.length
       }
     },
     page: {
@@ -222,8 +226,7 @@ export default {
           this.tableData = cloneDeep(_errorList)
           const startIndex = (this.page.current - 1) * this.page.pageSize
           const endIndex = startIndex + this.page.pageSize
-          let dto = this.tableData.slice(startIndex, endIndex)
-          return dto
+          return this.pagination ? this.tableData.slice(startIndex, endIndex) : this.tableData
         } else {
           return undefined
         }
@@ -250,7 +253,6 @@ export default {
       const startIndex = (this.page.current - 1) * this.page.pageSize
       const endIndex = startIndex + this.page.pageSize
       this.errorListC = this.tableData.slice(startIndex, endIndex)
-
       this.index += 1
       this.$nextTick(() => {
         this.$refs.tables.doLayout()

package/src/utils/amountInWords.js

@@ -4,7 +4,7 @@ export const convert = (
   money,
   options = {
     ch: '零壹贰叁肆伍陆柒捌玖', // 数字字符
-    ch_u: '个十百千万亿兆京', // 数位单位字符，万以下十进制，万以上万进制，个位不能省略
+    ch_u: '个拾佰仟万亿兆京', // 数位单位字符，万以下十进制，万以上万进制，个位不能省略
     ch_f: '负', // 负字符
     ch_d: '点', // 小数点字符
     m_u: '元角分厘', // 金额单位