pro-design-vue 1.0.0-rc.1 → 1.0.0-rc.11

package/dist/index.full.mjs

@@ -1,6 +1,6 @@
-/*! Pro Design Vue v1.0.0-rc.1 */
+/*! Pro Design Vue v1.0.0-rc.11 */
 
-import { Modal, ConfigProvider, App, Button as Button$1, Tooltip, Popconfirm, Dropdown, Menu, Slider, Drawer, Input, InputNumber, Form as Form$1, Space, Textarea, Select, TreeSelect, Checkbox as Checkbox$1, CheckboxGroup, RadioGroup, Radio as Radio$1, Cascader, Switch, Rate, DatePicker, RangePicker, TimePicker, TimeRangePicker, Upload, theme as theme$1, FormItemRest, Spin, message, Row as Row$1, Col, FormItem as FormItem$3, Steps, Popover, MenuItem, SubMenu, Empty, Badge, Pagination, InputSearch, Tree, Card, Tabs, TabPane } from 'ant-design-vue';
+import { Modal, ConfigProvider, App, Button as Button$1, Tooltip, Popconfirm, Dropdown, Menu, Slider, Drawer, Input, InputNumber, Form as Form$1, Space, Textarea, Select, TreeSelect, Checkbox as Checkbox$1, CheckboxGroup, RadioGroup, Radio as Radio$1, Cascader, Switch, Rate, DatePicker, RangePicker, TimePicker, TimeRangePicker, Upload, theme as theme$1, FormItemRest, Spin, message, Row as Row$1, Col, FormItem as FormItem$3, Steps, Popover, MenuItem, SubMenu, Empty, Badge, Tag, Pagination, InputSearch, Tree, Card, Tabs, TabPane } from 'ant-design-vue';
 import { inject, ref, getCurrentInstance, nextTick, h, reactive, defineComponent, createVNode, isVNode, Fragment, cloneVNode, provide, computed, renderSlot, createPropsRestProxy, createBlock, openBlock, unref, normalizeProps, guardReactiveProps, withCtx, shallowRef, shallowReadonly, toValue, getCurrentScope, onScopeDispose, watch, onMounted, hasInjectionContext, isRef, toRefs as toRefs$1, customRef, toRef as toRef$1, readonly, watchEffect, toRaw, createElementBlock, createCommentVNode, resolveDynamicComponent, mergeProps, createElementVNode, normalizeStyle, toDisplayString, normalizeClass, createSlots, useAttrs, useTemplateRef, defineAsyncComponent, Teleport, onUnmounted, Comment as Comment$1, useSlots, useModel, withModifiers, mergeModels, renderList, camelize, isReactive, onActivated, onDeactivated, onBeforeUnmount, triggerRef, resolveDirective, withDirectives, vShow, render as render$1, resolveComponent, createTextVNode, vModelText } from 'vue';
 
 const INSTALLED_KEY = Symbol("INSTALLED_KEY");
@@ -13,7 +13,7 @@ const ELEMENT_ID_MAIN_CONTENT = `__pro_main_content`;
 const SCROLL_FIXED_CLASS = `_scroll__fixed_`;
 const DEFAULT_NAMESPACE = "pro";
 
-const version$1 = "1.0.0-rc.1";
+const version$1 = "1.0.0-rc.11";
 
 const makeInstaller = (components = []) => {
   const install = (app) => {
@@ -8812,7 +8812,7 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
     transition: { type: null, required: false, default: "linear" },
     useEasing: { type: Boolean, required: false, default: true }
   },
-  emits: ["finished", "onFinished", "onStarted", "started"],
+  emits: ["finished", "started"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -8845,11 +8845,9 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
         duration: props.duration,
         onFinished: () => {
           emit("finished");
-          emit("onFinished");
         },
         onStarted: () => {
           emit("started");
-          emit("onStarted");
         },
         ...props.useEasing ? { transition: TransitionPresets[props.transition] } : {}
       });
@@ -8872,7 +8870,7 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
       }
       return prefix + x1 + x2 + suffix;
     }
-    __expose({ reset });
+    __expose({ start, reset });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(
         "span",
@@ -15753,10 +15751,133 @@ const covertFormName = (namePath) => {
   return isString$1(namePath) ? namePath.indexOf(".") > -1 ? namePath.split(".") : [namePath] : namePath;
 };
 
-const transformKey = (values, paramsOmitNil, parentKey) => {
-  console.log("\u{1F680} ~ transformKey ~ parentKey:", parentKey);
-  console.log("\u{1F680} ~ transformKey ~ paramsOmitNil:", paramsOmitNil);
-  return values;
+function isPlainObj(itemValue) {
+  if (typeof itemValue !== "object") return false;
+  if (itemValue === null) return true;
+  if (isValidElement$1(itemValue)) return false;
+  if (itemValue.constructor === RegExp) return false;
+  if (itemValue instanceof Map) return false;
+  if (itemValue instanceof Set) return false;
+  if (itemValue instanceof HTMLElement) return false;
+  if (itemValue instanceof Blob) return false;
+  if (itemValue instanceof File) return false;
+  if (Array.isArray(itemValue)) return false;
+  return true;
+}
+const transformKeySubmitValue = (values, transformerMap, paramsOmitNil) => {
+  if (Object.keys(values).length < 1) {
+    return values;
+  }
+  if (typeof window === "undefined") return values;
+  if (typeof values !== "object" || isNil(values) || values instanceof Blob) {
+    return values;
+  }
+  let finalValues = Array.isArray(values) ? [] : {};
+  const gen = (tempValues, parentsKey) => {
+    const isArrayValues = Array.isArray(tempValues);
+    let result = isArrayValues ? [] : {};
+    if (tempValues == null || tempValues === void 0) {
+      return result;
+    }
+    Object.keys(tempValues).forEach((entityKey) => {
+      var _a;
+      const transformForArray = (transformList, subItemValue) => {
+        if (!Array.isArray(transformList)) return entityKey;
+        transformList.forEach((transform2, idx) => {
+          if (!transform2) return;
+          const subTransformItem = subItemValue == null ? void 0 : subItemValue[idx];
+          if (typeof transform2 === "function") {
+            subItemValue[idx] = transform2(subItemValue, entityKey, tempValues);
+          }
+          if (typeof transform2 === "object" && !Array.isArray(transform2)) {
+            Object.keys(transform2).forEach((transformArrayItem) => {
+              const subTransformItemValue = subTransformItem == null ? void 0 : subTransformItem[transformArrayItem];
+              if (typeof transform2[transformArrayItem] === "function" && subTransformItemValue) {
+                const res = transform2[transformArrayItem](
+                  subTransformItem[transformArrayItem],
+                  entityKey,
+                  tempValues
+                );
+                subTransformItem[transformArrayItem] = typeof res === "object" ? res[transformArrayItem] : res;
+              } else if (typeof transform2[transformArrayItem] === "object" && Array.isArray(transform2[transformArrayItem]) && subTransformItemValue) {
+                transformForArray(transform2[transformArrayItem], subTransformItemValue);
+              }
+            });
+          }
+          if (typeof transform2 === "object" && Array.isArray(transform2) && subTransformItem) {
+            transformForArray(transform2, subTransformItem);
+          }
+        });
+        return entityKey;
+      };
+      const itemValue = tempValues[entityKey];
+      const transformFunction = (_a = transformerMap.get(entityKey)) == null ? void 0 : _a.transform;
+      const transform = () => {
+        let tempKey, transformedResult, isTransformedResultPrimitive = false;
+        if (typeof transformFunction === "function") {
+          transformedResult = transformFunction == null ? void 0 : transformFunction(itemValue, entityKey, tempValues);
+          const typeOfResult = typeof transformedResult;
+          if (typeOfResult !== "object" && typeOfResult !== "undefined") {
+            tempKey = entityKey;
+            isTransformedResultPrimitive = true;
+          } else {
+            tempKey = transformedResult;
+          }
+        } else {
+          tempKey = transformForArray(transformFunction, itemValue);
+        }
+        if (Array.isArray(tempKey)) {
+          result = set(result, tempKey, itemValue);
+          return;
+        }
+        if (typeof tempKey === "object" && !Array.isArray(finalValues)) {
+          finalValues = merge(finalValues, tempKey);
+        } else if (typeof tempKey === "object" && Array.isArray(finalValues)) {
+          result = { ...result, ...tempKey };
+        } else if (tempKey !== null || tempKey !== void 0) {
+          result = set(
+            result,
+            [tempKey],
+            isTransformedResultPrimitive ? transformedResult : itemValue
+          );
+        }
+      };
+      if (transformFunction && typeof transformFunction === "function") {
+        transform();
+      }
+      if (typeof window === "undefined") return;
+      if (isPlainObj(itemValue)) {
+        const genValues = gen(itemValue);
+        if (Object.keys(genValues).length < 1) {
+          return;
+        }
+        result = set(result, [entityKey], genValues);
+        return;
+      }
+      transform();
+    });
+    return paramsOmitNil ? result : tempValues;
+  };
+  finalValues = Array.isArray(values) && Array.isArray(finalValues) ? [...gen(values)] : merge({}, gen(values), finalValues);
+  return finalValues;
+};
+const convertKeyInitialValue = (values, transformerMap) => {
+  if (Object.keys(values).length < 1) {
+    return values;
+  }
+  const finalValues = {};
+  Object.keys(values).forEach((entityKey) => {
+    var _a;
+    const itemValue = values[entityKey];
+    const convertValueFunction = (_a = transformerMap.get(entityKey)) == null ? void 0 : _a.convertValue;
+    if (typeof convertValueFunction === "function") {
+      const convertResult = convertValueFunction == null ? void 0 : convertValueFunction(itemValue, entityKey);
+      finalValues[entityKey] = convertResult;
+    } else {
+      finalValues[entityKey] = itemValue;
+    }
+  });
+  return finalValues;
 };
 function useAction({
   props,
@@ -15764,6 +15885,7 @@ function useAction({
   formData,
   initialValues,
   hasInitial,
+  transformerMap,
   onFinish,
   onReset,
   onFinishFailed
@@ -15792,20 +15914,20 @@ function useAction({
     if (!namePath) throw new Error("name is require");
     const value = get(formData.value, namePath);
     const obj = set({}, namePath, value);
-    return get(transformKey(obj, props.omitNil, namePath), namePath);
+    return get(transformKeySubmitValue(obj, transformerMap.value, props.omitNil), namePath);
   };
   const getFieldFormatValueObject = (name) => {
     const namePath = covertFormName(name);
     if (!namePath) throw new Error("name is require");
     const value = get(formData.value, namePath);
     const obj = set({}, namePath, value);
-    return transformKey(obj, props.omitNil, namePath);
+    return transformKeySubmitValue(obj, transformerMap.value, props.omitNil);
   };
   const validateFieldsReturnFormatValue = async (nameList) => {
     var _a;
     if (!Array.isArray(nameList) && nameList) throw new Error("nameList must be array");
     const values = await ((_a = formRef.value) == null ? void 0 : _a.validateFields(nameList));
-    const transformedKey = transformKey(values, props.omitNil);
+    const transformedKey = transformKeySubmitValue(values, transformerMap.value, props.omitNil);
     return transformedKey != null ? transformedKey : {};
   };
   const setFieldValue = (name, value) => {
@@ -15831,10 +15953,10 @@ function useAction({
     var _a;
     hasInitial.value = true;
     (_a = formRef.value) == null ? void 0 : _a.clearValidate();
-    formData.value = cloneDeep(initialValues.value);
+    formData.value = cloneDeep(convertKeyInitialValue(initialValues.value, transformerMap.value));
     Promise.resolve().then(() => {
       hasInitial.value = false;
-      onReset == null ? void 0 : onReset(formData.value);
+      onReset == null ? void 0 : onReset(transformKeySubmitValue(formData.value, transformerMap.value, props.omitNil));
     });
   };
   const resetField = (name) => {
@@ -16044,7 +16166,8 @@ var FormItems = /* @__PURE__ */ defineComponent({
         }
         return createVNode(FormItem$2, {
           "key": item.key,
-          "item": item
+          "item": item,
+          "grid": mergeGrid.value
         }, null);
       });
     });
@@ -16198,6 +16321,26 @@ var FormSubmitter = /* @__PURE__ */ defineComponent({
   }
 });
 
+function transformer(items) {
+  const transformerMap = /* @__PURE__ */ new Map();
+  const handler = (items2) => {
+    items2.forEach((item) => {
+      var _a;
+      if (item.name && (item.transform || item.convertValue)) {
+        transformerMap.set(item.name, {
+          transform: item.transform,
+          convertValue: item.convertValue
+        });
+      } else if (item.children) {
+        const children = (_a = runFunction(item.children)) != null ? _a : [];
+        handler(children);
+      }
+    });
+  };
+  handler(items);
+  return transformerMap;
+}
+
 function _isSlot$5(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
@@ -16214,6 +16357,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     attrs
   }) {
     const mountedRef = ref(false);
+    const transformerMap = shallowRef(/* @__PURE__ */ new Map());
     const formRef = ref();
     const prefixCls = usePrefixCls("form");
     const formData = ref({});
@@ -16267,8 +16411,9 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       });
     };
     watch(() => props.items, () => {
-      var _a;
-      formItems.value = formatItems((_a = props.items) != null ? _a : []);
+      var _a, _b;
+      transformerMap.value = transformer((_a = props.items) != null ? _a : []);
+      formItems.value = formatItems((_b = props.items) != null ? _b : []);
     }, {
       immediate: true
     });
@@ -16279,7 +16424,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     } = useInitialValues(props);
     watch(initialValues, (newValues, oldValues) => {
       if (!isEqual(newValues, oldValues)) {
-        formData.value = cloneDeep(newValues);
+        formData.value = cloneDeep(convertKeyInitialValue(newValues, transformerMap.value));
         if (!props.request || props.requestAbort) {
           Promise.resolve().then(() => {
             hasInitial.value = false;
@@ -16291,21 +16436,21 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     });
     const onValuesChange = debounce(() => {
       var _a;
-      (_a = props.onValuesChange) == null ? void 0 : _a.call(props, cloneDeep(formData.value));
+      (_a = props.onValuesChange) == null ? void 0 : _a.call(props, transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil));
     }, 200);
     const onFinish = async () => {
       if (!props.onFinish) return;
-      if (props.showLoading) {
+      if (props.submitOnLoading) {
         if (loading.value) return;
         setloading(true);
       }
       try {
-        const finalValues = cloneDeep(formData.value);
+        const finalValues = transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil);
         await props.onFinish(finalValues);
       } catch (error) {
         console.log("\u{1F680} ~ onFinish ~ error:", error);
       } finally {
-        if (props.showLoading) {
+        if (props.submitOnLoading) {
           setloading(false);
         }
       }
@@ -16324,6 +16469,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       formData,
       initialValues,
       hasInitial,
+      transformerMap,
       onFinish,
       onReset: props.onReset,
       onFinishFailed: props.onFinishFailed
@@ -16371,8 +16517,11 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       var _a, _b, _c;
       mountedRef.value = true;
       requestFormCacheId += 1;
-      const finalValues = (_b = (_a = formRef.value) == null ? void 0 : _a.getFieldsValue) == null ? void 0 : _b.call(_a, true);
-      (_c = props.onInit) == null ? void 0 : _c.call(props, finalValues, action);
+      const finalValues = (_c = (_b = (_a = formRef.value) == null ? void 0 : _a.getFieldsValue) == null ? void 0 : _b.call(_a, true)) != null ? _c : {};
+      Promise.resolve().then(() => {
+        var _a2;
+        (_a2 = props.onInit) == null ? void 0 : _a2.call(props, transformKeySubmitValue(finalValues, transformerMap.value, props.omitNil), action);
+      });
     });
     useProvideForm({
       ...linkage,
@@ -16419,7 +16568,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
         "style": attrs.style
       }), {
         default: () => [createVNode(Spin, {
-          "spinning": requestLoading.value || props.submitOnLoading && loading.value
+          "spinning": props.showLoading && (requestLoading.value || loading.value)
         }, {
           default: () => [createVNode(FormRowWrapper, null, {
             default: () => [createVNode(FormItems, {
@@ -16453,8 +16602,7 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
   emits: ["update:open"],
   setup(props, {
     slots,
-    emit,
-    expose
+    emit
   }) {
     const _open = ref(false);
     const loading = ref(false);
@@ -16462,7 +16610,6 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
     const intl = useIntl();
     const formRef = ref();
     const footerRef = ref(null);
-    const formExpose = useFormExpose(formRef);
     const open = computed({
       get: () => {
         var _a;
@@ -16482,7 +16629,7 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
     });
     const formProps = computed(() => {
       return {
-        ...omitUndefined(omit(props, ["onOpenChange", "closeOnFinish", "drawerProps", "title", "width", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
+        ...omitUndefined(omit(props, ["onOpenChange", "closeOnFinish", "drawerProps", "title", "width", "onInit", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
         layout: "vertical"
       };
     });
@@ -16588,10 +16735,6 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
       }
       return result;
     };
-    expose({
-      formRef,
-      ...formExpose
-    });
     return () => createVNode(Fragment, null, [createVNode(ProDrawer, mergeProps(drawerProps.value, {
       "open": open.value,
       "onAfterOpenChange": (e) => {
@@ -16605,9 +16748,7 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
         closeConfirm(e);
       }
     }), {
-      default: () => [createVNode(BaseForm, mergeProps({
-        "ref": formRef
-      }, formProps.value, {
+      default: () => [createVNode(BaseForm, mergeProps(formProps.value, {
         "submitter": submitterConfig.value,
         "onFinish": async (values) => {
           const result = await onFinishHandle(values);
@@ -16626,6 +16767,11 @@ var DrawerForm = /* @__PURE__ */ defineComponent({
             valuesChanged.value = false;
           }
           (_a = props.onReset) == null ? void 0 : _a.call(props);
+        },
+        "onInit": (values, action) => {
+          var _a;
+          formRef.value = action;
+          (_a = props.onInit) == null ? void 0 : _a.call(props, values, action);
         }
       }), formSlots.value)],
       ...drawerSlots.value,
@@ -16650,8 +16796,7 @@ var ModalForm = /* @__PURE__ */ defineComponent({
   emits: ["update:open"],
   setup(props, {
     slots,
-    emit,
-    expose
+    emit
   }) {
     const _open = ref(false);
     const loading = ref(false);
@@ -16659,7 +16804,6 @@ var ModalForm = /* @__PURE__ */ defineComponent({
     const intl = useIntl();
     const formRef = ref();
     const footerRef = ref(null);
-    const formExpose = useFormExpose(formRef);
     const open = computed({
       get: () => {
         var _a;
@@ -16680,7 +16824,7 @@ var ModalForm = /* @__PURE__ */ defineComponent({
     const formProps = computed(() => {
       var _a;
       return {
-        ...omitUndefined(omit(props, ["onOpenChange", "closeOnFinish", "modalProps", "title", "width", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
+        ...omitUndefined(omit(props, ["onInit", "onOpenChange", "closeOnFinish", "modalProps", "title", "width", "confirmOnValuesChange", "submitTimeout", "onFinish", "submitter"])),
         layout: (_a = props.layout) != null ? _a : "vertical"
       };
     });
@@ -16787,10 +16931,6 @@ var ModalForm = /* @__PURE__ */ defineComponent({
       }
       return result;
     };
-    expose({
-      formRef,
-      ...formExpose
-    });
     return () => createVNode(Fragment, null, [createVNode(ProModal, mergeProps(modalProps.value, {
       "open": open.value,
       "afterClose": () => {
@@ -16804,9 +16944,7 @@ var ModalForm = /* @__PURE__ */ defineComponent({
         closeConfirm(e);
       }
     }), {
-      default: () => [createVNode(BaseForm, mergeProps({
-        "ref": formRef
-      }, formProps.value, {
+      default: () => [createVNode(BaseForm, mergeProps(formProps.value, {
         "submitter": submitterConfig.value,
         "onFinish": async (values) => {
           const result = await onFinishHandle(values);
@@ -16825,6 +16963,11 @@ var ModalForm = /* @__PURE__ */ defineComponent({
             valuesChanged.value = false;
           }
           (_a = props.onReset) == null ? void 0 : _a.call(props);
+        },
+        "onInit": (values, action) => {
+          var _a;
+          formRef.value = action;
+          (_a = props.onInit) == null ? void 0 : _a.call(props, values, action);
         }
       }), formSlots.value)],
       ...modalSlots.value,
@@ -17045,7 +17188,7 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
             firstRowFull = colSpan === 24 && !item.hidden;
           }
           const hidden = item.hidden || // 如果收起了
-          collapsed.value && (firstRowFull || // 如果 超过显示长度 且 总长度超过了 24
+          props.submitter !== false && collapsed.value && (firstRowFull || // 如果 超过显示长度 且 总长度超过了 24
           totalSize.value > showLength.value) && !!index;
           if (hidden) {
             if (!props.preserve) {
@@ -17103,7 +17246,7 @@ var QueryFilter = /* @__PURE__ */ defineComponent({
         justify: "start",
         class: `${prefixCls}-row`
       },
-      "submitOnLoading": false,
+      "showLoading": false,
       "submitter": submitterConfig.value,
       "items": processedList.value,
       "layout": spanSize.value.layout,
@@ -17280,7 +17423,8 @@ var StepsForm = /* @__PURE__ */ defineComponent({
   },
   emits: [],
   setup(props, {
-    slots
+    slots,
+    expose
   }) {
     const intl = useIntl();
     const prefixCls = usePrefixCls("steps-form");
@@ -17446,6 +17590,9 @@ var StepsForm = /* @__PURE__ */ defineComponent({
       regForm,
       onFormFinish
     });
+    expose({
+      formArrayRef
+    });
     return () => createVNode("div", {
       "class": prefixCls
     }, [stepsFormDom.value]);
@@ -18159,7 +18306,8 @@ var _sfc_main$G = /* @__PURE__ */ defineComponent({
     showFixedButton: { type: Boolean, required: false, default: true },
     theme: { type: String, required: true },
     width: { type: Number, required: true },
-    zIndex: { type: Number, required: false, default: 0 }
+    zIndex: { type: Number, required: false, default: 0 },
+    fixed: { type: Boolean, required: false, default: true }
   }, {
     "collapse": { type: Boolean },
     "collapseModifiers": {},
@@ -18296,7 +18444,7 @@ var _sfc_main$G = /* @__PURE__ */ defineComponent({
         Fragment,
         null,
         [
-          _ctx.domVisible ? (openBlock(), createElementBlock(
+          _ctx.domVisible && _ctx.fixed ? (openBlock(), createElementBlock(
             "div",
             {
               key: 0,
@@ -18312,9 +18460,9 @@ var _sfc_main$G = /* @__PURE__ */ defineComponent({
             {
               class: normalizeClass([
                 unref(prefixCls),
-                `${unref(prefixCls)}--fixed`,
                 _ctx.theme,
                 {
+                  [`${unref(prefixCls)}--fixed`]: _ctx.fixed,
                   [`${unref(prefixCls)}--mixed`]: _ctx.isSidebarMixed,
                   [`${unref(prefixCls)}--no-mixed`]: !_ctx.isSidebarMixed
                 }
@@ -18546,6 +18694,7 @@ var _sfc_main$E = /* @__PURE__ */ defineComponent({
     sidebarTheme: { type: String, required: false, default: "light" },
     sidebarWidth: { type: Number, required: false, default: 200 },
     sideCollapseWidth: { type: Number, required: false, default: 60 },
+    sidebarFixed: { type: Boolean, required: false, default: true },
     tabbarEnable: { type: Boolean, required: false, default: true },
     tabbarHeight: { type: Number, required: false, default: 40 },
     zIndex: { type: Number, required: false, default: 200 }
@@ -18881,6 +19030,7 @@ var _sfc_main$E = /* @__PURE__ */ defineComponent({
             "margin-top": sidebarMarginTop.value,
             "mixed-width": _ctx.sidebarMixedWidth,
             show: showSidebar.value,
+            fixed: _ctx.sidebarFixed,
             theme: _ctx.sidebarTheme,
             width: getSidebarWidth.value,
             "z-index": sidebarZIndex.value,
@@ -18905,7 +19055,7 @@ var _sfc_main$E = /* @__PURE__ */ defineComponent({
               ]),
               key: "0"
             } : void 0
-          ]), 1032, ["collapse", "expand-on-hover", "expand-on-hovering", "extra-collapse", "extra-visible", "show-collapse-button", "show-fixed-button", "collapse-width", "dom-visible", "extra-width", "fixed-extra", "header-height", "is-sidebar-mixed", "margin-top", "mixed-width", "show", "theme", "width", "z-index"])) : createCommentVNode("v-if", true),
+          ]), 1032, ["collapse", "expand-on-hover", "expand-on-hovering", "extra-collapse", "extra-visible", "show-collapse-button", "show-fixed-button", "collapse-width", "dom-visible", "extra-width", "fixed-extra", "header-height", "is-sidebar-mixed", "margin-top", "mixed-width", "show", "fixed", "theme", "width", "z-index"])) : createCommentVNode("v-if", true),
           createElementVNode(
             "div",
             {
@@ -20783,6 +20933,22 @@ const columnSort = (columnsMap) => (a, b) => {
   return (a.index || 0) - (b.index || 0);
 };
 
+const flatColumnsHandle = (columns) => {
+  const flatColumns = [];
+  const loopColumns = (columns2) => {
+    columns2.forEach((column) => {
+      var _a;
+      if ((_a = column == null ? void 0 : column.children) == null ? void 0 : _a.length) {
+        loopColumns(column == null ? void 0 : column.children);
+      } else {
+        flatColumns.push(column);
+      }
+    });
+  };
+  loopColumns(columns);
+  return flatColumns;
+};
+
 function useMergedState(defaultStateValue, option) {
   const { defaultValue, value = ref() } = option || {};
   let initValue = typeof defaultStateValue === "function" ? defaultStateValue() : defaultStateValue;
@@ -25613,7 +25779,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
       [`${_ctx.prefixCls}-header-cell-title-inner`]: true
     }),
     title: _ctx.altTitle,
-    style: normalizeStyle(`text-align: ${_ctx.column.align}`)
+    style: normalizeStyle(`justify-content: ${_ctx.column.align}`)
   }, [
     createElementVNode(
       "span",
@@ -28997,6 +29163,15 @@ const BodyCell = (props, { slots, emit }) => {
             status: option.status,
             text: option.text
           });
+        } else if (option.color) {
+          cellValue = createVNode(
+            Tag,
+            {
+              color: option.color,
+              bordered: false
+            },
+            () => option.text
+          );
         } else {
           cellValue = option.text || emptyText;
         }
@@ -30271,6 +30446,7 @@ var _sfc_main$g = defineComponent({
     const tableSlotsContext = useInjectSlots();
     const dragRowPlaceholderRef = ref();
     const bodyRef = ref();
+    const measureDomRef = ref();
     const bodyInnerRef = ref();
     const scrollLayerRef = ref();
     const viewportRef = ref();
@@ -30452,8 +30628,8 @@ var _sfc_main$g = defineComponent({
       };
     });
     const bodyViewportStyle = computed(() => ({
-      // width: `calc(100% + ${tableContext.showVerticalScrollbar.value ? tableContext.scrollBarSize.value || 15 : 0}px)`,
-      width: `calc(100% + 0px)`,
+      width: `calc(100% + ${tableContext.showVerticalScrollbar.value ? tableContext.scrollBarSize.value || 15 : 0}px)`,
+      // width: `calc(100% + 0px)`,
       overflowX: "hidden",
       overflowY: "auto",
       height: "100%"
@@ -30581,6 +30757,12 @@ var _sfc_main$g = defineComponent({
       return summaryStyle.value;
     });
     const emptyStyle = computed(() => ({ width: `${props.bodyWidth}px` }));
+    useResizeObserver(measureDomRef, (entries) => {
+      var _a;
+      const contentRect = (_a = entries[0]) == null ? void 0 : _a.contentRect;
+      emit("update:bodyWidth", (contentRect == null ? void 0 : contentRect.width) || 0);
+      emit("update:bodyHeight", (contentRect == null ? void 0 : contentRect.height) || 0);
+    });
     return {
       bodyContainerStyle,
       measureDomStyle: computed(() => ({
@@ -30631,6 +30813,7 @@ var _sfc_main$g = defineComponent({
         emit("update:bodyScrollWidth", e.detail.width);
       },
       bodyRef,
+      measureDomRef,
       bodyInnerRef,
       viewportRef,
       summaryViewportRef,
@@ -30787,15 +30970,15 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
         /* STABLE */
       }),
-      withDirectives((openBlock(), createElementBlock(
+      createElementVNode(
         "div",
         {
           key: "body",
           ref: "bodyRef",
           class: normalizeClass(_ctx.bodyClass),
           style: normalizeStyle(_ctx.bodyStyle),
-          onDragstart: _cache[9] || (_cache[9] = (...args) => _ctx.handleDragStart && _ctx.handleDragStart(...args)),
-          onKeydown: _cache[10] || (_cache[10] = (...args) => _ctx.handleKeydown && _ctx.handleKeydown(...args))
+          onDragstart: _cache[8] || (_cache[8] = (...args) => _ctx.handleDragStart && _ctx.handleDragStart(...args)),
+          onKeydown: _cache[9] || (_cache[9] = (...args) => _ctx.handleKeydown && _ctx.handleKeydown(...args))
         },
         [
           createElementVNode("div", _hoisted_1$3, [
@@ -31105,24 +31288,22 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
               6
               /* CLASS, STYLE */
             ),
-            withDirectives(createElementVNode(
+            createElementVNode(
               "div",
               {
-                style: normalizeStyle(_ctx.measureDomStyle),
-                onResize: _cache[6] || (_cache[6] = (...args) => _ctx.handleBodyResize && _ctx.handleBodyResize(...args))
+                ref: "measureDomRef",
+                style: normalizeStyle(_ctx.measureDomStyle)
               },
               null,
-              36
-              /* STYLE, NEED_HYDRATION */
-            ), [
-              [_directive_resize]
-            ]),
+              4
+              /* STYLE */
+            ),
             withDirectives(createElementVNode(
               "div",
               {
                 class: normalizeClass(`${_ctx.prefixCls}-body-scroll-measure`),
                 style: normalizeStyle(`min-width: ${_ctx.bodyInnerWidth}px`),
-                onResizewidth: _cache[7] || (_cache[7] = (...args) => _ctx.handleBodyScrollResize && _ctx.handleBodyScrollResize(...args))
+                onResizewidth: _cache[6] || (_cache[6] = (...args) => _ctx.handleBodyScrollResize && _ctx.handleBodyScrollResize(...args))
               },
               null,
               38
@@ -31135,7 +31316,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
               {
                 class: normalizeClass(`${_ctx.prefixCls}-body-inner-measure`),
                 style: normalizeStyle(`min-width: ${_ctx.scrollX}px`),
-                onResizewidth: _cache[8] || (_cache[8] = (...args) => _ctx.handleBodyInnerResize && _ctx.handleBodyInnerResize(...args))
+                onResizewidth: _cache[7] || (_cache[7] = (...args) => _ctx.handleBodyInnerResize && _ctx.handleBodyInnerResize(...args))
               },
               null,
               38
@@ -31150,9 +31331,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
         ],
         38
         /* CLASS, STYLE, NEED_HYDRATION */
-      )), [
-        [_directive_resize, void 0, "height"]
-      ]),
+      ),
       createVNode(_component_RenderSlot, null, {
         default: withCtx(() => [
           _ctx.summary && _ctx.summaryFixed === "bottom" ? (openBlock(), createElementBlock(
@@ -31181,7 +31360,7 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
                       withDirectives((openBlock(), createElementBlock(
                         "div",
                         {
-                          onResizeheight: _cache[11] || (_cache[11] = (...args) => _ctx.handleResize && _ctx.handleResize(...args))
+                          onResizeheight: _cache[10] || (_cache[10] = (...args) => _ctx.handleResize && _ctx.handleResize(...args))
                         },
                         [
                           createVNode(_component_RenderVNode, { vnode: _ctx.summary }, null, 8, ["vnode"])
@@ -31634,6 +31813,9 @@ var _sfc_main$f = defineComponent({
     const showHorizontalScrollbar = ref(false);
     const debounceFn = debounce(() => {
       showHorizontalScrollbar.value = bodyMaxWidth.value > bodyWidth.value;
+      if (bodyWidth.value > bodyScrollWidth.value) {
+        bodyScrollWidth.value = bodyWidth.value;
+      }
     }, 100);
     watch([bodyMaxWidth, bodyWidth], () => {
       debounceFn();
@@ -33353,25 +33535,10 @@ var Alert = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$3]]
 function _isSlot$3(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
-const flatColumnsHandle = (columns) => {
-  const flatColumns = [];
-  const loopColumns = (columns2) => {
-    columns2.forEach((column) => {
-      var _a;
-      if ((_a = column == null ? void 0 : column.children) == null ? void 0 : _a.length) {
-        loopColumns(column == null ? void 0 : column.children);
-      } else {
-        flatColumns.push(column);
-      }
-    });
-  };
-  loopColumns(columns);
-  return flatColumns;
-};
 var FormRender = /* @__PURE__ */ defineComponent({
   props: {
     prefixCls: String,
-    columns: {
+    items: {
       type: Array,
       default: () => []
     },
@@ -33385,6 +33552,7 @@ var FormRender = /* @__PURE__ */ defineComponent({
     },
     loading: Boolean,
     manual: Boolean,
+    tableShowCard: Boolean,
     beforeSearchSubmit: {
       type: Function,
       default: (searchParams) => searchParams
@@ -33409,25 +33577,6 @@ var FormRender = /* @__PURE__ */ defineComponent({
   setup: (props) => {
     var _a, _b, _c;
     const activeTabKey = ref(((_a = props.search) == null ? void 0 : _a.cardProps) !== false ? (_c = (_b = props.search) == null ? void 0 : _b.cardProps) == null ? void 0 : _c.activeTabKey : "");
-    const formItems = computed(() => {
-      var _a2, _b2, _c2;
-      if ((_b2 = (_a2 = props.search) == null ? void 0 : _a2.items) == null ? void 0 : _b2.length) {
-        return (_c2 = props.search) == null ? void 0 : _c2.items;
-      }
-      return flatColumnsHandle(props.columns).filter((item) => {
-        if (item.hideInSearch) {
-          return false;
-        }
-        return true;
-      }).map((item) => {
-        return {
-          ...item,
-          width: void 0,
-          tooltip: item.headerTooltip,
-          name: item.dataIndex
-        };
-      });
-    });
     const cardProps = computed(() => {
       var _a2, _b2;
       if (!((_a2 = props.search) == null ? void 0 : _a2.cardProps)) {
@@ -33458,14 +33607,15 @@ var FormRender = /* @__PURE__ */ defineComponent({
       (_e = (_d = cardProps.value) == null ? void 0 : _d.onTabChange) == null ? void 0 : _e.call(_d, key);
     };
     return () => {
-      var _a2, _b2, _c2;
+      var _a2, _b2, _c2, _d;
       const searchDom = createVNode(ProQueryFilter, mergeProps({
         "class": `${props.prefixCls}-form`
       }, omit(props.search || {}, ["cardProps", "tabName"]), {
-        "items": formItems.value,
+        "items": props.items,
         "loading": props.loading,
         "style": {
-          marginBlockEnd: ((_a2 = props.search) == null ? void 0 : _a2.cardProps) !== false ? 0 : "40px"
+          marginBlockEnd: ((_a2 = props.search) == null ? void 0 : _a2.cardProps) !== false && props.tableShowCard ? 0 : "30px",
+          ...(_b2 = props.search) == null ? void 0 : _b2.style
         },
         "onReset": props.onReset,
         "onFinish": (values) => {
@@ -33482,7 +33632,7 @@ var FormRender = /* @__PURE__ */ defineComponent({
           submit(values, true);
         }
       }), null);
-      if (((_b2 = props.search) == null ? void 0 : _b2.cardProps) !== false) {
+      if (((_c2 = props.search) == null ? void 0 : _c2.cardProps) !== false && props.tableShowCard) {
         return createVNode(Card, mergeProps({
           "class": `${props.prefixCls}-search`,
           "activeTabKey": activeTabKey.value,
@@ -33490,7 +33640,7 @@ var FormRender = /* @__PURE__ */ defineComponent({
           "style": {
             marginBlockEnd: "16px"
           }
-        }, omit((_c2 = cardProps.value) != null ? _c2 : {}, ["onTabChange", "activeTabKey"]), {
+        }, omit((_d = cardProps.value) != null ? _d : {}, ["onTabChange", "activeTabKey"]), {
           "onTabChange": onTabChange
         }), _isSlot$3(searchDom) ? searchDom : {
           default: () => [searchDom]
@@ -33632,6 +33782,28 @@ var Table = /* @__PURE__ */ defineComponent({
       };
       return loopFilter(tableColumn.value);
     });
+    const formItems = computed(() => {
+      var _a2, _b, _c;
+      if (!props.search) {
+        return [];
+      }
+      if ((_b = (_a2 = props.search) == null ? void 0 : _a2.items) == null ? void 0 : _b.length) {
+        return (_c = props.search) == null ? void 0 : _c.items;
+      }
+      return flatColumnsHandle(props.columns).filter((item) => {
+        if (item.hideInSearch) {
+          return false;
+        }
+        return true;
+      }).map((item) => {
+        return {
+          ...item,
+          width: void 0,
+          tooltip: item.headerTooltip,
+          name: item.dataIndex
+        };
+      });
+    });
     const preserveRecordsRef = ref(/* @__PURE__ */ new Map());
     const getRowKey = computed(() => typeof props.rowKey == "function" ? props.rowKey : (record) => {
       return record == null ? void 0 : record[props.rowKey || "id"];
@@ -33679,7 +33851,8 @@ var Table = /* @__PURE__ */ defineComponent({
     };
     const hideToolbar = computed(() => props.options === false && !props.title && !slots.title && !slots.toolbar && !slots.searchExtra && !slots.toolbarActions);
     const notNeedCardDom = computed(() => {
-      if (props.search === false && props.toolBar === false) {
+      var _a2;
+      if ((props.search === false || !((_a2 = formItems.value) == null ? void 0 : _a2.length)) && props.toolBar === false) {
         return true;
       }
       return false;
@@ -33746,7 +33919,7 @@ var Table = /* @__PURE__ */ defineComponent({
       reset
     });
     return () => {
-      var _a2, _b;
+      var _a2, _b, _c;
       const {
         expandIcon = slots.expandIcon,
         expandedRowRender = slots.expandedRowRender
@@ -33815,11 +33988,12 @@ var Table = /* @__PURE__ */ defineComponent({
       }, attrs, {
         "class": [`${mergedPrefixCls.value}-wrapper ${props.bordered ? mergedPrefixCls.value + "-wrapper-bordered" : ""} ${"dark" === theme.value ? mergedPrefixCls.value + "-wrapper-dark" : ""} ${pollingLoading.value ? mergedPrefixCls.value + "-wrapper-polling" : ""}`, attrs.class],
         "onKeydown": onKeydown
-      }), [props.search !== false && createVNode(FormRender, {
+      }), [props.search !== false && !!((_c = formItems.value) == null ? void 0 : _c.length) && createVNode(FormRender, {
         "prefixCls": mergedPrefixCls.value,
-        "columns": props.columns,
+        "items": formItems.value,
         "cardBordered": props.cardBordered,
         "search": props.search,
+        "tableShowCard": props.cardProps !== false,
         "loading": formSubmitLoading.value,
         "beforeSearchSubmit": props.beforeSearchSubmit,
         "manual": props.manual,
@@ -34663,6 +34837,10 @@ var FormColWrapper = /* @__PURE__ */ defineComponent({
     colProps: {
       type: Object,
       default: void 0
+    },
+    grid: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup(props, {
@@ -34676,9 +34854,13 @@ var FormColWrapper = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.colProps) != null ? _a : colProps == null ? void 0 : colProps.value;
     });
+    const mergeGrid = computed(() => {
+      var _a;
+      return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+    });
     return () => {
       var _a;
-      if (grid == null ? void 0 : grid.value) {
+      if (mergeGrid.value) {
         return createVNode(Col, mergeColProps.value, {
           default: () => {
             var _a2;
@@ -34844,25 +35026,18 @@ var FormGroup$1 = /*#__PURE__*/Object.freeze({
 function useFieldValue({
   namePath,
   initialValue,
-  convertValue,
-  transform
+  convertValue
 }) {
   const fieldValue = shallowRef();
-  const { formData, initialValues, mountedRef } = useInjectForm();
+  const { formData, initialValues } = useInjectForm();
   const modelValue = computed(() => get(formData.value, namePath.value));
   const onValueChange = (value) => {
-    set(
-      formData.value,
-      namePath.value,
-      transform ? transform(value, namePath.value, formData.value) : value
-    );
+    set(formData.value, namePath.value, value);
   };
   watch(
     modelValue,
     (newValue) => {
-      fieldValue.value = cloneDeep(
-        convertValue ? convertValue(newValue, namePath.value) : newValue
-      );
+      fieldValue.value = cloneDeep(newValue);
     },
     {
       immediate: true,
@@ -34871,11 +35046,14 @@ function useFieldValue({
   );
   const initFieldInitialValue = () => {
     var _a;
-    if (!mountedRef.value && typeof modelValue.value === "undefined" && typeof initialValue !== "undefined") {
-      const value = transform ? transform(initialValue, namePath.value, formData.value) : initialValue;
+    if (
+      // !mountedRef.value &&
+      typeof modelValue.value === "undefined" && typeof initialValue !== "undefined"
+    ) {
+      const value = convertValue ? convertValue(initialValue, namePath.value) : initialValue;
       set(formData.value, namePath.value, cloneDeep(value));
-      set((_a = initialValues == null ? void 0 : initialValues.value) != null ? _a : {}, namePath.value, cloneDeep(value));
-      fieldValue.value = convertValue ? convertValue(initialValue, namePath.value) : initialValue;
+      set((_a = initialValues == null ? void 0 : initialValues.value) != null ? _a : {}, namePath.value, cloneDeep(initialValue));
+      fieldValue.value = value;
     }
   };
   initFieldInitialValue();
@@ -36415,6 +36593,10 @@ var FormItem = /* @__PURE__ */ defineComponent({
     item: {
       type: Object,
       default: () => ({})
+    },
+    grid: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup(props) {
@@ -36449,6 +36631,10 @@ var FormItem = /* @__PURE__ */ defineComponent({
       transform: props.item.transform
     });
     const fieldRef = ref();
+    const mergeGrid = computed(() => {
+      var _a;
+      return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+    });
     const fieldType = computed(() => {
       var _a;
       return (_a = props.item.fieldType) != null ? _a : "text";
@@ -36531,7 +36717,7 @@ var FormItem = /* @__PURE__ */ defineComponent({
       };
       if (props.item.width && !fieldWidthSizeMap[props.item.width]) {
         newStyle.width = isNumber$2(props.item.width) ? props.item.width + "px" : props.item.width;
-      } else if (grid == null ? void 0 : grid.value) {
+      } else if (mergeGrid == null ? void 0 : mergeGrid.value) {
         newStyle.maxWidth = "100%";
         newStyle.width = "100%";
       }
@@ -36626,7 +36812,8 @@ var FormItem = /* @__PURE__ */ defineComponent({
       const render = getSlot(props.item.render, formSlotsContext);
       if (render) {
         return createVNode(FormColWrapper, {
-          "colProps": props.item.colProps
+          "colProps": props.item.colProps,
+          "grid": mergeGrid.value
         }, {
           default: () => [createVNode(RenderVNode$1, {
             "vnode": render,
@@ -36673,7 +36860,8 @@ var FormItem = /* @__PURE__ */ defineComponent({
         }, null)]);
       }
       return createVNode(FormColWrapper, {
-        "colProps": props.item.colProps
+        "colProps": props.item.colProps,
+        "grid": mergeGrid.value
       }, {
         default: () => [createVNode(Form$1.Item, restItemProps.value, {
           default: () => [defaultDom],