n20-common-lib 2.9.13 → 2.9.14

package/nstc-g6/components/NstcCharts/NstcCharts.vue

@@ -4,10 +4,10 @@
 
 <script>
 import * as echarts from 'echarts'
+import XEUtils from 'xe-utils'
 import resize from './mixins/resize'
-import merge from 'lodash/merge'
 
-import { color, axisConfig, pieConfig } from './define'
+import { axisConfig, color, pieConfig } from './define'
 
 export default {
   name: 'NstcCharts',
@@ -71,7 +71,9 @@ export default {
         containLabel: true
       }
 
-      grid = Array.isArray(grid) ? grid.map((item) => merge({}, selfGrid, item)) : merge({}, selfGrid, grid)
+      grid = Array.isArray(grid)
+        ? grid.map((item) => XEUtils.merge({}, selfGrid, item))
+        : XEUtils.merge({}, selfGrid, grid)
 
       return {
         grid
@@ -79,13 +81,19 @@ export default {
     },
 
     xAxis({ xAxis }) {
-      xAxis = xAxis && xAxis.length ? xAxis.map((item) => merge({}, axisConfig, item)) : [merge({}, axisConfig, xAxis)]
+      xAxis =
+        xAxis && xAxis.length
+          ? xAxis.map((item) => XEUtils.merge({}, axisConfig, item))
+          : [XEUtils.merge({}, axisConfig, xAxis)]
 
       return { xAxis }
     },
 
     yAxis({ yAxis }) {
-      yAxis = yAxis && yAxis.length ? yAxis.map((item) => merge({}, axisConfig, item)) : [merge({}, axisConfig, yAxis)]
+      yAxis =
+        yAxis && yAxis.length
+          ? yAxis.map((item) => XEUtils.merge({}, axisConfig, item))
+          : [XEUtils.merge({}, axisConfig, yAxis)]
 
       return { yAxis }
     },
@@ -109,7 +117,7 @@ export default {
           config = pieConfig
         }
 
-        return merge(config, sery)
+        return XEUtils.merge(config, sery)
       })
 
       return { series }
@@ -131,14 +139,14 @@ export default {
           return { ...prev, ...this[key](baseOption) }
         }, defaultConfigs)
 
-        return { options, baseOption: merge({}, _baseOption, baseOption), ...other }
+        return { options, baseOption: XEUtils.merge({}, _baseOption, baseOption), ...other }
       }
 
       const option = keys.reduce((prev, key) => {
         return { ...prev, ...this[key](params) }
       }, defaultConfigs)
 
-      return merge({}, option, params)
+      return XEUtils.merge({}, option, params)
     },
 
     clear() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.13",
+  "version": "2.9.14",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -18,7 +18,8 @@
     "getI18n": "node ./node_modules/nstc-get-i18n --path ./server-config.jsonc --name lang",
     "info": "node versionInfo.js",
     "serve:theme": "vue-cli-service serve --testTheme",
-    "test": "vue-cli-service serve --test"
+    "test": "vue-cli-service serve --test",
+    "publish": "npm publish --tag legacy"
   },
   "main": "src/index.js",
   "files": [
@@ -51,7 +52,9 @@
   "dependencies": {
     "axios": "*",
     "dayjs": "*",
+    "decimal.js": "^10.5.0",
     "js-cookie": "^3.0.1",
+    "jsencrypt": "^3.3.2",
     "jsonwebtoken": "^8.5.1",
     "lz-string": "^1.4.4",
     "normalize.css": "^8.0.1",
@@ -61,6 +64,7 @@
     "qrcode": "*",
     "resize-detector": "*",
     "strip-json-comments": "*",
+    "swiper": "8.4.5",
     "v-viewer": "1.6.4",
     "vue-jsonp": "2.0.0",
     "vuedraggable": "*",
@@ -77,6 +81,7 @@
     "@vue/compiler-dom": "^3.2.47",
     "@vue/test-utils": "^1.1.3",
     "@vue/vue2-jest": "^27.0.0-alpha.2",
+    "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^27.0.6",
     "babel-plugin-component": "^1.1.1",
@@ -94,7 +99,6 @@
     "html-webpack-tags-plugin": "^2.0.17",
     "jest": "^27.0.5",
     "jszip": "^3.10.0",
-    "lodash": "^4.17.21",
     "md2vue-loader": "file:./md2vue-loader",
     "mockjs": "^1.1.0",
     "node-sass": "6.0.0",
@@ -107,7 +111,6 @@
     "svg-sprite-loader": "4.1.3",
     "svg-url-loader": "^7.1.1",
     "svgo": "1.2.0",
-    "swiper": "^8.4.5",
     "umy-table": "^1.1.8",
     "url-loader": "^4.1.1",
     "vue": "^2.6.11",
@@ -117,7 +120,7 @@
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",
-    "vxe-table": "^3.6.17",
+    "vxe-table": "3.6.17",
     "webpack-bundle-analyzer": "^3.9.0",
     "xlsx": "0.14.1",
     "xlsx-style": "^0.8.13"

package/src/assets/css/approve-card.scss

@@ -63,7 +63,7 @@
     color: $--color-text-regular;
   }
   .n20-description-bgc {
-    margin-left: 40px;
+    // margin-left: 40px;
     margin-top: 10px;
     background: $--background-color-base;
     height: 100%;

package/src/assets/css/date-quarter.scss

@@ -8,6 +8,7 @@
   .el-select .el-input__inner {
     border: none;
     border-radius: 4px 0 0 4px;
+    padding: 0 10px;
   }
 
   .el-select .el-input__inner:active,
@@ -109,3 +110,10 @@
 .el-button.el-button--text.is-disabled:hover {
   color: #333;
 }
+.clearable-datetimerange {
+  .el-picker-panel__footer {
+    .el-picker-panel__link-btn:first-child {
+      display: none !important;
+    }
+  }
+}

package/src/assets/css/expandable-pane.scss

@@ -8,6 +8,10 @@ $--expandable-pane-height: 28px;
     color: $--color-text-primary;
     padding: 0 12px;
     margin-bottom: 8px;
+    margin-top: 8px;
+    &__algin_l {
+      margin-left: 20px;
+    }
   }
 
   .n20-tips {
@@ -31,6 +35,9 @@ $--expandable-pane-height: 28px;
     .expand {
       transform: rotate(90deg);
     }
+    .topExpand {
+      transform: rotate(270deg);
+    }
   }
 
   .color-0 {

package/src/assets/css/file-upload-table.scss

@@ -6,13 +6,12 @@
     border-right: $--tab-border-line;
 
     .cell {
-
       .el-icon-download,
       .el-icon-view {
         color: $--color-text-primary;
 
         &:hover {
-          color: $--color-primary
+          color: $--color-primary;
         }
       }
     }
@@ -36,4 +35,4 @@
   .el-message-box__btns {
     margin-top: 0;
   }
-}
+}

package/src/assets/css/font-icon.scss

@@ -1,5 +1,7 @@
+@import url('../iconFont/font.css');
 @import url('../iconFont/iconfont.css');
 
+
 .n20-icon- {
   font-family: 'core-lib-iconfont' !important;
   font-style: normal;
@@ -48,4 +50,4 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-text-stroke-width: 0.2px;
-}
+}

package/src/assets/css/message.scss

@@ -1,6 +1,8 @@
 .el-message {
   padding-top: 12px;
   padding-bottom: 12px;
+  overflow-wrap: anywhere;
+  max-width: 80%;
 }
 
 .el-message-box {
@@ -46,7 +48,7 @@
       border-color: var(--color-primary-hover);
     }
 
-    & .el-button+.el-button {
+    & .el-button + .el-button {
       margin-left: 0;
       margin-right: 16px;
     }
@@ -101,7 +103,7 @@
       border-color: var(--color-primary-hover);
     }
 
-    & .el-button+.el-button {
+    & .el-button + .el-button {
       margin-left: 0;
       margin-right: 16px;
     }
@@ -160,7 +162,7 @@
 }
 
 .el-message--success {
-  border: 1px solid rgba(72, 210, 160, 0.40);
+  border: 1px solid rgba(72, 210, 160, 0.4);
 }
 
 .el-message--error {
@@ -171,7 +173,6 @@
   border: 1px solid #ffe28d;
 }
 
-
 .message-por.el-message--info {
   .el-message__icon {
     color: $--color-primary;
@@ -190,7 +191,6 @@
   color: $--color-text-regular;
 }
 
-
 .el-message--success .el-message__content {
   color: $--color-text-regular;
 }
@@ -213,4 +213,4 @@
 
 .el-message-box__status.el-icon-info {
   color: $--messagebox-warning-color;
-}
+}

package/src/assets/css/normalize.scss

@@ -2,6 +2,9 @@
 // .input-w {width: $--input-width;}
 // .button-4em{min-width: 72px;}
 /* 格式化样式 */
+
+
+
 html {
   height: 100%;
 }
@@ -9,7 +12,7 @@ html {
 body {
   height: 100%;
   font-size: $--font-size-base;
-  font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif;
+  font-family: PingFang SC, Microsoft YaHei, SUN, Arial, sans-serif;
 }
 
 li {

package/src/assets/css/table.scss

@@ -11,7 +11,7 @@
 }
 
 .el-table--small .el-table__cell {
-  padding: 10px 0;
+  padding: 8px 0;
 }
 
 .el-table .cell {
@@ -51,7 +51,6 @@
 }
 
 .el-table {
-
   /* 排序 */
   .caret-wrapper {
     display: inline-flex;
@@ -123,8 +122,8 @@
 
 /* 附件上传hover颜色 */
 .base-table_default {
-  .el-table__body .hover-active:hover>td {
-    background-color: #FF3C2F10 !important;
+  .el-table__body .hover-active:hover > td {
+    background-color: #ff3c2f10 !important;
   }
 }
 
@@ -196,17 +195,17 @@ th.vxe-header--column {
   color: #333;
 }
 
-.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived)>.vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived)>.vxe-cell,
-.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived)>.vxe-cell {
+.vxe-table-custom-wrap.vxe-body--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis:not(.col--actived) > .vxe-cell,
+.vxe-table--render-default .vxe-table-custom-wrap.vxe-header--column.col--ellipsis:not(.col--actived) > .vxe-cell {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: wrap !important;
 }
 
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis>.vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis>.vxe-cell,
-.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis>.vxe-cell {
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-body--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-footer--column.col--ellipsis > .vxe-cell,
+.vxe-table--render-default.size--small .vxe-table-custom-wrap.vxe-header--column.col--ellipsis > .vxe-cell {
   max-height: 100%;
 }
 
@@ -226,4 +225,10 @@ th.vxe-header--column {
   .icon-mini {
     background-image: url('../../components/TableSetSize/mini.png');
   }
-}
+}
+
+.el-table th.el-table__cell > .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

package/src/assets/iconFont/font.css

@@ -0,0 +1,4 @@
+@font-face {
+  font-family: 'SUN';
+  src: url('./SIMSUN.ttf') format('truetype');
+}

package/src/components/AIButton/index.vue

@@ -0,0 +1,101 @@
+<template>
+  <span>
+    <slot :customEvent="aiFn">
+      <el-button v-title="'AI识别'" type="text" icon="n20-icon-query" @click="aiFn" />
+    </slot>
+    <Dialog v-drag :visible.sync="visible" title="AI识别" :destroy-on-open="true" width="690px">
+      <cl-upload
+        :drag="true"
+        :file-name.sync="fileName"
+        :file-url.sync="fileUrl"
+        :action="apiPrefix ? apiPrefix + 'neams/eamsbaserecord/batchSavejson' : 'neams/eamsbaserecord/batchSavejson'"
+        :on-success="onSuccess"
+        :msg-type="null"
+        :data="dataPorp"
+      >
+        <template slot="trigger">
+          <i class="drag-icon n20-icon-shangchuan"></i>
+          <span class="drag-text">点击或将文件拖拽到这里上传</span>
+        </template>
+      </cl-upload>
+    </Dialog>
+  </span>
+</template>
+
+<script>
+import Dialog from '../Dialog/index.vue'
+import clUpload from '../Upload/index.vue'
+let dayjs = undefined
+import('../../index.js').then((res) => {
+  dayjs = res.dayjs
+})
+export default {
+  name: 'AiButton',
+  components: { Dialog, clUpload },
+  props: {
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
+    AIOptions: {
+      type: Object,
+      default: () => ({})
+    },
+    dataPorp: {
+      type: Object,
+      default: () => {
+        return {
+          data: JSON.stringify({
+            syscode: '010000000',
+            appno: 'abcd',
+            bussValue: '006001001',
+            cltno: '001',
+            creator: 'jz'
+          })
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      fileName: '',
+      fileUrl: ''
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    aiFn() {
+      this.visible = true
+    },
+    onSuccess({ data }) {
+      this.AiFn(data)
+    },
+    // ai识别
+    async AiFn(beid) {
+      const uploadTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      if (!this.AIOptions.bussType) {
+        this.$message.error('请先配置bussType')
+        return false
+      }
+      const { data, code } = await this.$axios.post(
+        this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
+        {
+          beid: beid,
+          bussType: this.AIOptions.bussType,
+          extendPrompt: ''
+        }
+      )
+      if (code === 200) {
+        this.$emit('aiFn', { AiResult: data, beid: beid, fileName: this.fileName, uploadTime: uploadTime })
+        this.visible = false
+        this.$message.success('识别成功')
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>

package/src/components/AdvancedFilter/formItemRender.vue

@@ -8,11 +8,12 @@ import inputNumber from '../InputNumber/index.vue'
 import InputNumberRange from '../InputNumber/numberRange.vue'
 import selectTree from '../SelectTree/index.vue'
 import selectTreePro from '../SelectTree/pro.vue'
+import { setOptionsMap } from './utils.js'
 const canvas = document.createElement('canvas')
 const context = canvas.getContext('2d')
 context.font = '14px Ping Fang SC'
 export default {
-  name: 'formItemRender',
+  name: 'FormItemRender',
   components: {
     inputNumber,
     selectTree,
@@ -76,6 +77,7 @@ export default {
         resKeys.forEach((key) => {
           list = list[key]
         })
+        setOptionsMap(this.item.id, list)
         this.$set(this.item, 'options', list)
       })
     }
@@ -171,9 +173,9 @@ export default {
           }
         } else {
           if (type) {
-            W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 150
+            W = w || asciiWidth(item.placeholder || typeEnum[item.type]) + 150
           } else {
-            W = w ? w : asciiWidth(item.placeholder || typeEnum[item.type]) + 40
+            W = w || asciiWidth(item.placeholder || typeEnum[item.type]) + 40
           }
         }
       } else {
@@ -600,7 +602,8 @@ export default {
             ruleField: true,
             'rule-form': 'ruleValidate',
             ruleErrorHide: item.ruleErrorHide,
-            rules: item.rules
+            rules: item.rules,
+            ...item.props
           },
           props: pickerProps,
           style: {

package/src/components/AdvancedFilter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="prefixCls">
-    <el-form ref="advancedFilter" v-show="visible" :class="prefixCls + '-body'">
+    <el-form v-show="visible" ref="advancedFilter" :class="prefixCls + '-body'" @submit.native.prevent="() => {}">
       <slot name="prefix"></slot>
       <el-form-item
         v-for="item in GroupData"
@@ -42,13 +42,13 @@
           </div>
           <filterItem
             :filter-list="filterListS"
-            :maxLength="maxLength"
+            :max-length="maxLength"
             :check-array.sync="checkList"
             @checked="check"
           />
           <div class="flex-box flex-c m-t-m">
             <el-button size="mini" type="primary" @click="savaCheck">{{ $lc('确认') }}</el-button>
-            <el-button plain type="primary" @click="cancel">{{ $l('取消') }}</el-button>
+            <el-button plain type="primary" @click="cancel">{{ $lc('取消') }}</el-button>
           </div>
         </el-popover>
         <el-link class="m-l-s color-primary" :underline="false" icon="n20-icon-query" @click="$emit('search')">
@@ -62,9 +62,8 @@
 
 <script>
 // import formItemInput from './form-item-input.vue'
-import cloneDeep from 'lodash/cloneDeep'
+import XEUtils from 'xe-utils'
 import axios from '../../utils/axios.js'
-import { $lc } from '../../utils/i18n/index.js'
 import InputSearch from '../InputSearch/index.vue'
 import filterItem from './filterItem.vue'
 import formItemRender from './formItemRender.vue'
@@ -165,7 +164,7 @@ export default {
           }
         })
         .map((item) => item[this.onlyKey])
-      this.defineCheckList = cloneDeep(_checkList)
+      this.defineCheckList = XEUtils.clone(_checkList, true)
     },
     getOnlyKey(data) {
       return getOnlyKey(this.onlyKey, data)
@@ -401,7 +400,7 @@ export default {
             }
           }
           this.checkList = this.GroupData.map((res) => res.id)
-          this.cancelCheck = cloneDeep(this.checkList)
+          this.cancelCheck = XEUtils.clone(this.checkList, true)
           // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
           this.filterList = this.filterList.sort((a, b) => {
             if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {

package/src/components/Anchor/index.vue

@@ -5,6 +5,7 @@
       :nav-list="navList"
       :activit="value"
       :style="{ width: navWidth }"
+      class="left-side"
       :class="{ 'top-css': position === 'top' }"
       @click="activitFn"
     />