gcs-ui-lib 1.2.15 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcs-ui-lib",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "private": false,
   "main": "./lib/gcs-ui-lib.common.js",
   "scripts": {

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>