@fangzhongya/fang-ui 0.1.35 → 0.1.36

package/dist/components/table-column/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const TableColumn: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { TableColumn, TableColumn as default };
+export { TableColumn };
+export default TableColumn;

package/dist/components/table-column/index.scss

@@ -2,4 +2,5 @@
 
 $table-column: 'table-column';
 @include b($table-column) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/tables/common/pagin.cjs

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const unmergeObject = require("@fangzhongya/utils/basic/object/unmergeObject");
-require("../../../utils/index.cjs");
-const urls = require("../../common/urls.cjs");
+const util = require("../../../utils/util.cjs");
 const firstLower = require("@fangzhongya/utils/basic/string/firstLower");
 const lineToSmallHump = require("@fangzhongya/utils/name/lineToSmallHump");
-const util = require("../../../utils/util.cjs");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
+const urls = require("../../common/urls.cjs");
 const dataProps = {
   ...urls.props,
   /**
@@ -134,63 +133,87 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
     selection: 46
   };
   const setList = () => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2;
     const configs = props2.configs;
     const list = (configs == null ? void 0 : configs.list) ?? props2.list;
     const config = (configs == null ? void 0 : configs.config) ?? props2.config;
-    if (((_a2 = config.config) == null ? void 0 : _a2.ischecked) || ((_b2 = config.config) == null ? void 0 : _b2.isserial)) {
-      let isx = (_c = config.config) == null ? void 0 : _c.ischecked;
-      let iss = (_d = config.config) == null ? void 0 : _d.isserial;
-      let i = -1;
-      for (let t = 0; t < list.length; t++) {
-        const obj = list[t];
-        if ((obj == null ? void 0 : obj.type) == "selection") {
-          if (!obj.width) {
-            obj.width = width.selection;
-          }
-          if (!obj.selectable) {
-            obj.selectable = (_e = config.config) == null ? void 0 : _e.selectable;
-          }
-          i = t;
-          isx = false;
-        }
-        if ((obj == null ? void 0 : obj.type) == "index") {
-          if (!obj.width) {
-            obj.width = width.index;
-          }
-          iss = false;
-        }
-        if (!isx && !iss) {
-          break;
-        }
-      }
-      if (iss) {
-        if (i != -1) {
-          list.splice(i + 1, 0, {
-            type: "index",
-            width: width.index,
-            label: getLocale("serial"),
-            fixed: true
-          });
-        } else {
-          list.unshift({
-            type: "index",
-            width: width.index,
-            label: getLocale("serial"),
-            fixed: true
-          });
-        }
+    if (!((_a2 = config.config) == null ? void 0 : _a2.ischecked) && !((_b2 = config.config) == null ? void 0 : _b2.isserial)) {
+      tableList.value = list;
+      return;
+    }
+    const { needSelection, needSerial } = processExistingColumns(
+      list,
+      config
+    );
+    addMissingColumns(list, needSelection, needSerial, config);
+    tableList.value = list;
+  };
+  const processExistingColumns = (list, config) => {
+    var _a2, _b2;
+    let needSelection = ((_a2 = config.config) == null ? void 0 : _a2.ischecked) ?? false;
+    let needSerial = ((_b2 = config.config) == null ? void 0 : _b2.isserial) ?? false;
+    let selectionIndex = -1;
+    for (let i = 0; i < list.length && (needSelection || needSerial); i++) {
+      const obj = list[i];
+      if ((obj == null ? void 0 : obj.type) === "selection") {
+        updateSelectionColumn(obj, config);
+        selectionIndex = i;
+        needSelection = false;
       }
-      if (isx) {
-        list.unshift({
-          type: "selection",
-          width: width.selection,
-          selectable: (_f = config.config) == null ? void 0 : _f.selectable,
-          fixed: true
-        });
+      if ((obj == null ? void 0 : obj.type) === "index") {
+        updateSerialColumn(obj);
+        needSerial = false;
       }
     }
-    tableList.value = list;
+    return { needSelection, needSerial, selectionIndex };
+  };
+  const updateSelectionColumn = (obj, config) => {
+    var _a2;
+    if (!obj.width) {
+      obj.width = width.selection;
+    }
+    if (!obj.selectable) {
+      obj.selectable = (_a2 = config.config) == null ? void 0 : _a2.selectable;
+    }
+  };
+  const updateSerialColumn = (obj) => {
+    if (!obj.width) {
+      obj.width = width.index;
+    }
+  };
+  const addMissingColumns = (list, needSelection, needSerial, config) => {
+    if (needSerial) {
+      addSerialColumn(list, config);
+    }
+    if (needSelection) {
+      addSelectionColumn(list, config);
+    }
+  };
+  const addSerialColumn = (list, config) => {
+    const serialColumn = {
+      type: "index",
+      width: width.index,
+      label: getLocale("serial"),
+      fixed: true
+    };
+    const selectionIndex = findSelectionIndex(list);
+    if (selectionIndex !== -1) {
+      list.splice(selectionIndex + 1, 0, serialColumn);
+    } else {
+      list.unshift(serialColumn);
+    }
+  };
+  const addSelectionColumn = (list, config) => {
+    var _a2;
+    list.unshift({
+      type: "selection",
+      width: width.selection,
+      selectable: (_a2 = config.config) == null ? void 0 : _a2.selectable,
+      fixed: true
+    });
+  };
+  const findSelectionIndex = (list) => {
+    return list.findIndex((obj) => (obj == null ? void 0 : obj.type) === "selection");
   };
   const setConfig = () => {
     var _a2, _b2;
@@ -207,7 +230,11 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
     paginat.scroll = pagin.scroll || false;
     paginat.cross = pagin.cross || false;
     paginat.pageSize = pagin.size || mpagconfig.pageSize;
-    pagconfig.value = Object.assign({}, mpagconfig, pagin.config || {});
+    const pc = pagin.config || {};
+    pagconfig.value = {
+      ...mpagconfig,
+      ...pc
+    };
     tableConfig.value = unmergeObject.unmergeObject(defaultConfig, config, 2);
   };
   vue.watch(
@@ -221,7 +248,7 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
   const formEvent = vue.computed(() => {
     const obj = {};
     const es = tableConfig.value.events || {};
-    Object.keys(es).forEach((key) => {
+    for (const key of Object.keys(es)) {
       let ml = key;
       if (/on[A-Z]/.test(key)) {
         ml = firstLower.firstLower(key.replace(/^on/, ""));
@@ -230,91 +257,58 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
       obj[ml] = (...data2) => {
         util.executionMethod(es[key], ...data2);
       };
-    });
+    }
     return obj;
   });
   function setCrossPage() {
     const v = data.current;
     console.log("v", v);
-    crossPageData.value[v] = getSelection();
+    crossPageData.value[v] = refTable.value.getSelections();
     console.log("crossPageData", crossPageData);
   }
   function getCrossPageValue(sarr, index) {
     var _a2;
     const cross = paginat.cross;
-    if (cross) {
-      const rowKey = typeof cross === "string" ? cross : (_a2 = tableConfig.value.config) == null ? void 0 : _a2.rowKey;
-      if (rowKey) {
-        const sv = /* @__PURE__ */ new Set();
-        const is = [];
-        if (sarr && index) {
-          crossPageData.value.forEach((arr, i) => {
-            if (i === index) {
-              sarr.forEach((v) => {
-                if (!is.includes(v[rowKey])) {
-                  is.push(v[rowKey]);
-                  sv.add(v);
-                }
-              });
-            } else {
-              arr.forEach((v) => {
-                if (!is.includes(v[rowKey])) {
-                  is.push(v[rowKey]);
-                  sv.add(v);
-                }
-              });
-            }
-          });
-          if (!crossPageData.value[index]) {
-            sarr.forEach((v) => {
-              if (!is.includes(v[rowKey])) {
-                is.push(v[rowKey]);
-                sv.add(v);
-              }
-            });
-          }
-        } else {
-          crossPageData.value.forEach((arr) => {
-            arr.forEach((v) => {
-              if (!is.includes(v[rowKey])) {
-                is.push(v[rowKey]);
-                sv.add(v);
-              }
-            });
-          });
+    if (!cross) return [];
+    const rowKey = typeof cross === "string" ? cross : (_a2 = tableConfig.value.config) == null ? void 0 : _a2.rowKey;
+    const resultMap = /* @__PURE__ */ new Map();
+    const crossData = crossPageData.value;
+    const processItem = (item) => {
+      const key = rowKey ? item[rowKey] : item;
+      resultMap.set(key, item);
+    };
+    const processArray = (arr) => {
+      if (arr) {
+        for (const item of arr) {
+          processItem(item);
         }
-        return [...sv];
-      } else {
-        const sv = /* @__PURE__ */ new Set();
-        if (sarr && index) {
-          crossPageData.value.forEach((arr, i) => {
-            if (i === index) {
-              sarr.forEach((v) => {
-                sv.add(v);
-              });
-            } else {
-              arr.forEach((v) => {
-                sv.add(v);
-              });
-            }
-          });
-          if (!crossPageData.value[index]) {
-            sarr.forEach((v) => {
-              sv.add(v);
-            });
-          }
+      }
+    };
+    const handleWithParameters = (sarr2, index2) => {
+      const crossLen = crossData.length;
+      for (let i = 0; i < crossLen; i++) {
+        const currentArray = crossData[i];
+        if (i === index2) {
+          processArray(sarr2);
         } else {
-          crossPageData.value.forEach((arr) => {
-            arr.forEach((v) => {
-              sv.add(v);
-            });
-          });
+          processArray(currentArray);
         }
-        return [...sv];
       }
+      if (index2 >= crossLen) {
+        processArray(sarr2);
+      }
+    };
+    const handleAllData = () => {
+      for (const arr of crossData) {
+        processArray(arr);
+      }
+    };
+    if (sarr !== void 0 && index !== void 0) {
+      handleWithParameters(sarr, index);
     } else {
-      return [];
+      handleAllData();
     }
+    return Array.from(resultMap.values());
   }
   function toggleCrossPage() {
     var _a2;
@@ -324,24 +318,24 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
       const vs = getCrossPageValue();
       const rowKey = typeof cross === "string" ? cross : (_a2 = tableConfig.value.config) == null ? void 0 : _a2.rowKey;
       if (rowKey) {
-        const iss = vs.map((o) => o[rowKey]);
+        const iss = new Set(vs.map((o) => o[rowKey]));
         const ts = datas.filter((v) => {
-          return iss.includes(v[rowKey]);
+          return iss.has(v[rowKey]);
         });
         vue.nextTick(() => {
-          ts.forEach((v) => {
-            refTable.value.toggleRowSelection(v);
-          });
+          for (const v of ts) {
+            refTable.value.toggleRowSelection(v, true);
+          }
         });
       } else {
-        const iss = vs.map((o) => JSON.stringify(o));
+        const iss = new Set(vs.map((o) => JSON.stringify(o)));
         const ts = datas.filter((v) => {
-          return iss.includes(JSON.stringify(v));
+          return iss.has(JSON.stringify(v));
         });
         vue.nextTick(() => {
-          ts.forEach((v) => {
-            refTable.value.toggleRowSelection(v);
-          });
+          for (const v of ts) {
+            refTable.value.toggleRowSelection(v, true);
+          }
         });
       }
     }
@@ -394,10 +388,8 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
         refTable.value.toggleRowSelection(row, true);
         setSelection([row]);
       }
-    } else {
-      if (is) {
-        refTable.value.toggleRowSelection(row);
-      }
+    } else if (is) {
+      refTable.value.toggleRowSelection(row);
     }
   }
   function onRowClick(row) {
@@ -405,19 +397,15 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
     if ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isRowSelect) {
       const selectable = (_b2 = tableConfig.value.config) == null ? void 0 : _b2.selectable;
       if (selectable) {
-        const index = data.list.findIndex((obj) => {
-          obj === row;
-        });
+        const index = data.list.indexOf(row);
         if (selectable(row, index)) {
           setSelectRow(row, true);
         }
       } else {
         setSelectRow(row, true);
       }
-    } else {
-      if (!isHighlight.value) {
-        refTable.value.clearCurrentRow();
-      }
+    } else if (!isHighlight.value) {
+      refTable.value.clearCurrentRow();
     }
   }
   function empty() {
@@ -461,7 +449,7 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
       const a = ao[prop];
       const b = bo[prop];
       const c = Number(a) - Number(b);
-      if (isNaN(c)) {
+      if (Number.isNaN(c)) {
         return (a + "").length - (b + "").length;
       } else {
         return c;
@@ -480,7 +468,7 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
       const prop = paginat.prop;
       const order = paginat.order;
       if (prop && order) {
-        const vs = arr.sort((ao, bo) => {
+        const vs = arr.toSorted((ao, bo) => {
           return getFrontSort(ao, bo, prop);
         });
         if (order == "asc") {
@@ -561,6 +549,7 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
     return param;
   }
   function setData() {
+    Object.assign(data, paginat);
     let dlist = defaultSort([...ajaxData.value]);
     if (paginat.is) {
       const c = paginat.current;
@@ -620,7 +609,6 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
         ...p
       })
     ).then((list) => {
-      Object.assign(data, paginat);
       let dlist = (list == null ? void 0 : list.list) || [];
       ajaxData.value = dlist;
       data.total = (list == null ? void 0 : list.total) || dlist.length;
@@ -716,10 +704,8 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
       if (props2.isValue) {
         emit("update:value", props2.value);
       }
-    } else {
-      if (props2.isValue) {
-        emit("update:value", data.list);
-      }
+    } else if (props2.isValue) {
+      emit("update:value", data.list);
     }
     emit("drag", data.list, newIndex, oldIndex);
   }

package/dist/components/tables/common/pagin.d.ts

@@ -223,7 +223,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         compon?: string | object | undefined;
         default?: any;
         value?: any;
-        label?: string | /*elided*/ any | undefined;
+        label?: string | Function | /*elided*/ any | undefined;
         labelText?: string | undefined;
         hideLabel?: boolean | undefined;
         prop?: string | undefined;
@@ -235,6 +235,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
             type: 1 | 2;
             must: boolean;
             judge: string;
+            error?: string | undefined;
         } | undefined;
         class?: string | undefined;
         style?: (ObjAny | SetFun) | undefined;
@@ -256,7 +257,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         compon?: string | object | undefined;
         default?: any;
         value?: any;
-        label?: string | /*elided*/ any | undefined;
+        label?: string | Function | /*elided*/ any | undefined;
         labelText?: string | undefined;
         hideLabel?: boolean | undefined;
         prop?: string | undefined;
@@ -268,6 +269,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
             type: 1 | 2;
             must: boolean;
             judge: string;
+            error?: string | undefined;
         } | undefined;
         class?: string | undefined;
         style?: (ObjAny | SetFun) | undefined;