ele-admin-plus 1.3.0-beta.2 → 1.3.0-beta.4

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

@@ -1,4 +1,4 @@
-import { ElDivider, ElButton, ElImage, ElCollapse, ElCollapseItem, ElCarousel, ElCarouselItem, ElDescriptions, ElDescriptionsItem, ElRow, ElCol, ElInput, ElRadioGroup, ElRadio, ElRadioButton, ElCheckboxGroup, ElCheckbox, ElCheckboxButton, ElDatePicker, ElTimePicker, ElTimeSelect, ElSwitch, ElInputNumber, ElAutocomplete, ElRate, ElSlider, ElMention, ElColorPicker, ElTransfer, ElTreeSelect } from "element-plus";
+import { ElDivider, ElButton, ElImage, ElCollapse, ElCollapseItem, ElCarousel, ElCarouselItem, ElDescriptions, ElDescriptionsItem, ElRow, ElCol, ElInput, ElDatePicker, ElTimePicker, ElTimeSelect, ElSwitch, ElInputNumber, ElRate, ElSlider, ElColorPicker } from "element-plus";
 import EleIcon from "../../ele-icon/index";
 import EleText from "../../ele-text/index";
 import EleAlert from "../../ele-alert/index";
@@ -7,12 +7,19 @@ import EleProTable from "../../ele-pro-table/index";
 import EleCard from "../../ele-card/index";
 import EleTabs from "../../ele-tabs/index";
 import EleTable from "../../ele-table/index";
+import EleAdminLayout from "../../ele-admin-layout/index";
 import EleTreeSelect from "../../ele-tree-select/index";
 import EleTableSelect from "../../ele-table-select/index";
 import EleCheckCard from "../../ele-check-card/index";
 import EleEditTag from "../../ele-edit-tag/index";
 import EleSelect from "../../ele-select/index";
 import EleCascader from "../../ele-cascader/index";
+import EleRadioGroup from "../../ele-radio-group/index";
+import EleCheckboxGroup from "../../ele-checkbox-group/index";
+import EleSelectTree from "../../ele-select-tree/index";
+import EleTransfer from "../../ele-transfer/index";
+import EleMention from "../../ele-mention/index";
+import EleAutocomplete from "../../ele-autocomplete/index";
 const defaultItemTypeData = [
   {
     type: "label",
@@ -42,28 +49,19 @@ const defaultItemTypeData = [
     type: "icon",
     component: EleIcon,
     isContainer: true,
-    sortDisabled: true,
-    defaultProps: ({ item }) => ({
-      name: item.label
-    })
+    sortDisabled: true
   },
   {
     type: "image",
     component: ElImage,
     isContainer: true,
-    sortDisabled: true,
-    defaultProps: ({ item }) => ({
-      alt: item.label
-    })
+    sortDisabled: true
   },
   {
     type: "alert",
     component: EleAlert,
     isContainer: true,
-    sortDisabled: true,
-    defaultProps: ({ item }) => ({
-      title: item.label
-    })
+    sortDisabled: true
   },
   {
     type: "steps",
@@ -84,8 +82,7 @@ const defaultItemTypeData = [
     type: "card",
     component: EleCard,
     isContainer: true,
-    defaultProps: ({ item }) => ({
-      header: item.label,
+    defaultProps: () => ({
       bordered: true
     })
   },
@@ -101,12 +98,18 @@ const defaultItemTypeData = [
       };
     },
     reservedProps: ({ item, isShowFormItem }) => ({
-      items: (item.children || []).filter((c) => isShowFormItem(c)).map((c) => ({
-        name: c.prop,
-        label: c.label,
-        slot: "itemContent",
-        meta: c
-      }))
+      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
+        };
+      })
     }),
     reservedSlots: ({ renderChildren }) => ({
       itemContent: (slotProps) => {
@@ -159,11 +162,7 @@ const defaultItemTypeData = [
     type: "collapseItem",
     component: ElCollapseItem,
     isContainer: true,
-    containerSelectable: true,
-    defaultProps: ({ item }) => ({
-      title: item.label,
-      name: item.prop
-    })
+    containerSelectable: true
   },
   {
     type: "carousel",
@@ -175,30 +174,19 @@ const defaultItemTypeData = [
     type: "carouselItem",
     component: ElCarouselItem,
     isContainer: true,
-    containerSelectable: true,
-    defaultProps: ({ item }) => ({
-      title: item.label,
-      name: item.prop
-    })
+    containerSelectable: true
   },
   {
     type: "descriptions",
     component: ElDescriptions,
     isContainer: true,
-    sortDisabled: true,
-    defaultProps: ({ item }) => ({
-      title: item.label
-    })
+    sortDisabled: true
   },
   {
     type: "descriptionsItem",
     component: ElDescriptionsItem,
     isContainer: true,
-    containerSelectable: true,
-    defaultProps: ({ item }) => ({
-      key: item.key ?? item.prop,
-      label: item.label
-    })
+    containerSelectable: true
   },
   {
     type: "row",
@@ -212,6 +200,11 @@ const defaultItemTypeData = [
     isContainer: true,
     containerSelectable: true
   },
+  {
+    type: "adminLayout",
+    component: EleAdminLayout,
+    isContainer: true
+  },
   {
     type: "div",
     component: "div",
@@ -252,8 +245,7 @@ const defaultItemTypeData = [
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
-      placeholder: `请输入${item.label ?? ""}`,
-      options: item.options
+      placeholder: `请输入${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
@@ -266,8 +258,7 @@ const defaultItemTypeData = [
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
-      placeholder: `请输入${item.label ?? ""}`,
-      options: item.options
+      placeholder: `请输入${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
@@ -277,60 +268,36 @@ const defaultItemTypeData = [
   },
   {
     type: "radio",
-    component: ElRadioGroup,
+    component: EleRadioGroup,
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
-    }),
-    optionsComponent: ElRadio,
-    optionsComponentProps: (option) => ({
-      value: option.value,
-      label: option.label,
-      disabled: option.disabled,
-      border: option.border
     })
   },
   {
     type: "radioButton",
-    component: ElRadioGroup,
+    component: EleRadioGroup,
     reservedProps: ({ modelValue, updateModelValue }) => ({
+      type: "button",
       modelValue,
       "onUpdate:modelValue": updateModelValue
-    }),
-    optionsComponent: ElRadioButton,
-    optionsComponentProps: (option) => ({
-      value: option.value,
-      label: option.label,
-      disabled: option.disabled
     })
   },
   {
     type: "checkbox",
-    component: ElCheckboxGroup,
+    component: EleCheckboxGroup,
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
-    }),
-    optionsComponent: ElCheckbox,
-    optionsComponentProps: (option) => ({
-      value: option.value,
-      label: option.label,
-      disabled: option.disabled,
-      border: option.border
     })
   },
   {
     type: "checkboxButton",
-    component: ElCheckboxGroup,
+    component: EleCheckboxGroup,
     reservedProps: ({ modelValue, updateModelValue }) => ({
+      type: "button",
       modelValue,
       "onUpdate:modelValue": updateModelValue
-    }),
-    optionsComponent: ElCheckboxButton,
-    optionsComponentProps: (option) => ({
-      value: option.value,
-      label: option.label,
-      disabled: option.disabled
     })
   },
   {
@@ -462,14 +429,9 @@ const defaultItemTypeData = [
   },
   {
     type: "autocomplete",
-    component: ElAutocomplete,
+    component: EleAutocomplete,
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
-      fetchSuggestions: (keyword, callback) => callback(
-        (item.options || []).filter(
-          (d) => keyword == null || !keyword.length || (d.value ?? "").toLowerCase().includes((keyword ?? "").toLowerCase())
-        )
-      ),
       placeholder: `请输入${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -483,7 +445,6 @@ const defaultItemTypeData = [
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
-      options: item.options || [],
       placeholder: `请选择${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -497,7 +458,6 @@ const defaultItemTypeData = [
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
-      options: item.options || [],
       placeholder: `请选择${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -533,10 +493,9 @@ const defaultItemTypeData = [
   },
   {
     type: "mention",
-    component: ElMention,
+    component: EleMention,
     defaultProps: ({ item }) => ({
       clearable: true,
-      options: item.options || [],
       placeholder: `请输入${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -554,7 +513,7 @@ const defaultItemTypeData = [
   },
   {
     type: "transfer",
-    component: ElTransfer,
+    component: EleTransfer,
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -562,11 +521,10 @@ const defaultItemTypeData = [
   },
   {
     type: "treeSelect",
-    component: ElTreeSelect,
+    component: EleSelectTree,
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
-      data: item.options || [],
       placeholder: `请选择${item.label ?? ""}`
     }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
@@ -576,11 +534,10 @@ const defaultItemTypeData = [
   },
   {
     type: "treeMultipleSelect",
-    component: ElTreeSelect,
+    component: EleSelectTree,
     defaultProps: ({ item }) => ({
       class: "ele-fluid",
       clearable: true,
-      data: item.options || [],
       showCheckbox: true,
       placeholder: `请选择${item.label ?? ""}`
     }),
@@ -644,9 +601,6 @@ const defaultItemTypeData = [
   {
     type: "checkCard",
     component: EleCheckCard,
-    defaultProps: ({ item }) => ({
-      items: item.options || []
-    }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       modelValue,
       "onUpdate:modelValue": updateModelValue
@@ -655,9 +609,6 @@ const defaultItemTypeData = [
   {
     type: "multipleCheckCard",
     component: EleCheckCard,
-    defaultProps: ({ item }) => ({
-      items: item.options || []
-    }),
     reservedProps: ({ modelValue, updateModelValue }) => ({
       multiple: true,
       modelValue,

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

@@ -1,7 +1,11 @@
 import { CSSProperties, PropType } from 'vue';
 import { ElFormItemProps, ElButtonProps, ElLinkProps } from '../../ele-app/el';
 
-declare const _default: import('vue').DefineComponent<{
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
+    footer?(_: {}): any;
+    footerExtra?(_: {}): any;
+};
+declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 底栏 ElFormItem 属性 */
     footerProps: PropType<ElFormItemProps>;
     /** 底栏 ElFormItem 插槽 */
@@ -26,15 +30,10 @@ declare const _default: import('vue').DefineComponent<{
     searchExpandText: StringConstructor;
     /** 收起按钮的文字 */
     searchShrinkText: StringConstructor;
-}, {
-    ownSlots: string[];
-    toggleSearchExpand: () => void;
-    handleSubmit: () => void;
-    handleReset: () => void;
-}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    updateSearchExpand: (_expand: boolean) => true;
-    submit: () => true;
-    reset: () => true;
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    reset: () => void;
+    submit: () => void;
+    updateSearchExpand: (_expand: boolean) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 底栏 ElFormItem 属性 */
     footerProps: PropType<ElFormItemProps>;
@@ -60,12 +59,18 @@ declare const _default: import('vue').DefineComponent<{
     searchExpandText: StringConstructor;
     /** 收起按钮的文字 */
     searchShrinkText: StringConstructor;
-}>> & {
+}>> & Readonly<{
     onReset?: (() => any) | undefined;
     onSubmit?: (() => any) | undefined;
     onUpdateSearchExpand?: ((_expand: boolean) => any) | undefined;
-}, {
+}>, {
     showSearchExpand: boolean;
     searchExpand: boolean;
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

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

@@ -1,10 +1,9 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createVNode, createTextVNode, toDisplayString, createElementBlock, Fragment, createCommentVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, openBlock, createBlock, unref, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createVNode, createTextVNode, toDisplayString, createElementBlock, Fragment, createCommentVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { ElFormItem, ElButton, ElLink, ElIcon } from "element-plus";
-import { ArrowDown, ArrowUp } from "../../icons";
-const ownSlots = ["footer", "footerExtra"];
-const _sfc_main = defineComponent({
-  name: "ProFormFooter",
-  components: { ElFormItem, ElButton, ElLink, ElIcon, ArrowDown, ArrowUp },
+import { ArrowUp, ArrowDown } from "../../icons";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{ name: "ProFormFooter" },
+  __name: "pro-form-footer",
   props: {
     /** 底栏 ElFormItem 属性 */
     footerProps: Object,
@@ -36,7 +35,10 @@ const _sfc_main = defineComponent({
     submit: () => true,
     reset: () => true
   },
-  setup(props, { emit }) {
+  setup(__props, { emit: __emit }) {
+    const ownSlots = ["footer", "footerExtra"];
+    const props = __props;
+    const emit = __emit;
     const toggleSearchExpand = () => {
       emit("updateSearchExpand", !props.searchExpand);
     };
@@ -46,103 +48,83 @@ const _sfc_main = defineComponent({
     const handleReset = () => {
       emit("reset");
     };
-    return {
-      ownSlots,
-      toggleSearchExpand,
-      handleSubmit,
-      handleReset
-    };
-  }
-});
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  var _a, _b;
-  const _component_ElButton = resolveComponent("ElButton");
-  const _component_ArrowUp = resolveComponent("ArrowUp");
-  const _component_ElIcon = resolveComponent("ElIcon");
-  const _component_ArrowDown = resolveComponent("ArrowDown");
-  const _component_ElLink = resolveComponent("ElLink");
-  const _component_ElFormItem = resolveComponent("ElFormItem");
-  return openBlock(), createBlock(_component_ElFormItem, mergeProps(_ctx.footerProps || {}, {
-    labelWidth: typeof ((_a = _ctx.footerProps) == null ? void 0 : _a.labelWidth) === "number" ? `${_ctx.footerProps.labelWidth}px` : (_b = _ctx.footerProps) == null ? void 0 : _b.labelWidth
-  }), createSlots({
-    default: withCtx(() => [
-      createElementVNode("div", {
-        style: normalizeStyle({
-          flex: 1,
-          display: "flex",
-          alignItems: "center",
-          ..._ctx.footerStyle || {}
-        })
-      }, [
-        renderSlot(_ctx.$slots, "footer", {}, () => [
-          createVNode(_component_ElButton, mergeProps({ type: "primary" }, _ctx.submitButtonProps || {}, { onClick: _ctx.handleSubmit }), {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.submitText), 1)
-            ]),
-            _: 1
-          }, 16, ["onClick"]),
-          createVNode(_component_ElButton, mergeProps(_ctx.resetButtonProps || {}, { onClick: _ctx.handleReset }), {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.resetText), 1)
-            ]),
-            _: 1
-          }, 16, ["onClick"])
-        ]),
-        _ctx.showSearchExpand ? (openBlock(), createBlock(_component_ElLink, mergeProps({
-          key: 0,
-          type: "primary",
-          underline: false,
-          style: { "margin-left": "12px" }
-        }, _ctx.searchExpandButtonProps || {}, { onClick: _ctx.toggleSearchExpand }), {
-          default: withCtx(() => [
-            _ctx.searchExpand ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-              createElementVNode("span", null, toDisplayString(_ctx.searchShrinkText), 1),
-              createVNode(_component_ElIcon, { style: { "vertical-align": "-1px" } }, {
+    return (_ctx, _cache) => {
+      var _a, _b;
+      return openBlock(), createBlock(unref(ElFormItem), mergeProps(__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
+      }), createSlots({
+        default: withCtx(() => [
+          createElementVNode("div", {
+            style: normalizeStyle({
+              flex: 1,
+              display: "flex",
+              alignItems: "center",
+              ...__props.footerStyle || {}
+            })
+          }, [
+            renderSlot(_ctx.$slots, "footer", {}, () => [
+              createVNode(unref(ElButton), mergeProps({ type: "primary" }, __props.submitButtonProps || {}, { onClick: handleSubmit }), {
                 default: withCtx(() => [
-                  createVNode(_component_ArrowUp)
+                  createTextVNode(toDisplayString(__props.submitText), 1)
                 ]),
                 _: 1
-              })
-            ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-              createElementVNode("span", null, toDisplayString(_ctx.searchExpandText), 1),
-              createVNode(_component_ElIcon, { style: { "vertical-align": "-2px" } }, {
+              }, 16),
+              createVNode(unref(ElButton), mergeProps(__props.resetButtonProps || {}, { onClick: handleReset }), {
                 default: withCtx(() => [
-                  createVNode(_component_ArrowDown)
+                  createTextVNode(toDisplayString(__props.resetText), 1)
                 ]),
                 _: 1
-              })
-            ], 64))
-          ]),
-          _: 1
-        }, 16, ["onClick"])) : createCommentVNode("", true),
-        renderSlot(_ctx.$slots, "footerExtra")
-      ], 4)
-    ]),
-    _: 2
-  }, [
-    renderList(Object.keys(_ctx.footerSlots || {}).filter(
-      (k) => !_ctx.ownSlots.includes(k) && !!(_ctx.footerSlots && _ctx.footerSlots[k] && _ctx.$slots[_ctx.footerSlots[k]])
-    ), (name) => {
-      return {
-        name,
-        fn: withCtx((slotProps) => {
-          var _a2;
-          return [
-            renderSlot(_ctx.$slots, (_a2 = _ctx.footerSlots) == null ? void 0 : _a2[name], normalizeProps(guardReactiveProps(slotProps || {})))
-          ];
+              }, 16)
+            ]),
+            __props.showSearchExpand ? (openBlock(), createBlock(unref(ElLink), mergeProps({
+              key: 0,
+              type: "primary",
+              underline: false,
+              style: { "margin-left": "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" } }, {
+                    default: withCtx(() => [
+                      createVNode(unref(ArrowUp))
+                    ]),
+                    _: 1
+                  })
+                ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                  createElementVNode("span", null, toDisplayString(__props.searchExpandText), 1),
+                  createVNode(unref(ElIcon), { style: { "vertical-align": "-2px" } }, {
+                    default: withCtx(() => [
+                      createVNode(unref(ArrowDown))
+                    ]),
+                    _: 1
+                  })
+                ], 64))
+              ]),
+              _: 1
+            }, 16)) : createCommentVNode("", true),
+            renderSlot(_ctx.$slots, "footerExtra")
+          ], 4)
+        ]),
+        _: 2
+      }, [
+        renderList(Object.keys(__props.footerSlots || {}).filter(
+          (k) => !ownSlots.includes(k) && !!(__props.footerSlots && __props.footerSlots[k] && _ctx.$slots[__props.footerSlots[k]])
+        ), (name) => {
+          return {
+            name,
+            fn: withCtx((slotProps) => {
+              var _a2;
+              return [
+                renderSlot(_ctx.$slots, (_a2 = __props.footerSlots) == null ? void 0 : _a2[name], normalizeProps(guardReactiveProps(slotProps || {})))
+              ];
+            })
+          };
         })
-      };
-    })
-  ]), 1040, ["labelWidth"]);
-}
-const proFormFooter = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+      ]), 1040, ["labelWidth"]);
+    };
+  }
+});
 export {
-  proFormFooter as default
+  _sfc_main as default
 };