@weitutech/by-components-v3 1.1.6 → 1.1.8

package/dist/by-component-v3.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createVNode, mergeProps, createElementVNode, Fragment, renderList, normalizeClass, toDisplayString, watch, createTextVNode, useSlots, toRefs, computed, createBlock, unref, createCommentVNode, isVNode, reactive, inject, provide, h as h$1, onUnmounted, nextTick, onBeforeUnmount, TransitionGroup, Teleport, onActivated, onDeactivated, getCurrentInstance, getCurrentScope, onScopeDispose, readonly, isRef, warn as warn$1, renderSlot, Transition, withCtx, withDirectives, normalizeStyle, vShow, shallowReactive, resolveDynamicComponent, withModifiers, render, createApp } from "vue";
+import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createVNode, mergeProps, createElementVNode, Fragment, renderList, normalizeClass, toDisplayString, watch, createTextVNode, useSlots, toRefs, computed, createBlock, unref, createCommentVNode, nextTick, isVNode, reactive, inject, provide, h as h$1, onUnmounted, onBeforeUnmount, TransitionGroup, Teleport, onActivated, onDeactivated, getCurrentInstance, getCurrentScope, onScopeDispose, readonly, isRef, warn as warn$1, renderSlot, Transition, withCtx, withDirectives, normalizeStyle, vShow, shallowReactive, resolveDynamicComponent, withModifiers, render, createApp } from "vue";
 function cloneDeep(obj) {
   if (obj === null || typeof obj !== "object") {
     return obj;
@@ -4770,7 +4770,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       var _a2;
       emit("update:modelValue", cloneDeep(initialFormValues.value));
       (_a2 = formRef.value) == null ? void 0 : _a2.resetFields();
-      emit("reset");
+      nextTick(() => {
+        emit("reset");
+      });
     };
     __expose({
       formRef,
@@ -4787,7 +4789,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ZshForm = /* @__PURE__ */ _export_sfc$1(_sfc_main$5, [["__scopeId", "data-v-85f37128"]]);
+const ZshForm = /* @__PURE__ */ _export_sfc$1(_sfc_main$5, [["__scopeId", "data-v-a0f0149d"]]);
 const _hoisted_1$1 = {
   id: "pager",
   class: "pager fixed bottom-0 right-0 w-full flex justify-center items-center z-50"
@@ -36802,14 +36804,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 const CustomColumn = /* @__PURE__ */ _export_sfc$1(_sfc_main, [["__scopeId", "data-v-0dadba78"]]);
 const isCachedTableColumns = (name) => {
   if (!name) return false;
-  const cachedData = localStorage.getItem(name);
-  if (!cachedData) return false;
-  try {
-    const parsedData = JSON.parse(cachedData);
-    return Array.isArray(parsedData) && parsedData.length > 0;
-  } catch (e) {
-    return false;
-  }
+  return !!localStorage.getItem(name);
 };
 const removeCachedTableColumns = (name) => {
   localStorage.removeItem(name);
@@ -36890,6 +36885,27 @@ const replaceColumnWidthToColumns = (name, columns) => {
   };
   return processColumnWidth(columns, cacheColumns);
 };
+const rewriteWidthColumns = (fromColumns, toColumns) => {
+  if (!fromColumns || !toColumns) return [];
+  if (!fromColumns || fromColumns.length === 0) return toColumns;
+  const result = [];
+  for (const col of toColumns) {
+    const fromCol = fromColumns.find((from2) => from2.field === col.field);
+    if (col.children) {
+      result.push({
+        ...col,
+        ...(fromCol == null ? void 0 : fromCol.width) && { width: fromCol.width },
+        children: rewriteWidthColumns((fromCol == null ? void 0 : fromCol.children) || [], col.children)
+      });
+    } else {
+      result.push({
+        ...col,
+        ...(fromCol == null ? void 0 : fromCol.width) && { width: fromCol.width }
+      });
+    }
+  }
+  return result;
+};
 const events = ["keydown", "current-change", "radio-change", "checkbox-change", "checkbox-all", "checkbox-range-start", "checkbox-range-change", "checkbox-range-end", "cell-dblclick", "cell-menu", "cell-mouseenter", "cell-mouseleave", "cell-delete-value", "header-cell-click", "header-cell-dblclick", "header-cell-menu", "footer-cell-click", "footer-cell-dblclick", "footer-cell-menu", "clear-merge", "sort-change", "clear-sort", "filter-visible", "filter-change", "clear-filter", "toggle-row-expand", "toggle-tree-expand", "menu-click", "cell-selected", "edit-closed", "edit-activated", "edit-disabled", "valid-error", "scroll", "custom", "page-change", "form-submit", "form-submit-invalid", "form-reset", "form-collapse", "proxy-query", "proxy-delete", "proxy-save", "toolbar-button-click", "toolbar-tool-click", "zoom", "cell-click"];
 const capitalizeFirstLetter = (str) => {
   return str.charAt(0).toUpperCase() + str.slice(1);
@@ -36958,17 +36974,19 @@ const ByTable = /* @__PURE__ */ defineComponent({
         }
       };
     });
-    watch(() => props.gridOptions.columns, (newColumns) => {
-      originColumns.value = deepClone(newColumns);
-    }, {
-      deep: true
-    });
     const listeners = ref({});
     const CustomColumnRef = ref();
     const vxeGridRef = ref();
     const showResetCache = ref(false);
     const hasCache = ref(false);
     const originColumns = ref([]);
+    const tempColumns = ref([]);
+    watch(() => props.gridOptions.columns, (newColumns) => {
+      const result = rewriteWidthColumns(tempColumns.value, newColumns);
+      originColumns.value = result;
+    }, {
+      deep: true
+    });
     onMounted(() => {
       showResetCache.value = !!props.name;
       originColumns.value = deepClone(props.gridOptions.columns);
@@ -36978,6 +36996,9 @@ const ByTable = /* @__PURE__ */ defineComponent({
       console.log(listeners.value, "listeners");
     });
     const handlePagerChange = (context) => {
+      if (vxeGridRef.value) {
+        vxeGridRef.value.scrollTo(0, 0);
+      }
       emit("pageChange", context);
     };
     const copy = (text) => {
@@ -37062,6 +37083,7 @@ const ByTable = /* @__PURE__ */ defineComponent({
           }
         }
       }
+      tempColumns.value = deepClone(result);
       const newColumns = replaceColumnWidthToColumns(props.name, result);
       setHasCache();
       emit("setColumns", newColumns);