ele-admin-plus 1.3.0-beta.3 → 1.3.0

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
 };

package/es/ele-pro-form/components/render-util.d.ts

@@ -11,6 +11,11 @@ export declare const sortableGroupName = "ProFormBuilderBodySortGroup";
  * 代码字符串前缀
  */
 export declare const codeStringPrefix = "/*__PRO_FORM__*/";
+/**
+ * 获取表单项的类型名称
+ * @param item 表单项
+ */
+export declare function getItemTypeName(item: ProFormItemProps): string | undefined;
 /**
  * 获取表单项类型数据
  * @param item 表单项
@@ -80,7 +85,7 @@ export declare function renderProFormContent(props: RenderProFormContentProps):
 /**
  * 表单项数据渲染组件
  */
-export declare const ChildrenRender: import('vue').DefineComponent<{
+export declare const ChildrenRender: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     contentExtraColProps: import('vue').PropType<import('../../ele-app/el').ElColProps>;
     parentItem: import('vue').PropType<ProFormItemProps>;
     formItems: import('vue').PropType<ProFormItemProps[]>;
@@ -108,11 +113,11 @@ export declare const ChildrenRender: import('vue').DefineComponent<{
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<ProFormItemTypeData[]>;
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
-}, () => string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
+}>, () => string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }> | (string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
-}>)[] | undefined, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+}>)[] | undefined, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     updateItemValue: (_prop: string, _value: any) => true;
     updateItemsData: (_items: ProFormItemProps[], _parentItem?: ProFormItemProps) => true;
     'update:activeItemKey': (_activeKey?: ProFormItemKey) => true;
@@ -144,14 +149,14 @@ export declare const ChildrenRender: import('vue').DefineComponent<{
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<ProFormItemTypeData[]>;
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
-}>> & {
+}>> & Readonly<{
     onUpdateItemValue?: ((_prop: string, _value: any) => any) | undefined;
     onUpdateItemsData?: ((_items: ProFormItemProps[], _parentItem?: ProFormItemProps | undefined) => any) | undefined;
     "onUpdate:activeItemKey"?: ((_activeKey?: string | number | symbol | undefined) => any) | undefined;
-}, {
+}>, {
     editable: boolean;
     searchExpand: boolean;
     sortDisabled: boolean;
     containerSelectable: boolean;
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export type ChildrenRenderInstance = InstanceType<typeof ChildrenRender> | null;

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

@@ -4,14 +4,14 @@ import { ElFormItem, ElCol, ElRow } from "element-plus";
 import { omit } from "../../utils/core";
 import { getValue } from "../util";
 import { childrenRenderProps } from "../props";
-import BuilderWrapper from "./builder-wrapper.vue";
+import BuilderWrapper from "./builder-wrapper";
 import { defaultItemTypeData } from "./item-type-data";
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
 const sortableGroupName = "ProFormBuilderBodySortGroup";
 const codeStringPrefix = "/*__PRO_FORM__*/";
-function getItemTypeData(item, itemTypeData) {
+function getItemTypeName(item) {
   var _a;
   let itemType = item.type;
   const divTag = (_a = item.props) == null ? void 0 : _a.is;
@@ -34,12 +34,16 @@ function getItemTypeData(item, itemTypeData) {
       itemType = "alert";
     }
   }
+  return itemType;
+}
+function getItemTypeData(item, itemTypeData) {
+  const itemType = getItemTypeName(item);
   const typeData = [...itemTypeData || [], ...defaultItemTypeData].find((d) => d.type === itemType);
   return typeData;
 }
 function getComponentLegacyProps(item) {
   const result = {};
-  const itemType = item.type;
+  const itemType = getItemTypeName(item);
   if (itemType) {
     const options = item.options;
     if (options) {
@@ -575,6 +579,7 @@ export {
   getComponentLegacyProps,
   getComponentRefName,
   getItemTypeData,
+  getItemTypeName,
   getRuleMessage,
   isShowItem,
   renderProFormContent,

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

@@ -1,8 +1,11 @@
-import { ElFormInstance, ElFormItemProp } from '../ele-app/el';
-import { ChildrenRenderInstance } from './components/render-util';
+import { ElFormInstance } from '../ele-app/el';
 import { ProFormItemProps, ProFormItemKey } from './types';
 
-declare const _default: import('vue').DefineComponent<{
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
+    topExtra?(_: {}): any;
+    bottomExtra?(_: {}): any;
+};
+declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     labelWidth: {
         type: (StringConstructor | NumberConstructor)[];
         default: string;
@@ -79,38 +82,21 @@ declare const _default: import('vue').DefineComponent<{
         __epPropKey: true;
     };
     disabled: BooleanConstructor;
-}, {
-    slotExcludes: string[];
-    footerSlotExcludes: string[];
-    formItems: import('vue').ModelRef<ProFormItemProps[] | undefined, PropertyKey>;
-    formRef: import('vue').Ref<ElFormInstance>;
-    childrenRef: import('vue').Ref<ChildrenRenderInstance>;
-    formSearchExpand: import('vue').Ref<boolean>;
-    currentActiveKey: import('vue').Ref<string | number | symbol | undefined>;
-    footerStyleData: import('vue').ComputedRef<any>;
-    updateValue: (prop: string, value: unknown) => void;
-    handleUpdateItemsData: (items: ProFormItemProps[], parentItem?: ProFormItemProps) => void;
-    handleUpdateActiveItemKey: (key: ProFormItemKey) => void;
-    updateSearchExpand: (expand: boolean) => void;
-    handleSubmit: () => void;
-    handleReset: () => void;
-    handleFormSubmit: (e: MouseEvent) => void;
-    handleFormValidate: (prop: ElFormItemProp, isValid: boolean, message: string) => void;
-    getProFormRefs: () => Record<string, any>;
-    getAndCacheCode: (code: string, codeResult: any) => any;
-    validate: (callback?: import('element-plus').FormValidateCallback | undefined) => import('element-plus').FormValidationResult;
-    validateField: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp> | undefined, callback?: import('element-plus').FormValidateCallback | undefined) => import('element-plus').FormValidationResult;
-    resetFields: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp> | undefined) => void;
-    clearValidate: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp> | undefined) => void;
+}>, {
+    formRef: import('vue').Ref<ElFormInstance, ElFormInstance>;
+    validate: (callback?: import('element-plus').FormValidateCallback) => import('element-plus').FormValidationResult;
+    validateField: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp>, callback?: import('element-plus').FormValidateCallback) => import('element-plus').FormValidationResult;
+    resetFields: (props?: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp>) => void;
+    clearValidate: (props? /** 提交 */: import('element-plus/es/utils/typescript').Arrayable<import('element-plus').FormItemProp>) => void;
     scrollToField: (prop: import('element-plus').FormItemProp) => void;
-}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:searchExpand': (_expand: boolean) => boolean;
-    updateValue: (_prop: string, _value: unknown) => boolean;
-    'update:items': (_items: ProFormItemProps[]) => boolean;
-    'update:activeItemKey': (_activeKey: ProFormItemKey) => boolean;
-    submit: (_model: Record<string, any>) => boolean;
-    reset: () => boolean;
-    validate: (prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => boolean;
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    reset: () => void;
+    submit: (_model: Record<string, any>) => void;
+    validate: (prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => void;
+    "update:searchExpand": (_expand: boolean) => void;
+    updateValue: (_prop: string, _value: unknown) => void;
+    "update:items": (_items: ProFormItemProps[]) => void;
+    "update:activeItemKey": (_activeKey: string | number | symbol) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     labelWidth: {
         type: (StringConstructor | NumberConstructor)[];
@@ -188,19 +174,19 @@ declare const _default: import('vue').DefineComponent<{
         __epPropKey: true;
     };
     disabled: BooleanConstructor;
-}>> & {
-    onValidate?: ((prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => any) | undefined;
+}>> & Readonly<{
     onReset?: (() => any) | undefined;
     onSubmit?: ((_model: Record<string, any>) => any) | undefined;
-    "onUpdate:activeItemKey"?: ((_activeKey: string | number | symbol) => any) | undefined;
+    onValidate?: ((prop: import('element-plus').FormItemProp, isValid: boolean, message: string) => any) | undefined;
     "onUpdate:searchExpand"?: ((_expand: boolean) => any) | undefined;
     onUpdateValue?: ((_prop: string, _value: unknown) => any) | undefined;
     "onUpdate:items"?: ((_items: ProFormItemProps[]) => any) | undefined;
-}, {
+    "onUpdate:activeItemKey"?: ((_activeKey: string | number | symbol) => any) | undefined;
+}>, {
     disabled: boolean;
     footer: boolean;
-    labelPosition: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "top" | "right" | "left", unknown>;
-    requireAsteriskPosition: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "right" | "left", unknown>;
+    labelPosition: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "top" | "left" | "right", unknown>;
+    requireAsteriskPosition: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "left" | "right", unknown>;
     labelWidth: string | number;
     labelSuffix: string;
     inline: boolean;
@@ -212,12 +198,18 @@ declare const _default: import('vue').DefineComponent<{
     scrollToError: boolean;
     editable: boolean;
     resetText: string;
+    footerColProps: import('../ele-app/el').ElColProps;
     submitText: string;
     showSearchExpand: boolean;
-    searchExpand: boolean;
     searchExpandText: string;
     searchShrinkText: string;
-    footerColProps: import('../ele-app/el').ElColProps;
+    searchExpand: boolean;
     preventFormSubmit: 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;
+    };
+};