ele-admin-plus 1.4.1-beta.1 → 1.5.0-beta.1

package/es/ele-pro-form/components/item-type-data.js

@@ -91,32 +91,23 @@ const defaultItemTypeData = [
     type: "tabs",
     component: markRaw(EleTabs),
     isContainer: true,
-    defaultProps: ({ item, modelValue }) => {
-      var _a, _b;
-      return {
-        type: "border-card",
-        modelValue: modelValue ?? ((_b = (_a = item.children) == null ? void 0 : _a[0]) == null ? void 0 : _b.prop)
-      };
-    },
+    defaultProps: ({ item, modelValue }) => ({
+      type: "border-card",
+      modelValue: modelValue ?? item.children?.[0]?.prop
+    }),
     reservedProps: ({ item, isShowFormItem }) => ({
-      items: (item.children || []).filter((c) => isShowFormItem(c)).map((c) => {
-        var _a, _b, _c, _d, _e;
-        return {
-          name: ((_a = c.props) == null ? void 0 : _a.name) ?? c.prop,
-          label: ((_b = c.props) == null ? void 0 : _b.label) ?? c.label,
-          disabled: (_c = c.props) == null ? void 0 : _c.disabled,
-          closable: (_d = c.props) == null ? void 0 : _d.closable,
-          lazy: (_e = c.props) == null ? void 0 : _e.lazy,
-          slot: "itemContent",
-          meta: c
-        };
-      })
+      items: (item.children || []).filter((c) => isShowFormItem(c)).map((c) => ({
+        name: c.props?.name ?? c.prop,
+        label: c.props?.label ?? c.label,
+        disabled: c.props?.disabled,
+        closable: c.props?.closable,
+        lazy: c.props?.lazy,
+        slot: "itemContent",
+        meta: c
+      }))
     }),
     reservedSlots: ({ renderChildren }) => ({
-      itemContent: (slotProps) => {
-        var _a;
-        return renderChildren((_a = slotProps == null ? void 0 : slotProps.item) == null ? void 0 : _a.meta, false, true);
-      },
+      itemContent: (slotProps) => renderChildren(slotProps?.item?.meta, false, true),
       default: () => void 0
     })
   },
@@ -149,12 +140,9 @@ const defaultItemTypeData = [
     component: markRaw(ElCollapse),
     isContainer: true,
     sortDisabled: true,
-    defaultProps: ({ item, modelValue }) => {
-      var _a, _b, _c, _d, _e, _f;
-      return {
-        modelValue: modelValue ?? (((_a = item.props) == null ? void 0 : _a.accordion) ? ((_d = (_c = (_b = item.children) == null ? void 0 : _b[0]) == null ? void 0 : _c.props) == null ? void 0 : _d.name) ?? ((_f = (_e = item.children) == null ? void 0 : _e[0]) == null ? void 0 : _f.prop) : [])
-      };
-    },
+    defaultProps: ({ item, modelValue }) => ({
+      modelValue: modelValue ?? (item.props?.accordion ? item.children?.[0]?.props?.name ?? item.children?.[0]?.prop : [])
+    }),
     reservedProps: ({ updateModelValue }) => ({
       "onUpdate:modelValue": updateModelValue
     })
@@ -216,9 +204,8 @@ const defaultItemTypeData = [
   {
     type: "input",
     component: markRaw(ElInput),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -229,9 +216,8 @@ const defaultItemTypeData = [
   {
     type: "textarea",
     component: markRaw(ElInput),
-    defaultProps: ({ item }) => ({
-      rows: 4,
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      rows: 4
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       type: "textarea",
@@ -243,10 +229,9 @@ const defaultItemTypeData = [
   {
     type: "select",
     component: markRaw(EleSelect),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -256,10 +241,9 @@ const defaultItemTypeData = [
   {
     type: "multipleSelect",
     component: markRaw(EleSelect),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -304,10 +288,9 @@ const defaultItemTypeData = [
   {
     type: "date",
     component: markRaw(ElDatePicker),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      valueFormat: "YYYY-MM-DD",
-      placeholder: `请选择${item.label ?? ""}`
+      valueFormat: "YYYY-MM-DD"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -317,10 +300,9 @@ const defaultItemTypeData = [
   {
     type: "datetime",
     component: markRaw(ElDatePicker),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      valueFormat: "YYYY-MM-DD HH:mm:ss",
-      placeholder: `请选择${item.label ?? ""}`
+      valueFormat: "YYYY-MM-DD HH:mm:ss"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       type: "datetime",
@@ -335,8 +317,6 @@ const defaultItemTypeData = [
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD",
       rangeSeparator: "-",
-      startPlaceholder: "开始日期",
-      endPlaceholder: "结束日期",
       unlinkPanels: true,
       type: "daterange"
     }),
@@ -352,8 +332,6 @@ const defaultItemTypeData = [
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD HH:mm:ss",
       rangeSeparator: "-",
-      startPlaceholder: "开始日期",
-      endPlaceholder: "结束日期",
       unlinkPanels: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -365,10 +343,9 @@ const defaultItemTypeData = [
   {
     type: "time",
     component: markRaw(ElTimePicker),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      valueFormat: "HH:mm:ss",
-      placeholder: `请选择${item.label ?? ""}`
+      valueFormat: "HH:mm:ss"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -381,9 +358,7 @@ const defaultItemTypeData = [
     defaultProps: () => ({
       class: "ele-fluid",
       valueFormat: "HH:mm:ss",
-      rangeSeparator: "-",
-      startPlaceholder: "开始日期",
-      endPlaceholder: "结束日期"
+      rangeSeparator: "-"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       isRange: true,
@@ -394,9 +369,8 @@ const defaultItemTypeData = [
   {
     type: "timeSelect",
     component: markRaw(ElTimeSelect),
-    defaultProps: ({ item }) => ({
-      class: "ele-fluid",
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      class: "ele-fluid"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -418,10 +392,9 @@ const defaultItemTypeData = [
   {
     type: "inputNumber",
     component: markRaw(ElInputNumber),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      controlsPosition: "right",
-      placeholder: `请输入${item.label ?? ""}`
+      controlsPosition: "right"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -431,9 +404,8 @@ const defaultItemTypeData = [
   {
     type: "autocomplete",
     component: markRaw(EleAutocomplete),
-    defaultProps: ({ item }) => ({
-      class: "ele-fluid",
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      class: "ele-fluid"
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -443,10 +415,9 @@ const defaultItemTypeData = [
   {
     type: "cascader",
     component: markRaw(EleCascader),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -456,10 +427,9 @@ const defaultItemTypeData = [
   {
     type: "multipleCascader",
     component: markRaw(EleCascader),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -495,9 +465,8 @@ const defaultItemTypeData = [
   {
     type: "mention",
     component: markRaw(EleMention),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请输入${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -523,10 +492,9 @@ const defaultItemTypeData = [
   {
     type: "treeSelect",
     component: markRaw(EleSelectTree),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -536,11 +504,10 @@ const defaultItemTypeData = [
   {
     type: "treeMultipleSelect",
     component: markRaw(EleSelectTree),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       class: "ele-fluid",
       clearable: true,
-      showCheckbox: true,
-      placeholder: `请选择${item.label ?? ""}`
+      showCheckbox: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -551,9 +518,8 @@ const defaultItemTypeData = [
   {
     type: "virtualTreeSelect",
     component: markRaw(EleTreeSelect),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -563,10 +529,9 @@ const defaultItemTypeData = [
   {
     type: "virtualTreeMultipleSelect",
     component: markRaw(EleTreeSelect),
-    defaultProps: ({ item }) => ({
+    defaultProps: () => ({
       clearable: true,
-      maxTagCount: 1,
-      placeholder: `请选择${item.label ?? ""}`
+      maxTagCount: 1
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -577,9 +542,8 @@ const defaultItemTypeData = [
   {
     type: "tableSelect",
     component: markRaw(EleTableSelect),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -589,9 +553,8 @@ const defaultItemTypeData = [
   {
     type: "tableMultipleSelect",
     component: markRaw(EleTableSelect),
-    defaultProps: ({ item }) => ({
-      clearable: true,
-      placeholder: `请选择${item.label ?? ""}`
+    defaultProps: () => ({
+      clearable: true
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,

package/es/ele-pro-form/components/pro-form-footer.d.ts

@@ -2,8 +2,14 @@ import { CSSProperties, PropType } from 'vue';
 import { ElFormItemProps, ElButtonProps, ElLinkProps } from '../../ele-app/el';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
-    footer?(_: {}): any;
-    footerExtra?(_: {}): any;
+    footer?(_: {
+        submitForm: () => void;
+        resetForm: () => void;
+    }): any;
+    footerExtra?(_: {
+        submitForm: () => void;
+        resetForm: () => void;
+    }): any;
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 底栏 ElFormItem 属性 */

package/es/ele-pro-form/components/pro-form-footer.js

@@ -52,21 +52,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("reset");
     };
     return (_ctx, _cache) => {
-      var _a, _b;
       return openBlock(), createBlock(unref(ElFormItem), mergeProps({
-        class: [
-          "ele-pro-form-footer",
-          { "is-search-expand": __props.autoFooterCol && __props.searchExpand }
-        ]
+        class: ["ele-pro-form-footer", { "is-search-expand": __props.autoFooterCol && __props.searchExpand }]
       }, __props.footerProps || {}, {
-        labelWidth: typeof ((_a = __props.footerProps) == null ? void 0 : _a.labelWidth) === "number" ? `${__props.footerProps.labelWidth}px` : (_b = __props.footerProps) == null ? void 0 : _b.labelWidth
+        labelWidth: typeof __props.footerProps?.labelWidth === "number" ? `${__props.footerProps.labelWidth}px` : __props.footerProps?.labelWidth
       }), createSlots({
         default: withCtx(() => [
           createElementVNode("div", {
             class: "ele-pro-form-footer-body",
             style: normalizeStyle(__props.footerStyle)
           }, [
-            renderSlot(_ctx.$slots, "footer", {}, () => [
+            renderSlot(_ctx.$slots, "footer", {
+              submitForm: handleSubmit,
+              resetForm: handleReset
+            }, () => [
               createVNode(unref(ElButton), mergeProps({ type: "primary" }, __props.submitButtonProps || {}, { onClick: handleSubmit }), {
                 default: withCtx(() => [
                   createTextVNode(toDisplayString(__props.submitText), 1)
@@ -84,12 +83,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               key: 0,
               type: "primary",
               underline: "never",
-              style: { "margin-left": "12px" }
+              style: { marginLeft: "12px" }
             }, __props.searchExpandButtonProps || {}, { onClick: toggleSearchExpand }), {
               default: withCtx(() => [
                 __props.searchExpand ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                   createElementVNode("span", null, toDisplayString(__props.searchShrinkText), 1),
-                  createVNode(unref(ElIcon), { style: { "vertical-align": "-1px" } }, {
+                  createVNode(unref(ElIcon), { style: { verticalAlign: "-1px" } }, {
                     default: withCtx(() => [
                       createVNode(unref(ArrowUp))
                     ]),
@@ -97,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   })
                 ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                   createElementVNode("span", null, toDisplayString(__props.searchExpandText), 1),
-                  createVNode(unref(ElIcon), { style: { "vertical-align": "-2px" } }, {
+                  createVNode(unref(ElIcon), { style: { verticalAlign: "-2px" } }, {
                     default: withCtx(() => [
                       createVNode(unref(ArrowDown))
                     ]),
@@ -107,7 +106,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 16)) : createCommentVNode("", true),
-            renderSlot(_ctx.$slots, "footerExtra")
+            renderSlot(_ctx.$slots, "footerExtra", {
+              submitForm: handleSubmit,
+              resetForm: handleReset
+            })
           ], 4)
         ]),
         _: 2
@@ -117,9 +119,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           __props.footerSlots,
           ["default"],
           ownSlots
-        ), (slotName, name) => {
+        ), (slotName, compSlotName) => {
           return {
-            name,
+            name: compSlotName,
             fn: withCtx((slotProps) => [
               renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(slotProps || {})))
             ])

package/es/ele-pro-form/components/render-util.js

@@ -15,9 +15,8 @@ function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
 function getItemTypeName(item) {
-  var _a;
   let itemType = item.type;
-  const divTag = (_a = item.props) == null ? void 0 : _a.is;
+  const divTag = item.props?.is;
   if (itemType === "div" && divTag) {
     if (divTag === "tr") {
       itemType = "tableRow";
@@ -103,11 +102,10 @@ function getComponentRefName(item) {
   return `${String(prop)}Ref`;
 }
 function renderProFormItem(props) {
-  var _a, _b, _c, _d, _e, _f;
   const slots = props.slots || {};
   const formData = props.model || {};
   const typeData = getItemTypeData(props.item, props.itemTypeData);
-  const typeSlot = ((_a = props.item) == null ? void 0 : _a.type) ? slots[props.item.type] : void 0;
+  const typeSlot = props.item?.type ? slots[props.item.type] : void 0;
   if (!typeSlot && !typeData) {
     return;
   }
@@ -153,8 +151,8 @@ function renderProFormItem(props) {
     // 替代 items , 兼容旧版
     model: formData,
     rules: props.rules,
-    grid: (_b = props.item) == null ? void 0 : _b.grid,
-    rowProps: (_c = props.item) == null ? void 0 : _c.rowProps,
+    grid: props.item?.grid,
+    rowProps: props.item?.rowProps,
     parentItem: props.item,
     formItems: props.formItems,
     searchExpand: props.searchExpand,
@@ -194,8 +192,8 @@ function renderProFormItem(props) {
       });
     }
     if (!itemSlots.default) {
-      const csd = !(props.item.containerDraggable ?? !(typeData == null ? void 0 : typeData.sortDisabled));
-      const isRenderLabel = (typeData == null ? void 0 : typeData.renderLabelText) && props.item.label != null && props.item.label !== "";
+      const csd = !(props.item.containerDraggable ?? !typeData?.sortDisabled);
+      const isRenderLabel = typeData?.renderLabelText && props.item.label != null && props.item.label !== "";
       const isRenderChildren = (!typeData || typeData.isContainer) && (!csd && props.editable || props.item.children && props.item.children.length);
       if (isRenderLabel || isRenderChildren) {
         itemSlots.default = () => {
@@ -216,7 +214,7 @@ function renderProFormItem(props) {
               editable: props.editable,
               screenSize: props.screenSize,
               sortDisabled: csd,
-              containerSelectable: !!(typeData == null ? void 0 : typeData.containerSelectable),
+              containerSelectable: !!typeData?.containerSelectable,
               activeItemKey: props.activeItemKey,
               updateItemValue: props.updateItemValue,
               updateItemsData: props.updateItemsData,
@@ -243,7 +241,7 @@ function renderProFormItem(props) {
       }
     }
   }
-  const componentTag = (typeData == null ? void 0 : typeData.component) || "div";
+  const componentTag = typeData?.component || "div";
   const isDivTag = componentTag === "div" || componentTag === "td";
   const componentPropsData = translateJsCode(props.item.props || {}, formData, props.formItems || [], props.searchExpand, props.httpRequest, props.getProFormRefs, props.getAndCacheCode).result;
   const componentNode = typeSlot ? typeSlot({
@@ -253,12 +251,12 @@ function renderProFormItem(props) {
     updateValue: handleUpdateModelValue,
     updatePropValue: props.updateItemValue,
     proForm: slotProFormParams
-  }) : h((isDivTag ? (_d = props.item.props) == null ? void 0 : _d.is : void 0) || componentTag, mergeProps({
+  }) : h((isDivTag ? props.item.props?.is : void 0) || componentTag, mergeProps({
     key: props.key
-  }, getComponentLegacyProps(props.item), ((_e = typeData == null ? void 0 : typeData.defaultProps) == null ? void 0 : _e.call(typeData, propsFunctionParams)) || {}, isDivTag ? omit(componentPropsData, ["is"]) : (typeData == null ? void 0 : typeData.type) === "col" ? getScreenSizeColProps(props.screenSize, {}, componentPropsData) : componentPropsData, ((_f = typeData == null ? void 0 : typeData.reservedProps) == null ? void 0 : _f.call(typeData, propsFunctionParams)) || {}, {
+  }, getComponentLegacyProps(props.item), typeData?.defaultProps?.(propsFunctionParams) || {}, isDivTag ? omit(componentPropsData, ["is"]) : typeData?.type === "col" ? getScreenSizeColProps(props.screenSize, {}, componentPropsData) : componentPropsData, typeData?.reservedProps?.(propsFunctionParams) || {}, {
     ref: getComponentRefName(props.item)
   }), itemSlots);
-  if ((typeData == null ? void 0 : typeData.isContainer) || props.item.itemType === "container" || props.item.itemType === "view") {
+  if (typeData?.isContainer || props.item.itemType === "container" || props.item.itemType === "view") {
     return componentNode;
   }
   const itemPropsData = translateJsCode(props.item.itemProps || {}, formData, props.formItems || [], props.searchExpand, props.httpRequest, props.getProFormRefs, props.getAndCacheCode).result;
@@ -271,7 +269,7 @@ function renderProFormItem(props) {
   const fRule = props.rules && props.item.prop ? get(props.rules, props.item.prop) : void 0;
   const fRules = fRule ? Array.isArray(fRule) ? fRule : [fRule] : void 0;
   const formItemRules = iRules || fRules || [];
-  const trigger = (typeData == null ? void 0 : typeData.requiredTrigger) ?? "change";
+  const trigger = typeData?.requiredTrigger ?? "change";
   const message = getRuleMessage(props.item.label, props.item.requiredMessage, componentPropsData.placeholder, props.requiredLang);
   if (props.item.required) {
     formItemRules.unshift({
@@ -411,8 +409,7 @@ function renderProFormContent(props) {
       builderItemTools: slots.builderItemTools
     });
     const handleContainerBuilderWrapperClick = (e) => {
-      var _a;
-      const parentItemKey = (_a = props.parentItem) == null ? void 0 : _a.key;
+      const parentItemKey = props.parentItem?.key;
       if (props.containerSelectable && parentItemKey != null) {
         e.stopPropagation();
         if (props.updateActiveItemKey) {
@@ -495,19 +492,16 @@ const ChildrenRender = /* @__PURE__ */ defineComponent({
     const handleUpdateActiveItemKey = (activeKey) => {
       emit("update:activeItemKey", activeKey);
     };
-    return () => {
-      var _a;
-      return renderProFormContent({
-        ...omit(props, ["item"]),
-        items: props.items ?? ((_a = props.item) == null ? void 0 : _a.children),
-        // 兼容旧版
-        updateItemValue: props.updateItemValue ?? handleUpdateItemValue,
-        updateItemsData: props.updateItemsData ?? handleUpdateItemsData,
-        updateActiveItemKey: props.updateActiveItemKey ?? handleUpdateActiveItemKey,
-        slots: props.slots ?? slots,
-        requiredLang: props.requiredLang ?? lang.value.required
-      });
-    };
+    return () => renderProFormContent({
+      ...omit(props, ["item"]),
+      items: props.items ?? props.item?.children,
+      // 兼容旧版
+      updateItemValue: props.updateItemValue ?? handleUpdateItemValue,
+      updateItemsData: props.updateItemsData ?? handleUpdateItemsData,
+      updateActiveItemKey: props.updateActiveItemKey ?? handleUpdateActiveItemKey,
+      slots: props.slots ?? slots,
+      requiredLang: props.requiredLang ?? lang.value.required
+    });
   }
 });
 export {

package/es/ele-pro-form/index.d.ts

@@ -1,6 +1,6 @@
 import { ElFormInstance } from '../ele-app/el';
 import { ChildrenRenderInstance } from './components/render-util';
-import { ProFormItemProps, ProFormItemKey, ProFormLocale } from './types';
+import { ProFormItemProps, ProFormItemKey } from './types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
     topExtra?(_: {}): any;
@@ -38,7 +38,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<import('./types').ProFormItemTypeData[]>;
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
-    locale: import('vue').PropType<Partial<ProFormLocale>>;
+    locale: import('vue').PropType<Partial<import('./types').ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
         readonly type: import('vue').PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
@@ -92,7 +92,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     hideRequiredAsterisk: BooleanConstructor;
     scrollToError: BooleanConstructor;
     scrollIntoViewOptions: {
-        readonly type: import('vue').PropType<boolean | Record<string, any>>;
+        readonly type: import('vue').PropType<boolean | ScrollIntoViewOptions>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -156,7 +156,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<import('./types').ProFormItemTypeData[]>;
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
-    locale: import('vue').PropType<Partial<ProFormLocale>>;
+    locale: import('vue').PropType<Partial<import('./types').ProFormLocale>>;
     model: ObjectConstructor;
     rules: {
         readonly type: import('vue').PropType<Partial<Record<string, import('element-plus').FormItemRule | import('element-plus').FormItemRule[]>>>;
@@ -210,7 +210,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     hideRequiredAsterisk: BooleanConstructor;
     scrollToError: BooleanConstructor;
     scrollIntoViewOptions: {
-        readonly type: import('vue').PropType<boolean | Record<string, any>>;
+        readonly type: import('vue').PropType<boolean | ScrollIntoViewOptions>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -246,11 +246,11 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     validateOnRuleChange: boolean;
     hideRequiredAsterisk: boolean;
     scrollToError: boolean;
-    scrollIntoViewOptions: boolean | Record<string, any>;
+    scrollIntoViewOptions: boolean | ScrollIntoViewOptions;
     editable: boolean;
+    searchExpand: boolean;
     autoFooterCol: boolean;
     showSearchExpand: boolean;
-    searchExpand: boolean;
     preventFormSubmit: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-pro-form/index.js

@@ -1,6 +1,6 @@
-import { defineComponent, useModel, ref, computed, watch, onBeforeUnmount, createBlock, openBlock, unref, normalizeClass, withCtx, renderSlot, createVNode, createSlots, renderList, normalizeProps, guardReactiveProps, nextTick } from "vue";
+import { defineComponent, useModel, inject, ref, computed, watch, onBeforeUnmount, createBlock, openBlock, unref, normalizeClass, withCtx, renderSlot, createVNode, createSlots, renderList, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { ElForm } from "element-plus";
-import { useLocale } from "../ele-config-provider/receiver";
+import { useLocale, injectContext } from "../ele-config-provider/receiver";
 import { eachTree } from "../utils/common";
 import { translateJsCode } from "./components/render-core";
 import { ChildrenRender } from "./components/render-util";
@@ -23,6 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const formItems = useModel(props, "items");
     const { lang } = useLocale("proForm", props);
+    const config = inject(injectContext, null);
     const formRef = ref(null);
     const exposeMethods = {};
     [
@@ -58,7 +59,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const updateValue = (prop, value) => {
-      if (prop != null) {
+      if (prop != null && config?.label && config?.size === 1) {
         emit("updateValue", prop, value);
       }
     };
@@ -126,8 +127,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     const getProFormRefs = () => {
-      var _a;
-      return ((_a = childrenRef.value) == null ? void 0 : _a.$refs) || {};
+      return childrenRef.value?.$refs || {};
     };
     const codeCache = /* @__PURE__ */ new Map();
     const getAndCacheCode = (code, codeResult) => {

package/es/ele-pro-form/props.d.ts

@@ -117,7 +117,7 @@ export declare const proFormProps: {
     hideRequiredAsterisk: BooleanConstructor;
     scrollToError: BooleanConstructor;
     scrollIntoViewOptions: {
-        readonly type: PropType<boolean | Record<string, any>>;
+        readonly type: PropType<boolean | ScrollIntoViewOptions>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;

package/es/ele-pro-form/style/index.scss

@@ -186,6 +186,10 @@ $exclude-disabled-selectors: list.join(
   flex: 1;
   display: flex;
   align-items: center;
+
+  & > .el-link {
+    white-space: nowrap;
+  }
 }
 
 .ele-pro-form-footer.is-search-expand > .el-form-item__content {