ele-admin-plus 1.3.0 → 1.4.0-beta.1

package/lib/ele-pro-form/components/item-type-data.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const vue = require("vue");
 const elementPlus = require("element-plus");
 const EleIcon = require("../../ele-icon/index");
 const EleText = require("../../ele-text/index");
@@ -25,21 +26,21 @@ const EleAutocomplete = require("../../ele-autocomplete/index");
 const defaultItemTypeData = [
   {
     type: "label",
-    component: EleText,
+    component: vue.markRaw(EleText),
     isContainer: true,
     sortDisabled: true,
     renderLabelText: true
   },
   {
     type: "divider",
-    component: elementPlus.ElDivider,
+    component: vue.markRaw(elementPlus.ElDivider),
     isContainer: true,
     sortDisabled: true,
     renderLabelText: true
   },
   {
     type: "button",
-    component: elementPlus.ElButton,
+    component: vue.markRaw(elementPlus.ElButton),
     isContainer: true,
     sortDisabled: true,
     renderLabelText: true,
@@ -49,25 +50,25 @@ const defaultItemTypeData = [
   },
   {
     type: "icon",
-    component: EleIcon,
+    component: vue.markRaw(EleIcon),
     isContainer: true,
     sortDisabled: true
   },
   {
     type: "image",
-    component: elementPlus.ElImage,
+    component: vue.markRaw(elementPlus.ElImage),
     isContainer: true,
     sortDisabled: true
   },
   {
     type: "alert",
-    component: EleAlert,
+    component: vue.markRaw(EleAlert),
     isContainer: true,
     sortDisabled: true
   },
   {
     type: "steps",
-    component: EleSteps,
+    component: vue.markRaw(EleSteps),
     isContainer: true,
     sortDisabled: true,
     defaultProps: ({ modelValue }) => ({
@@ -76,13 +77,13 @@ const defaultItemTypeData = [
   },
   {
     type: "proTable",
+    component: vue.markRaw(EleProTable),
     isContainer: true,
-    sortDisabled: true,
-    component: EleProTable
+    sortDisabled: true
   },
   {
     type: "card",
-    component: EleCard,
+    component: vue.markRaw(EleCard),
     isContainer: true,
     defaultProps: () => ({
       bordered: true
@@ -90,7 +91,7 @@ const defaultItemTypeData = [
   },
   {
     type: "tabs",
-    component: EleTabs,
+    component: vue.markRaw(EleTabs),
     isContainer: true,
     defaultProps: ({ item, modelValue }) => {
       var _a, _b;
@@ -129,7 +130,7 @@ const defaultItemTypeData = [
   },
   {
     type: "table",
-    component: EleTable,
+    component: vue.markRaw(EleTable),
     isContainer: true,
     sortDisabled: true
   },
@@ -147,7 +148,7 @@ const defaultItemTypeData = [
   },
   {
     type: "collapse",
-    component: elementPlus.ElCollapse,
+    component: vue.markRaw(elementPlus.ElCollapse),
     isContainer: true,
     sortDisabled: true,
     defaultProps: ({ item, modelValue }) => {
@@ -162,49 +163,49 @@ const defaultItemTypeData = [
   },
   {
     type: "collapseItem",
-    component: elementPlus.ElCollapseItem,
+    component: vue.markRaw(elementPlus.ElCollapseItem),
     isContainer: true,
     containerSelectable: true
   },
   {
     type: "carousel",
-    component: elementPlus.ElCarousel,
+    component: vue.markRaw(elementPlus.ElCarousel),
     isContainer: true,
     sortDisabled: true
   },
   {
     type: "carouselItem",
-    component: elementPlus.ElCarouselItem,
+    component: vue.markRaw(elementPlus.ElCarouselItem),
     isContainer: true,
     containerSelectable: true
   },
   {
     type: "descriptions",
-    component: elementPlus.ElDescriptions,
+    component: vue.markRaw(elementPlus.ElDescriptions),
     isContainer: true,
     sortDisabled: true
   },
   {
     type: "descriptionsItem",
-    component: elementPlus.ElDescriptionsItem,
+    component: vue.markRaw(elementPlus.ElDescriptionsItem),
     isContainer: true,
     containerSelectable: true
   },
   {
     type: "row",
-    component: elementPlus.ElRow,
+    component: vue.markRaw(elementPlus.ElRow),
     isContainer: true,
     sortDisabled: true
   },
   {
     type: "col",
-    component: elementPlus.ElCol,
+    component: vue.markRaw(elementPlus.ElCol),
     isContainer: true,
     containerSelectable: true
   },
   {
     type: "adminLayout",
-    component: EleAdminLayout,
+    component: vue.markRaw(EleAdminLayout),
     isContainer: true
   },
   {
@@ -216,7 +217,7 @@ const defaultItemTypeData = [
   },
   {
     type: "input",
-    component: elementPlus.ElInput,
+    component: vue.markRaw(elementPlus.ElInput),
     defaultProps: ({ item }) => ({
       clearable: true,
       placeholder: `请输入${item.label ?? ""}`
@@ -229,7 +230,7 @@ const defaultItemTypeData = [
   },
   {
     type: "textarea",
-    component: elementPlus.ElInput,
+    component: vue.markRaw(elementPlus.ElInput),
     defaultProps: ({ item }) => ({
       rows: 4,
       placeholder: `请输入${item.label ?? ""}`
@@ -243,7 +244,7 @@ const defaultItemTypeData = [
   },
   {
     type: "select",
-    component: EleSelect,
+    component: vue.markRaw(EleSelect),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
@@ -256,7 +257,7 @@ const defaultItemTypeData = [
   },
   {
     type: "multipleSelect",
-    component: EleSelect,
+    component: vue.markRaw(EleSelect),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
@@ -270,7 +271,7 @@ const defaultItemTypeData = [
   },
   {
     type: "radio",
-    component: EleRadioGroup,
+    component: vue.markRaw(EleRadioGroup),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -278,7 +279,7 @@ const defaultItemTypeData = [
   },
   {
     type: "radioButton",
-    component: EleRadioGroup,
+    component: vue.markRaw(EleRadioGroup),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       type: "button",
       modelValue,
@@ -287,7 +288,7 @@ const defaultItemTypeData = [
   },
   {
     type: "checkbox",
-    component: EleCheckboxGroup,
+    component: vue.markRaw(EleCheckboxGroup),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -295,7 +296,7 @@ const defaultItemTypeData = [
   },
   {
     type: "checkboxButton",
-    component: EleCheckboxGroup,
+    component: vue.markRaw(EleCheckboxGroup),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       type: "button",
       modelValue,
@@ -304,7 +305,7 @@ const defaultItemTypeData = [
   },
   {
     type: "date",
-    component: elementPlus.ElDatePicker,
+    component: vue.markRaw(elementPlus.ElDatePicker),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD",
@@ -317,7 +318,7 @@ const defaultItemTypeData = [
   },
   {
     type: "datetime",
-    component: elementPlus.ElDatePicker,
+    component: vue.markRaw(elementPlus.ElDatePicker),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD HH:mm:ss",
@@ -331,7 +332,7 @@ const defaultItemTypeData = [
   },
   {
     type: "daterange",
-    component: elementPlus.ElDatePicker,
+    component: vue.markRaw(elementPlus.ElDatePicker),
     defaultProps: () => ({
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD",
@@ -348,7 +349,7 @@ const defaultItemTypeData = [
   },
   {
     type: "datetimerange",
-    component: elementPlus.ElDatePicker,
+    component: vue.markRaw(elementPlus.ElDatePicker),
     defaultProps: () => ({
       class: "ele-fluid",
       valueFormat: "YYYY-MM-DD HH:mm:ss",
@@ -365,7 +366,7 @@ const defaultItemTypeData = [
   },
   {
     type: "time",
-    component: elementPlus.ElTimePicker,
+    component: vue.markRaw(elementPlus.ElTimePicker),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       valueFormat: "HH:mm:ss",
@@ -378,7 +379,7 @@ const defaultItemTypeData = [
   },
   {
     type: "timerange",
-    component: elementPlus.ElTimePicker,
+    component: vue.markRaw(elementPlus.ElTimePicker),
     defaultProps: () => ({
       class: "ele-fluid",
       valueFormat: "HH:mm:ss",
@@ -394,7 +395,7 @@ const defaultItemTypeData = [
   },
   {
     type: "timeSelect",
-    component: elementPlus.ElTimeSelect,
+    component: vue.markRaw(elementPlus.ElTimeSelect),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       placeholder: `请选择${item.label ?? ""}`
@@ -406,7 +407,7 @@ const defaultItemTypeData = [
   },
   {
     type: "switch",
-    component: elementPlus.ElSwitch,
+    component: vue.markRaw(elementPlus.ElSwitch),
     defaultProps: () => ({
       activeValue: 1,
       inactiveValue: 0
@@ -418,7 +419,7 @@ const defaultItemTypeData = [
   },
   {
     type: "inputNumber",
-    component: elementPlus.ElInputNumber,
+    component: vue.markRaw(elementPlus.ElInputNumber),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       controlsPosition: "right",
@@ -431,7 +432,7 @@ const defaultItemTypeData = [
   },
   {
     type: "autocomplete",
-    component: EleAutocomplete,
+    component: vue.markRaw(EleAutocomplete),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       placeholder: `请输入${item.label ?? ""}`
@@ -443,7 +444,7 @@ const defaultItemTypeData = [
   },
   {
     type: "cascader",
-    component: EleCascader,
+    component: vue.markRaw(EleCascader),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
@@ -456,7 +457,7 @@ const defaultItemTypeData = [
   },
   {
     type: "multipleCascader",
-    component: EleCascader,
+    component: vue.markRaw(EleCascader),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
@@ -470,7 +471,7 @@ const defaultItemTypeData = [
   },
   {
     type: "rate",
-    component: elementPlus.ElRate,
+    component: vue.markRaw(elementPlus.ElRate),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -478,7 +479,7 @@ const defaultItemTypeData = [
   },
   {
     type: "slider",
-    component: elementPlus.ElSlider,
+    component: vue.markRaw(elementPlus.ElSlider),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -486,7 +487,7 @@ const defaultItemTypeData = [
   },
   {
     type: "sliderRange",
-    component: elementPlus.ElSlider,
+    component: vue.markRaw(elementPlus.ElSlider),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       range: true,
       modelValue,
@@ -495,7 +496,7 @@ const defaultItemTypeData = [
   },
   {
     type: "mention",
-    component: EleMention,
+    component: vue.markRaw(EleMention),
     defaultProps: ({ item }) => ({
       clearable: true,
       placeholder: `请输入${item.label ?? ""}`
@@ -507,7 +508,7 @@ const defaultItemTypeData = [
   },
   {
     type: "colorPicker",
-    component: elementPlus.ElColorPicker,
+    component: vue.markRaw(elementPlus.ElColorPicker),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -515,7 +516,7 @@ const defaultItemTypeData = [
   },
   {
     type: "transfer",
-    component: EleTransfer,
+    component: vue.markRaw(EleTransfer),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -523,7 +524,7 @@ const defaultItemTypeData = [
   },
   {
     type: "treeSelect",
-    component: EleSelectTree,
+    component: vue.markRaw(EleSelectTree),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
@@ -536,7 +537,7 @@ const defaultItemTypeData = [
   },
   {
     type: "treeMultipleSelect",
-    component: EleSelectTree,
+    component: vue.markRaw(EleSelectTree),
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
@@ -551,7 +552,7 @@ const defaultItemTypeData = [
   },
   {
     type: "virtualTreeSelect",
-    component: EleTreeSelect,
+    component: vue.markRaw(EleTreeSelect),
     defaultProps: ({ item }) => ({
       clearable: true,
       placeholder: `请选择${item.label ?? ""}`
@@ -563,7 +564,7 @@ const defaultItemTypeData = [
   },
   {
     type: "virtualTreeMultipleSelect",
-    component: EleTreeSelect,
+    component: vue.markRaw(EleTreeSelect),
     defaultProps: ({ item }) => ({
       clearable: true,
       maxTagCount: 1,
@@ -577,7 +578,7 @@ const defaultItemTypeData = [
   },
   {
     type: "tableSelect",
-    component: EleTableSelect,
+    component: vue.markRaw(EleTableSelect),
     defaultProps: ({ item }) => ({
       clearable: true,
       placeholder: `请选择${item.label ?? ""}`
@@ -589,7 +590,7 @@ const defaultItemTypeData = [
   },
   {
     type: "tableMultipleSelect",
-    component: EleTableSelect,
+    component: vue.markRaw(EleTableSelect),
     defaultProps: ({ item }) => ({
       clearable: true,
       placeholder: `请选择${item.label ?? ""}`
@@ -602,7 +603,7 @@ const defaultItemTypeData = [
   },
   {
     type: "checkCard",
-    component: EleCheckCard,
+    component: vue.markRaw(EleCheckCard),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -610,7 +611,7 @@ const defaultItemTypeData = [
   },
   {
     type: "multipleCheckCard",
-    component: EleCheckCard,
+    component: vue.markRaw(EleCheckCard),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
       modelValue,
@@ -619,7 +620,7 @@ const defaultItemTypeData = [
   },
   {
     type: "editTag",
-    component: EleEditTag,
+    component: vue.markRaw(EleEditTag),
     defaultProps: () => ({
       type: "info",
       style: { marginTop: "4px" },
@@ -634,7 +635,7 @@ const defaultItemTypeData = [
   },
   {
     type: "text",
-    component: EleText,
+    component: vue.markRaw(EleText),
     reservedSlots: ({ modelValue }) => ({
       default: () => modelValue
     })

package/lib/ele-pro-form/components/pro-form-footer.cjs

@@ -1,7 +1,8 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const icons = require("../../icons");
+const index = require("../../icons/index");
+const common = require("../../utils/common");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "ProFormFooter" },
   __name: "pro-form-footer",
@@ -10,6 +11,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     footerProps: Object,
     /** 底栏 ElFormItem 插槽 */
     footerSlots: Object,
+    /** 自动计算底栏栅格份数 */
+    autoFooterCol: Boolean,
     /** 底栏样式 */
     footerStyle: Object,
     /** 提交按钮文本 */
@@ -51,17 +54,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     return (_ctx, _cache) => {
       var _a, _b;
-      return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElFormItem), vue.mergeProps(__props.footerProps || {}, {
+      return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElFormItem), vue.mergeProps({
+        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
       }), vue.createSlots({
         default: vue.withCtx(() => [
           vue.createElementVNode("div", {
-            style: vue.normalizeStyle({
-              flex: 1,
-              display: "flex",
-              alignItems: "center",
-              ...__props.footerStyle || {}
-            })
+            class: "ele-pro-form-footer-body",
+            style: vue.normalizeStyle(__props.footerStyle)
           }, [
             vue.renderSlot(_ctx.$slots, "footer", {}, () => [
               vue.createVNode(vue.unref(elementPlus.ElButton), vue.mergeProps({ type: "primary" }, __props.submitButtonProps || {}, { onClick: handleSubmit }), {
@@ -80,7 +84,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             __props.showSearchExpand ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElLink), vue.mergeProps({
               key: 0,
               type: "primary",
-              underline: false,
+              underline: "never",
               style: { "margin-left": "12px" }
             }, __props.searchExpandButtonProps || {}, { onClick: toggleSearchExpand }), {
               default: vue.withCtx(() => [
@@ -88,7 +92,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   vue.createElementVNode("span", null, vue.toDisplayString(__props.searchShrinkText), 1),
                   vue.createVNode(vue.unref(elementPlus.ElIcon), { style: { "vertical-align": "-1px" } }, {
                     default: vue.withCtx(() => [
-                      vue.createVNode(vue.unref(icons.ArrowUp))
+                      vue.createVNode(vue.unref(index.ArrowUp))
                     ]),
                     _: 1
                   })
@@ -96,7 +100,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   vue.createElementVNode("span", null, vue.toDisplayString(__props.searchExpandText), 1),
                   vue.createVNode(vue.unref(elementPlus.ElIcon), { style: { "vertical-align": "-2px" } }, {
                     default: vue.withCtx(() => [
-                      vue.createVNode(vue.unref(icons.ArrowDown))
+                      vue.createVNode(vue.unref(index.ArrowDown))
                     ]),
                     _: 1
                   })
@@ -109,20 +113,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         ]),
         _: 2
       }, [
-        vue.renderList(Object.keys(__props.footerSlots || {}).filter(
-          (k) => !ownSlots.includes(k) && !!(__props.footerSlots && __props.footerSlots[k] && _ctx.$slots[__props.footerSlots[k]])
-        ), (name) => {
+        vue.renderList(vue.unref(common.getSlotsMap)(
+          _ctx.$slots,
+          __props.footerSlots,
+          ["default"],
+          ownSlots
+        ), (slotName, name) => {
           return {
             name,
-            fn: vue.withCtx((slotProps) => {
-              var _a2;
-              return [
-                vue.renderSlot(_ctx.$slots, (_a2 = __props.footerSlots) == null ? void 0 : _a2[name], vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-              ];
-            })
+            fn: vue.withCtx((slotProps) => [
+              vue.renderSlot(_ctx.$slots, slotName, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+            ])
           };
         })
-      ]), 1040, ["labelWidth"]);
+      ]), 1040, ["class", "labelWidth"]);
     };
   }
 });

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

@@ -10,6 +10,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     footerProps: PropType<ElFormItemProps>;
     /** 底栏 ElFormItem 插槽 */
     footerSlots: PropType<Record<string, string>>;
+    /** 自动计算底栏栅格份数 */
+    autoFooterCol: BooleanConstructor;
     /** 底栏样式 */
     footerStyle: PropType<CSSProperties>;
     /** 提交按钮文本 */
@@ -39,6 +41,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     footerProps: PropType<ElFormItemProps>;
     /** 底栏 ElFormItem 插槽 */
     footerSlots: PropType<Record<string, string>>;
+    /** 自动计算底栏栅格份数 */
+    autoFooterCol: BooleanConstructor;
     /** 底栏样式 */
     footerStyle: PropType<CSSProperties>;
     /** 提交按钮文本 */
@@ -64,6 +68,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onSubmit?: (() => any) | undefined;
     onUpdateSearchExpand?: ((_expand: boolean) => any) | undefined;
 }>, {
+    autoFooterCol: boolean;
     showSearchExpand: boolean;
     searchExpand: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;