gcs-ui-lib 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcs-ui-lib",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "private": false,
   "main": "./lib/gcs-ui-lib.common.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "element-ui": "^2.15.5",
     "axios": "^0.21.4",
     "vxe-table": "3.6.17",
+    "decimal.js": "^10.6.0",
     "vxe-utils": "2.0.1"
   },
   "peerDependencies": {},

package/packages/LazyBank/index.js

@@ -0,0 +1,7 @@
+import NstcLazyBank from './src/main'
+
+NstcLazyBank.install = function(Vue) {
+    Vue.component(NstcLazyBank.name, NstcLazyBank)
+}
+
+export default NstcLazyBank

package/packages/LazyBank/src/demo/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <NstcLazyBank v-model="bankNo"/>
+  </div>
+</template>
+<script>
+import NstcLazyBank from "../main.vue";
+
+export default {
+  name: 'LazyBankDemo',
+  components: {
+    NstcLazyBank
+  },
+  data() {
+    return {
+      bankNo: 'B1639'
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+
+</style>

package/packages/LazyBank/src/main.vue

@@ -0,0 +1,111 @@
+<template>
+  <SelectLazy
+      v-model="bankNo"
+      :filter-method="filterFn"
+      @scroll-bottom="getNextList"
+      v-on="$listeners"
+      v-bind="$attrs"
+      :placeholder="$l('请选择')"
+      @change="handleChange"
+  >
+    <template v-loading="loading">
+      <el-option
+          v-for="item in bankList"
+          :key="item.bankNo"
+          :label="item['bankName']"
+          :value="item['bankNo']"
+      >
+        {{ item.bankName }}
+      </el-option>
+    </template>
+  </SelectLazy>
+</template>
+<script>
+import {SelectLazy, axios, SelectLazy as CLSelectLazy} from "n20-common-lib";
+
+export default {
+  name: "NstcLazyBank",
+  components: {
+    CLSelectLazy,
+    SelectLazy
+  },
+  props: {
+    value: {
+      type: [String, Array],
+      default: "",
+    },
+    moreParams: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    bankNo: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit("input", val);
+      },
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      searchKey: '',
+      page: {
+        current: 1,
+        size: 20
+      },
+      bankList: [],
+      total: 100
+    }
+  },
+  mounted() {
+    this.getBanks(this.value)
+  },
+  methods: {
+    filterFn(val) {
+      this.page.current = 1;
+      this.searchKey = val;
+      this.getBanks()
+    },
+    async getNextList() {
+      if (this.total > this.bankList.length) {
+        this.page.current += 1;
+        this.getBanks();
+      }
+    },
+    getBanks(originKey = '') {
+      const params = {
+        'page.current': this.page.current,
+        'page.size': this.page.size,
+        searchKey: originKey || this.searchKey,
+        isEnable: 1,
+        ...this.moreParams
+      }
+      this.loading = true
+      axios.get('/api/nstc-mdm/1.0/bank', params, {loading: false}).then(res => {
+        if (this.page.current === 1) {
+          this.bankList = res.data || []
+        } else {
+          this.bankList = this.bankList.concat(res.data);
+        }
+        this.total = res.total;
+      }).catch(err => {
+        console.error(err)
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    handleChange(e) {
+      const bank = this.bankList.find(item => item.bankNo === e);
+      if (bank) {
+        this.$emit("change", bank);
+      } else {
+        this.$emit("clear");
+      }
+    }
+  }
+}
+</script>

package/packages/MultiCurrencyStatistics/src/main.vue

@@ -5,7 +5,9 @@
   </div>
 </template>
 <script>
-import {StatisPopover, N} from 'n20-common-lib'
+import {StatisPopover} from 'n20-common-lib'
+import Decimal from 'decimal.js';
+import {amountFormat} from "../../../src/utils/utils";
 
 export default {
   name: 'MultiCurrencyStatistics',
@@ -113,7 +115,12 @@ export default {
                     //笔|条 数
                     return coins.length
                   }
-                  return coins.reduce((amount, item) => N.add(amount,item[c.key],2), 0)
+
+                  return coins.reduce((amount, item) => {
+                    const o1 = new Decimal(`${amount}`)
+                    const o2 = new Decimal(`${item[c.key]}`)
+                    return amountFormat(o1.plus(o2))
+                  }, 0)
                 })()
               }))
             }

package/packages/Trade/src/components/all/index.vue

@@ -573,7 +573,7 @@ export default {
       });
     },
     setChange(list) {
-      const index = list.findIndex((res) => res.isNew && !res.children);
+      const index = list.findIndex((res) => !res.children);
       if (index !== -1) return this.$message.warning(`新增字段必须包含子级！`);
       let dto = {
         approvalType: "6",
@@ -736,7 +736,7 @@ export default {
         ...this.pageObj,
         // conditions,
         typeCodes: this.appNo === 'CTMS'
-            ? (this.searchObj.typeCodes?.length ? this.searchObj.typeCodes : specialCodes)
+            ? (this.searchObj.typeCodes.length ? this.searchObj.typeCodes : specialCodes)
             : this.searchObj.typeCodes,
       };
       delete params.states;

package/packages/Trade/src/components/dynamicColumnMixin.js

@@ -1,69 +1,84 @@
-import { axios } from 'n20-common-lib'
+import { axios } from "n20-common-lib";
 
 export default {
   data() {
     return {
-      eyeView: false
-    }
+      eyeView: false,
+    };
   },
   methods: {
     // 排序
-    sortMethod({ data, column, property, order }) {
+    sortMethod({ data, sortList }) {
+      //兼容预算的高版本
+      if (!sortList || sortList.length === 0) return;
+      let { field, order } = sortList[0];
       data.sort((a, b) => {
         // 处理字段为空的情况，确保空值始终排在最后
-        const aValue = a[property]
-        const bValue = b[property]
+        const aValue = a[field];
+        const bValue = b[field];
 
         // 统一比较逻辑
         const compare = (v1, v2) => {
-          if (typeof v1 === 'string' && typeof v2 === 'string') {
-            return v1.localeCompare(v2)
+          if (typeof v1 === "string" && typeof v2 === "string") {
+            return v1.localeCompare(v2);
           } else {
-            return v1 - v2
+            return v1 - v2;
           }
-        }
+        };
         // 处理空值，确保空值始终排在最后
-        if (aValue === 0 || aValue === null) return order === 'asc' ? 1 : -1
-        if (bValue === 0 || bValue === null) return order === 'asc' ? -1 : 1
+        if (aValue === 0 || aValue === null) return order === "asc" ? 1 : -1;
+        if (bValue === 0 || bValue === null) return order === "asc" ? -1 : 1;
         // 根据排序顺序返回结果
-        return order === 'desc' ? compare(bValue, aValue) : compare(aValue, bValue)
-      })
+        return order === "desc"
+          ? compare(bValue, aValue)
+          : compare(aValue, bValue);
+      });
     },
     getDynamicColumn(typeCode = undefined, approvalType) {
-      axios.get(`/bems/activiti/actNsSortColumn/querySortColumn/${typeCode}/${approvalType}`).then(({ data }) => {
-        this.checkColumns =
-          data && data.sortColumn && data.sortColumn.length > 0 ? JSON.parse(data.sortColumn) : this.originColumn
-      })
+      axios
+        .get(
+          `/bems/activiti/actNsSortColumn/querySortColumn/${typeCode}/${approvalType}`
+        )
+        .then(({ data }) => {
+          this.checkColumns =
+            data && data.sortColumn && data.sortColumn.length > 0
+              ? JSON.parse(data.sortColumn)
+              : this.originColumn;
+        });
     },
     saveDynamicColumn(data) {
       axios.post(`/bems/activiti/actNsSortColumn/saveOrUpDateColumn`, data, {
-        noMsg: true
-      })
-      this.dialogVisible = false
+        noMsg: true,
+      });
+      this.dialogVisible = false;
     },
     /**
      * 查看业务状态
      */
     async seeBussStatus() {
       if (!this.eyeView) {
-        this.eyeView = true
-        let dto = (this.tableDate||[]).map((res) => {
+        this.eyeView = true;
+        let dto = (this.tableDate || []).map((res) => {
           return {
             businessId: res.businessId,
-            typeCode: res.typeCode
-          }
-        })
+            typeCode: res.typeCode,
+          };
+        });
         let dtos = {
-          dtos: dto
-        }
-        const { data, code } = await this.$axios.post(`/api/settlement-order/api/position/order/work/flow`, dtos)
+          dtos: dto,
+        };
+        const { data, code } = await this.$axios.post(
+          `/api/settlement-order/api/position/order/work/flow`,
+          dtos
+        );
         if (code === 200) {
-          this.tableDate = (this.tableDate||[]).map((res) => {
-            res[`${res.businessId}${res.typeCode}`] = data[`${res.businessId}${res.typeCode}`]
-            return res
-          })
+          this.tableDate = (this.tableDate || []).map((res) => {
+            res[`${res.businessId}${res.typeCode}`] =
+              data[`${res.businessId}${res.typeCode}`];
+            return res;
+          });
         }
       }
-    }
-  }
-}
+    },
+  },
+};

package/src/App.vue

@@ -7,7 +7,7 @@
       <el-container>
         <el-header>组件演示</el-header>
         <el-main>
-          <router-view />
+          <router-view style="height: calc(100% - 60px);"/>
         </el-main>
       </el-container>
     </el-container>

package/src/index.js

@@ -34,6 +34,7 @@ import NstcMergeAutoFillDetail from "../packages/MergeAutoFill/merge/mergeFillDe
 import NstcMergeAutoFillService from "../packages/MergeAutoFill/merge/merageFillService.vue";
 import NstcMergeAutoFillRuleHistory from "../packages/MergeAutoFill/merge/ExtendMergeHistory.vue";
 import NstcIntegerNumber from "../packages/IntegerInput/src/main.vue";
+import NstcLazyBank from "../packages/LazyBank/src/main.vue";
 
 import "n20-common-lib/style/index.css";
 import i18n, {$l} from 'n20-common-lib/src/utils/i18n'
@@ -80,6 +81,7 @@ const components = [
     NstcMultiCurrencyStatistics,
     BankInstitutionDropdown,
     RiskEventTable,
+    NstcLazyBank,
     ...dynamicComponents, // 添加自动发现的组件
 ];
 
@@ -155,7 +157,8 @@ export {
     NstcConfigurableForm,
     NstcValidateQuota,
     NstcMultiCurrencyStatistics,
-    BankInstitutionDropdown
+    BankInstitutionDropdown,
+    NstcLazyBank
 };
 export default {
     version: "1.0.0",
@@ -185,5 +188,6 @@ export default {
     NstcConfigurableForm,
     NstcValidateQuota,
     NstcMultiCurrencyStatistics,
-    BankInstitutionDropdown
+    BankInstitutionDropdown,
+    NstcLazyBank
 };

package/src/preview/router.js

@@ -68,6 +68,11 @@ export const routes = [{
         name: '银行',
         component: () => import('^/Bank/src/demo/index.vue')
     },
+    {
+        path: '/LazyBank',
+        name: '银行懒加载',
+        component: () => import('^/LazyBank/src/demo/index.vue')
+    },
     {
         path: '/BranchBank',
         name: '支行',