@fangzhongya/fang-ui 0.1.35 → 0.1.36

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

@@ -1,11 +1,10 @@
 import { ref, reactive, watch, computed, nextTick } from "vue";
 import { unmergeObject } from "@fangzhongya/utils/basic/object/unmergeObject";
-import "../../../utils/index.js";
-import { props, comHandle } from "../../common/urls.js";
+import { executionMethod } from "../../../utils/util.js";
 import { firstLower } from "@fangzhongya/utils/basic/string/firstLower";
 import { lineToSmallHump } from "@fangzhongya/utils/name/lineToSmallHump";
-import { executionMethod } from "../../../utils/util.js";
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
+import { props, comHandle } from "../../common/urls.js";
 const dataProps = {
   ...props,
   /**
@@ -132,63 +131,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;
@@ -205,7 +228,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(defaultConfig, config, 2);
   };
   watch(
@@ -219,7 +246,7 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
   const formEvent = 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(key.replace(/^on/, ""));
@@ -228,91 +255,58 @@ const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
       obj[ml] = (...data2) => {
         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;
@@ -322,24 +316,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]);
         });
         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));
         });
         nextTick(() => {
-          ts.forEach((v) => {
-            refTable.value.toggleRowSelection(v);
-          });
+          for (const v of ts) {
+            refTable.value.toggleRowSelection(v, true);
+          }
         });
       }
     }
@@ -392,10 +386,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) {
@@ -403,19 +395,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() {
@@ -459,7 +447,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;
@@ -478,7 +466,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") {
@@ -559,6 +547,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;
@@ -618,7 +607,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;
@@ -714,10 +702,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/table-but2.cjs

@@ -58,12 +58,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function getHide(item) {
       if (props.isHide) {
         return !setShow(item);
+      } else if (item.hide) {
+        return item.hide;
       } else {
-        if (item.hide) {
-          return item.hide;
-        } else {
-          return true;
-        }
+        return true;
       }
     }
     function getDisabled(item) {

package/dist/components/tables/common/table-but2.js

@@ -56,12 +56,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getHide(item) {
       if (props.isHide) {
         return !setShow(item);
+      } else if (item.hide) {
+        return item.hide;
       } else {
-        if (item.hide) {
-          return item.hide;
-        } else {
-          return true;
-        }
+        return true;
       }
     }
     function getDisabled(item) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const index = require("../../tooltip/index.cjs");
 const mergeObject = require("@fangzhongya/utils/basic/object/mergeObject");
-exports.removePopper = null;
+let removePopper = null;
 const getCell = function(event) {
   var _a;
   return (_a = event.target) == null ? void 0 : _a.closest("td");
@@ -45,10 +45,8 @@ function isExceed(cellChild, lineClamp = 1) {
     if (isGreaterThan(rangeWidth + horizontalPadding, cellChildWidth) || isGreaterThan(rangeHeight + verticalPadding, cellChildHeight) || isGreaterThan(cellChild.scrollWidth, cellChildWidth)) {
       return true;
     }
-  } else {
-    if (isGreaterThan(rangeHeight + verticalPadding, cellChildHeight)) {
-      return true;
-    }
+  } else if (isGreaterThan(rangeHeight + verticalPadding, cellChildHeight)) {
+    return true;
   }
   return false;
 }
@@ -68,13 +66,12 @@ function showTooltip(event, parentNode, showOverflow, lineClamp = 1, props = {})
   }
 }
 function createTablePopper(trigger, mergedProps, parentNode) {
-  var _a, _b;
-  if (((_a = exports.removePopper) == null ? void 0 : _a.trigger) === trigger) {
-    const comp = exports.removePopper.vm.component;
+  if ((removePopper == null ? void 0 : removePopper.trigger) === trigger) {
+    const comp = removePopper.vm.component;
     mergeObject.mergeObject(comp.props, mergedProps);
     return;
   }
-  (_b = exports.removePopper) == null ? void 0 : _b.call(exports);
+  removePopper == null ? void 0 : removePopper();
   const vm = vue.createVNode(index.Tooltip, {
     virtualTriggering: true,
     virtualRef: trigger,
@@ -87,12 +84,12 @@ function createTablePopper(trigger, mergedProps, parentNode) {
   const container = document.createElement("div");
   vue.render(vm, container);
   vm.component.exposed.onOpen();
-  exports.removePopper = () => {
+  removePopper = () => {
     vue.render(null, container);
-    exports.removePopper = null;
+    removePopper = null;
   };
-  exports.removePopper.trigger = trigger;
-  exports.removePopper.vm = vm;
+  removePopper.trigger = trigger;
+  removePopper.vm = vm;
 }
 exports.createTablePopper = createTablePopper;
 exports.getCell = getCell;

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

@@ -1,4 +1,3 @@
-export declare let removePopper: any | null;
 export declare const getCell: (event: Event) => HTMLTableCellElement | null;
 export declare const getContent: (event: Event) => string;
 export declare function hideTooltip(event: MouseEvent): void;

package/dist/components/tables/common/tooltip.js

@@ -43,10 +43,8 @@ function isExceed(cellChild, lineClamp = 1) {
     if (isGreaterThan(rangeWidth + horizontalPadding, cellChildWidth) || isGreaterThan(rangeHeight + verticalPadding, cellChildHeight) || isGreaterThan(cellChild.scrollWidth, cellChildWidth)) {
       return true;
     }
-  } else {
-    if (isGreaterThan(rangeHeight + verticalPadding, cellChildHeight)) {
-      return true;
-    }
+  } else if (isGreaterThan(rangeHeight + verticalPadding, cellChildHeight)) {
+    return true;
   }
   return false;
 }
@@ -96,6 +94,5 @@ export {
   getCell,
   getContent,
   hideTooltip,
-  removePopper,
   showTooltip
 };

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

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-require("../../../utils/index.cjs");
-const getAttrValue = require("../../../utils/vues/getAttrValue.cjs");
 const firstUpper = require("@fangzhongya/utils/basic/string/firstUpper");
 const splitUpper = require("@fangzhongya/utils/basic/string/splitUpper");
-const isArray = require("@fangzhongya/utils/basic/array/isArray");
+const getAttrValue = require("../../../utils/vues/getAttrValue.cjs");
 function setMinWidth(obj, props) {
   const config = (props == null ? void 0 : props.table) ?? {};
   if (obj.width) {
@@ -68,13 +66,13 @@ function eventAlias(key, callback, obj, $event) {
   let is = false;
   const name = "on" + firstUpper.firstUpper(key);
   const arr = [];
-  Object.keys(obj).forEach((k) => {
+  for (const k of Object.keys(obj)) {
     if (k.startsWith(name)) {
       arr.push(k);
     }
-  });
+  }
   const reg = new RegExp("^" + name);
-  arr.forEach((v) => {
+  for (const v of arr) {
     let s = v.replace(reg, "");
     if (s && $event) {
       let ns = splitUpper.splitUpper(s);
@@ -98,23 +96,18 @@ function eventAlias(key, callback, obj, $event) {
       callback(obj[v]);
     }
     is = true;
-  });
+  }
   return is;
 }
 function eventAliass(callback, arr, obj, $event) {
+  if (!callback || !obj || !arr || arr.length === 0) {
+    return false;
+  }
   let is = false;
-  if (callback && obj) {
-    if (arr && arr.length > 0) {
-      if (isArray.isArray(arr)) {
-        arr = arr;
-        arr.forEach((key) => {
-          if (eventAlias(key, callback, obj, $event)) {
-            is = true;
-          }
-        });
-      } else {
-        is = eventAlias(arr, callback, obj, $event);
-      }
+  const items = Array.isArray(arr) ? arr : [arr];
+  for (const key of items) {
+    if (eventAlias(key, callback, obj, $event)) {
+      is = true;
     }
   }
   return is;

package/dist/components/tables/common/util.js

@@ -1,9 +1,7 @@
 import { withModifiers } from "vue";
-import "../../../utils/index.js";
-import { getAttrValue } from "../../../utils/vues/getAttrValue.js";
 import { firstUpper } from "@fangzhongya/utils/basic/string/firstUpper";
 import { splitUpper } from "@fangzhongya/utils/basic/string/splitUpper";
-import { isArray } from "@fangzhongya/utils/basic/array/isArray";
+import { getAttrValue } from "../../../utils/vues/getAttrValue.js";
 function setMinWidth(obj, props) {
   const config = (props == null ? void 0 : props.table) ?? {};
   if (obj.width) {
@@ -66,13 +64,13 @@ function eventAlias(key, callback, obj, $event) {
   let is = false;
   const name = "on" + firstUpper(key);
   const arr = [];
-  Object.keys(obj).forEach((k) => {
+  for (const k of Object.keys(obj)) {
     if (k.startsWith(name)) {
       arr.push(k);
     }
-  });
+  }
   const reg = new RegExp("^" + name);
-  arr.forEach((v) => {
+  for (const v of arr) {
     let s = v.replace(reg, "");
     if (s && $event) {
       let ns = splitUpper(s);
@@ -96,23 +94,18 @@ function eventAlias(key, callback, obj, $event) {
       callback(obj[v]);
     }
     is = true;
-  });
+  }
   return is;
 }
 function eventAliass(callback, arr, obj, $event) {
+  if (!callback || !obj || !arr || arr.length === 0) {
+    return false;
+  }
   let is = false;
-  if (callback && obj) {
-    if (arr && arr.length > 0) {
-      if (isArray(arr)) {
-        arr = arr;
-        arr.forEach((key) => {
-          if (eventAlias(key, callback, obj, $event)) {
-            is = true;
-          }
-        });
-      } else {
-        is = eventAlias(arr, callback, obj, $event);
-      }
+  const items = Array.isArray(arr) ? arr : [arr];
+  for (const key of items) {
+    if (eventAlias(key, callback, obj, $event)) {
+      is = true;
     }
   }
   return is;

package/dist/components/tables/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/tables/index.d.ts

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