@weitutech/by-components-v3 1.1.19 → 1.1.21

package/dist/by-component-v3.js

@@ -120294,17 +120294,43 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       const setDraggableMenu = (arr) => {
         const left = { title: "左固定", field: "left", children: [] };
         const right = { title: "右固定", field: "right", children: [] };
-        const filteredArr = arr.filter((item) => {
-          if (!item.children && item.fixed === "left") {
-            left.children.push(item);
-            return false;
+        const filteredArr = arr.reduce((result, item) => {
+          if (!item.children || item.children.length === 0) {
+            if (item.fixed === "left") {
+              left.children.push(item);
+              return result;
+            }
+            if (item.fixed === "right") {
+              right.children.push(item);
+              return result;
+            }
+            result.push(item);
+            return result;
           }
-          if (!item.children && item.fixed === "right") {
-            right.children.push(item);
-            return false;
+          const defaultDirection = item.fixed === "left" || item.fixed === "right" ? item.fixed : "";
+          const remainedChildren = [];
+          item.children.forEach((child) => {
+            const direction2 = child.fixed === "left" || child.fixed === "right" ? child.fixed : defaultDirection;
+            if (direction2 === "left" || direction2 === "right") {
+              const fixedGroup = direction2 === "left" ? left : right;
+              fixedGroup.children.push({
+                ...child,
+                fixed: direction2,
+                parentColTitle: child.parentColTitle || item.title
+              });
+              return;
+            }
+            remainedChildren.push(child);
+          });
+          if (remainedChildren.length > 0) {
+            result.push({
+              ...item,
+              fixed: void 0,
+              children: remainedChildren
+            });
           }
-          return true;
-        });
+          return result;
+        }, []);
         return [left, right, ...filteredArr];
       };
       if (bePreservedColumn && bePreservedColumn.length > 0) {
@@ -120777,7 +120803,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CustomColumn = /* @__PURE__ */ _export_sfc$1(_sfc_main$3, [["__scopeId", "data-v-9bcdfbf0"]]);
+const CustomColumn = /* @__PURE__ */ _export_sfc$1(_sfc_main$3, [["__scopeId", "data-v-c41a9a02"]]);
 const isCachedTableColumns = (name) => {
   if (!name) return false;
   return !!localStorage.getItem(name);
@@ -121080,14 +121106,19 @@ const ByTable = /* @__PURE__ */ defineComponent({
       CustomColumnRef.value.dialogVisible = true;
     };
     const changeTableFields = (cols) => {
+      var _a2, _b;
       const noFixedCol = cols.filter((col) => !col.field);
-      const result = JSON.parse(JSON.stringify([...cols.filter((col) => col.field === "left")[0].children.map((child) => ({
+      const isVisibleColumn = (col) => col.type === "true" || col.type === true;
+      const leftFixedChildren = (((_a2 = cols.filter((col) => col.field === "left")[0]) == null ? void 0 : _a2.children) || []).filter((child) => isVisibleColumn(child)).map((child) => ({
         ...child,
         fixed: "left"
-      })), ...noFixedCol, ...cols.filter((col) => col.field === "right")[0].children.map((child) => ({
+      }));
+      const rightFixedChildren = (((_b = cols.filter((col) => col.field === "right")[0]) == null ? void 0 : _b.children) || []).filter((child) => isVisibleColumn(child)).map((child) => ({
         ...child,
         fixed: "right"
-      }))]));
+      }));
+      const visibleNoFixedCols = noFixedCol.filter((col) => isVisibleColumn(col));
+      const result = JSON.parse(JSON.stringify([...leftFixedChildren, ...visibleNoFixedCols, ...rightFixedChildren]));
       const slots2 = props2.gridOptions.customColumnConfig.slots;
       result.forEach((item) => {
         delete item.type;
@@ -121097,7 +121128,7 @@ const ByTable = /* @__PURE__ */ defineComponent({
           };
         }
         if (item.children && item.children.length > 0) {
-          item.children = item.children.filter((col) => col.type === "true" || col.type === true);
+          item.children = item.children.filter((col) => isVisibleColumn(col));
           item.children.forEach((child) => {
             if (slots2.includes(child.field)) {
               child.slots = {