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

package/lib/ele-pro-form-builder/components/children-edit.cjs

@@ -2,7 +2,8 @@
 const vue = require("vue");
 const VueDraggable = require("vuedraggable");
 const elementPlus = require("element-plus");
-const icons = require("../../icons");
+const index = require("../../icons/index");
+const buildCore = require("./build-core");
 const ComponentName = require("./component-name");
 const _hoisted_1 = { class: "ele-pro-form-builder-children-edit-item" };
 const _hoisted_2 = {
@@ -16,6 +17,7 @@ const _hoisted_3 = {
 const _hoisted_4 = ["onClick"];
 const _hoisted_5 = { class: "ele-pro-form-builder-children-edit-item-text" };
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...{ name: "ChildrenEdit" },
   __name: "children-edit",
   props: {
     addBtnText: {},
@@ -26,6 +28,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const isFixedChildType = vue.computed(() => {
+      var _a;
+      const parentType = (_a = props.formItem) == null ? void 0 : _a.type;
+      return !!(parentType && buildCore.fixedChildTypes.some((d) => d.type === parentType));
+    });
     const handleUpdateLabel = (value, item, field) => {
       emit("updateChildLabel", value, item, field);
     };
@@ -59,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               vue.createElementVNode("div", _hoisted_1, [
                 vue.createVNode(vue.unref(elementPlus.ElIcon), { class: "ele-pro-form-builder-children-edit-item-handle" }, {
                   default: vue.withCtx(() => [
-                    vue.createVNode(vue.unref(icons.DragOutlined))
+                    vue.createVNode(vue.unref(index.DragOutlined))
                   ]),
                   _: 1
                 }),
@@ -93,7 +100,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   onClick: vue.withModifiers(($event) => handleDelete(element), ["stop"])
                 }, {
                   default: vue.withCtx(() => [
-                    vue.createVNode(vue.unref(icons.DeleteOutlined))
+                    vue.createVNode(vue.unref(index.DeleteOutlined))
                   ]),
                   _: 2
                 }, 1032, ["onClick"])
@@ -104,8 +111,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }, 8, ["modelValue"])) : vue.createCommentVNode("", true),
         vue.createVNode(vue.unref(elementPlus.ElButton), {
           size: "small",
-          icon: vue.unref(icons.PlusOutlined),
-          style: { width: "100%" },
+          icon: isFixedChildType.value ? vue.unref(index.PlusSquareDashOutlined) : vue.unref(index.PlusOutlined),
+          class: "ele-pro-form-builder-props-fluid-btn is-small-icon",
           onClick: handleAdd
         }, vue.createSlots({ _: 2 }, [
           _ctx.addBtnText ? {

package/lib/ele-pro-form-builder/components/children-edit.d.ts

@@ -22,11 +22,11 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     /** 组件库数据 */
     componentData: ComponentGroup[];
 }>>> & Readonly<{
+    onAddChildren?: ((parent: ProFormItemProps) => any) | undefined;
     "onUpdate:currentFormItemId"?: ((formItemId?: string | undefined) => any) | undefined;
     onUpdateChildLabel?: ((label: string, child: ProFormItemProps, field: string) => any) | undefined;
     onSortChildren?: ((children: ProFormItemProps[]) => any) | undefined;
     onDeleteChildren?: ((child: ProFormItemProps) => any) | undefined;
-    onAddChildren?: ((parent: ProFormItemProps) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

package/lib/ele-pro-form-builder/components/code-editer.cjs

@@ -2,6 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...{ name: "CodeEditer" },
   __name: "code-editer",
   props: {
     modelValue: {}

package/lib/ele-pro-form-builder/components/code-generator.cjs

@@ -1,14 +1,23 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const core = require("../../utils/core");
+const common = require("../../utils/common");
 const util = require("../../ele-pro-form/util");
-const itemTypeData = require("../../ele-pro-form/components/item-type-data");
 const renderUtil = require("../../ele-pro-form/components/render-util");
+const renderCore = require("../../ele-pro-form/components/render-core");
 const buildCore = require("./build-core");
 const codeJsVar = require("./code-js-var");
 const codeUtil = require("./code-util");
 const codeTemplate = require("./code-template");
 const uploadTypes = ["imageUpload", "fileUpload"];
+function isArrayOptions(item, options) {
+  var _a;
+  const optionData = (options ?? ((_a = item == null ? void 0 : item.props) == null ? void 0 : _a.options)) || [];
+  const jsVar = codeJsVar.transformJsVar(optionData);
+  if (jsVar != null) {
+    return jsVar.dataType === "array";
+  }
+  return Array.isArray(optionData);
+}
 function generateFooterCode(config, showFooterExpand) {
   if (!config.footer) {
     return "";
@@ -18,12 +27,23 @@ function generateFooterCode(config, showFooterExpand) {
   return codeUtil.templateEngine(codeTemplate.footerTemplate, {
     footerStyleCode: code,
     footerPropsCode: codeUtil.generatePropsCode(config.footerProps),
-    showFooterExpand
+    showFooterExpand,
+    submitText: config.submitText,
+    resetText: config.resetText,
+    searchExpandText: config.searchExpandText,
+    searchShrinkText: config.searchShrinkText
   });
 }
 function generateFormItemProps(item, indentSize, indentChar) {
   const { vIf, label, prop, itemProps } = item;
-  const props = { label, prop, ...itemProps || {}, vIf };
+  const labelWidth = itemProps == null ? void 0 : itemProps.labelWidth;
+  const props = {
+    label,
+    prop,
+    ...itemProps || {},
+    labelWidth: typeof labelWidth === "number" ? `${labelWidth}px` : labelWidth,
+    vIf
+  };
   const code = codeUtil.generatePropsCode(props, null, indentSize);
   return codeUtil.addIndentChar(code, indentChar);
 }
@@ -35,7 +55,7 @@ function generateColProps(item, grid, indentSize, indentChar) {
   return codeUtil.addIndentChar(code, indentChar);
 }
 function generateComponentProps(item, indentSize, indentChar, omitKeys) {
-  const props = core.omit(item.props || {}, [
+  const props = common.omit(item.props || {}, [
     ...omitKeys || [],
     ...item.type && ["div", "tableCell"].includes(item.type) ? ["is", "innerHTML"] : []
   ]);
@@ -50,27 +70,27 @@ function getItemComponentTag(item, componentData) {
     }
   } else if (item.type === "autocomplete") {
     const fetchSuggestions = ((_b = item.props) == null ? void 0 : _b.fetchSuggestions) ?? [];
-    if (Array.isArray(fetchSuggestions)) {
+    if (isArrayOptions(item, fetchSuggestions)) {
       return "el-autocomplete";
     }
   } else if (item.type === "mention") {
     const options = ((_c = item.props) == null ? void 0 : _c.options) ?? [];
-    if (Array.isArray(options)) {
+    if (isArrayOptions(item, options)) {
       return "el-mention";
     }
   } else if (item.type === "transfer") {
     const data = ((_d = item.props) == null ? void 0 : _d.data) ?? [];
-    if (Array.isArray(data)) {
+    if (isArrayOptions(item, data)) {
       return "el-transfer";
     }
   } else if (item.type === "treeSelect" || item.type === "treeMultipleSelect") {
     const data = ((_e = item.props) == null ? void 0 : _e.data) ?? [];
-    if (Array.isArray(data)) {
+    if (isArrayOptions(item, data)) {
       return "el-tree-select";
     }
   } else if (item.type === "cascader" || item.type === "multipleCascader") {
     const options = ((_f = item.props) == null ? void 0 : _f.options) ?? [];
-    if (Array.isArray(options)) {
+    if (isArrayOptions(item, options)) {
       return "el-cascader";
     }
   }
@@ -101,14 +121,20 @@ function getDivTag(item) {
   }
   return divTag || "div";
 }
-function generateContentCode(config, showFooterExpand, componentData, itemTypeData2) {
+function generateContentCode(config, showFooterExpand, componentData, itemTypeData) {
   let contentCode = codeUtil.templateEngine(codeTemplate.contentTemplate, {
     items: config.items,
     grid: config.grid,
     rowProps: config.rowProps,
     indentSize: 4,
     contentExtra: generateFooterCode(config, showFooterExpand),
-    contentExtraColProps: config.footerColProps || { span: 24 },
+    contentExtraColProps: {
+      ...config.autoFooterCol ? renderCore.computeContentExtraCol(
+        config.grid === true ? { span: 12 } : config.grid || {},
+        (config.items || []).filter((d) => d.vIf == null).length
+      ) : { span: 24 },
+      ...config.footerColProps || {}
+    },
     generateFormItemProps,
     generateColProps,
     generateComponentProps,
@@ -121,9 +147,10 @@ function generateContentCode(config, showFooterExpand, componentData, itemTypeDa
     ),
     getDivTag,
     getComponentTag: (item) => getItemComponentTag(item, componentData),
-    isContainerType: (item) => util.isContainerType(item, itemTypeData2),
+    isContainerType: (item) => util.isContainerType(item, itemTypeData),
     addIndentChar: codeUtil.addIndentChar,
-    generatePropsCode: codeUtil.generatePropsCode
+    generatePropsCode: codeUtil.generatePropsCode,
+    isArrayOptions
   });
   [
     "img",
@@ -147,22 +174,21 @@ function generateContentCode(config, showFooterExpand, componentData, itemTypeDa
 function getUploadValidatorCode(item) {
   const refName = renderUtil.getComponentRefName(item);
   return `(_rule, value, callback) => {
-  if (value && ${refName}.value && !${refName}.value.isDone()) {
+  const compRef = getProFormRefs()['${refName}'];
+  if (compRef && compRef.isDone && !compRef.isDone()) {
     return callback(new Error('${item.label}还未上传完毕'));
   }
   callback();
 }`;
 }
-function generateRuleCode(items, componentData, itemTypeData$1) {
+function generateRuleCode(items, componentData, itemTypeData, requiredLang) {
   const rules = {};
-  core.eachTree(items, (item) => {
-    if (util.isContainerType(item, itemTypeData$1)) {
+  common.eachTree(items, (item) => {
+    if (util.isContainerType(item, itemTypeData)) {
       return;
     }
     const itemRules = [];
-    const typeData = item.type ? [...itemTypeData$1 || [], ...itemTypeData.defaultItemTypeData].find(
-      (d) => d.type === item.type
-    ) : void 0;
+    const typeData = renderUtil.getItemTypeData(item, itemTypeData);
     if (item.required) {
       const config = buildCore.getComponentItemByType(item.type, componentData);
       const componentPropsData = {
@@ -175,7 +201,8 @@ function generateRuleCode(items, componentData, itemTypeData$1) {
         message: renderUtil.getRuleMessage(
           item.label,
           item.requiredMessage,
-          componentPropsData.placeholder
+          componentPropsData.placeholder,
+          requiredLang
         ),
         trigger: (typeData == null ? void 0 : typeData.requiredTrigger) ?? "change"
       });
@@ -192,20 +219,16 @@ function generateRuleCode(items, componentData, itemTypeData$1) {
   });
   return codeUtil.obj2Str(rules, false, 2);
 }
-function getComponentProps(item, componentData, itemTypeData2) {
-  const data = buildCore.getComponentItemByType(item.type, componentData);
+function getComponentProps(item, componentData, itemTypeData) {
+  const typeData = buildCore.getComponentItemByType(item.type, componentData);
   const props = {
-    ...(data == null ? void 0 : data.defaultProps) || {},
+    ...(typeData == null ? void 0 : typeData.defaultProps) || {},
     ...item.props || {},
-    ...(data == null ? void 0 : data.reservedProps) || {}
+    ...(typeData == null ? void 0 : typeData.reservedProps) || {}
   };
   const refName = renderUtil.getComponentRefName(item);
-  props.ref = new codeJsVar.JsVar({
-    name: refName,
-    code: `/** ${item.label || item.prop}引用 */
-const ${refName} = ref(null);`
-  });
-  if (item.type && util.isContainerType(item, itemTypeData2)) {
+  props.ref = new codeJsVar.JsVar({ name: refName });
+  if (item.type && util.isContainerType(item, itemTypeData)) {
     props.vIf = item.vIf;
     if (item.type === "steps") {
       if (props.active == null) {
@@ -245,7 +268,8 @@ const ${refName} = ref(null);`
     props.options = new codeJsVar.JsVar({
       name: `${keyName}CascaderOptions`,
       code: `/** ${labelName}级联数据 */
-const ${keyName}CascaderOptions = ref(${codeUtil.obj2Str(props.options || [], false, 0)});`
+const ${keyName}CascaderOptions = ref(${codeUtil.obj2Str(props.options || [], false, 0)});`,
+      dataType: Array.isArray(props.options || []) ? "array" : void 0
     });
     const temp = props.props || {};
     if (item.type === "multipleCascader") {
@@ -256,12 +280,6 @@ const ${keyName}CascaderOptions = ref(${codeUtil.obj2Str(props.options || [], fa
       code: `/** ${labelName}级联配置 */
 const ${keyName}CascaderProps = reactive(${codeUtil.obj2Str(temp, false, 0)});`
     });
-  } else if (item.type === "virtualTreeSelect" || item.type === "virtualTreeMultipleSelect") {
-    props.treeProps = new codeJsVar.JsVar({
-      name: `${keyName}TreeProps`,
-      code: `/** ${labelName}树配置 */
-const ${keyName}TreeProps = reactive(${codeUtil.obj2Str(props.treeProps || {}, false, 0)});`
-    });
   } else if (item.type === "tableSelect" || item.type === "tableMultipleSelect") {
     props.tableProps = new codeJsVar.JsVar({
       name: `${keyName}TableProps`,
@@ -284,11 +302,12 @@ const ${keyName}TreeProps = ref(${codeUtil.obj2Str(props.treeProps || {}, false,
     props.data = new codeJsVar.JsVar({
       name: `${keyName}Data`,
       code: `/** ${labelName}数据 */
-const ${keyName}Data = ref(${codeUtil.obj2Str(props.data || [], false, 0)});`
+const ${keyName}Data = ref(${codeUtil.obj2Str(props.data || [], false, 0)});`,
+      dataType: Array.isArray(props.data || []) ? "array" : void 0
     });
   } else if (item.type === "select" || item.type === "multipleSelect" || item.type === "radio" || item.type === "radioButton" || item.type === "checkbox" || item.type === "checkboxButton") {
     const options = props.options || [];
-    if (!Array.isArray(data)) {
+    if (!Array.isArray(options)) {
       props.options = new codeJsVar.JsVar({
         name: `${keyName}Options`,
         code: `/** ${labelName}选项数据 */
@@ -299,37 +318,30 @@ const ${keyName}Options = ref(${codeUtil.obj2Str(options, false, 0)});`
     props.options = new codeJsVar.JsVar({
       name: `${keyName}Options`,
       code: `/** ${labelName}选项数据 */
-const ${keyName}Options = ref(${codeUtil.obj2Str(props.options || [], false, 0)});`
+const ${keyName}Options = ref(${codeUtil.obj2Str(props.options || [], false, 0)});`,
+      dataType: Array.isArray(props.options || []) ? "array" : void 0
     });
   } else if (item.type === "autocomplete") {
     props.fetchSuggestions = new codeJsVar.JsVar({
       name: `${keyName}FetchSuggestions`,
       code: `/** ${labelName}建议数据 */
-const ${keyName}FetchSuggestions = ref(${codeUtil.obj2Str(props.fetchSuggestions || [], false, 0)});`
+const ${keyName}FetchSuggestions = ref(${codeUtil.obj2Str(props.fetchSuggestions || [], false, 0)});`,
+      dataType: Array.isArray(props.fetchSuggestions || []) ? "array" : void 0
     });
   }
   return props;
 }
-function getImportAndVarCode(config) {
+function getImportAndVarCode(config, componentData) {
   const imports = /* @__PURE__ */ new Set([]);
   const codes = /* @__PURE__ */ new Set([]);
-  core.eachTree(config.items, (item) => {
-    if (item.type === "imageUpload") {
-      imports.add(
-        `import ImageUpload from '@/components/ImageUpload/index';`
-      );
-    } else if (item.type === "fileUpload") {
-      imports.add(
-        `import FileUpload from '@/components/FileUpload/index';`
-      );
-    } else if (item.type === "regions") {
-      imports.add(
-        `import RegionsSelect from '@/components/RegionsSelect/index';`
-      );
-    } else if (item.type === "editor") {
-      imports.add(
-        `import TinymceEditor from '@/components/TinymceEditor/index';`
-      );
+  common.eachTree(config.items, (item) => {
+    var _a;
+    const componentImport = (_a = buildCore.getComponentItemByType(
+      item.type,
+      componentData
+    )) == null ? void 0 : _a.componentImport;
+    if (componentImport) {
+      imports.add(componentImport);
     }
   });
   if (config.showSearchExpand) {
@@ -362,7 +374,7 @@ function getImportAndVarCode(config) {
   });
   return {
     imports: [
-      `import { ref, reactive, computed, nextTick } from 'vue';`,
+      `import { ref, reactive, nextTick, getCurrentInstance } from 'vue';`,
       `import { useFormData } from '@/utils/use-form-data';`,
       `import httpRequest from '@/utils/request';`,
       ...imports
@@ -372,29 +384,30 @@ function getImportAndVarCode(config) {
       `import { reactive } from 'vue';`,
       `import { useFormData } from '@/utils/use-form-data';`,
       `import { getFormInitValue } from '@/components/ProForm/util';`,
-      `import ProForm from '@/components/ProForm/index';`,
+      `import ProForm from '@/components/ProForm/index.vue';`,
       ...proImports
     ],
     proCodes: [...proCodes]
   };
 }
-function getElNormalizeItems(formItems, componentData, itemTypeData2) {
-  const items = core.mapTree(formItems, (item) => {
+function getElNormalizeItems(formItems, componentData, itemTypeData) {
+  const items = common.mapTree(formItems, (item) => {
     return {
       ...item,
-      props: getComponentProps(item, componentData, itemTypeData2),
+      props: getComponentProps(item, componentData, itemTypeData),
       initValue: void 0
     };
   });
-  return JSON.parse(JSON.stringify(items));
+  return buildCore.deepCloneObject(items, true);
 }
-function generateElFormCode(data, componentData, itemTypeData2) {
-  const config = JSON.parse(
-    JSON.stringify({ ...data || {}, items: (data == null ? void 0 : data.items) || [] })
-  );
-  const formInitValue = util.getFormInitValue(config.items, itemTypeData2);
-  config.items = getElNormalizeItems(config.items, componentData, itemTypeData2);
-  const elFormProps = core.pick(config, [
+function generateElFormCode(data, componentData, itemTypeData, requiredLang) {
+  const config = buildCore.deepCloneObject({
+    ...data || {},
+    items: (data == null ? void 0 : data.items) || []
+  });
+  const formInitValue = util.getFormInitValue(config.items, itemTypeData);
+  config.items = getElNormalizeItems(config.items, componentData, itemTypeData);
+  const elFormProps = common.pick(config, [
     "labelPosition",
     "requireAsteriskPosition",
     "labelWidth",
@@ -417,40 +430,37 @@ function generateElFormCode(data, componentData, itemTypeData2) {
     config,
     sfe,
     componentData,
-    itemTypeData2
+    itemTypeData
   );
-  const { imports, codes } = getImportAndVarCode(config);
-  const refNamesCode = config.items.map(
-    (item) => `${renderUtil.getComponentRefName(item)}: ${renderUtil.getComponentRefName(item)}.value`
-  ).join(",\n    ");
+  const { imports, codes } = getImportAndVarCode(config, componentData);
   codes.push(`/** 获取组件引用 */
+const currentInstance = getCurrentInstance();
 const getProFormRefs = () => {
-  return {
-    ${refNamesCode}
-  };
+  return currentInstance.ctx.$refs;
 };`);
-  codes.push(`/** 表单项数量 */
-const items = { length: ${config.items.length} };`);
   const templateData = {
     modelCode: codeUtil.obj2Str(formInitValue, false, 2),
     formContentCode,
     formPropsCode: codeUtil.generatePropsCode(elFormProps, false, 4, false),
-    formRuleCode: generateRuleCode(config.items, componentData, itemTypeData2),
+    formRuleCode: generateRuleCode(
+      config.items,
+      componentData,
+      itemTypeData,
+      requiredLang
+    ),
     formImportCode: imports.join("\n  "),
     formVarCode: codeUtil.addIndentChar(codes.join("\n\n"), "  "),
     showFooterExpand: sfe
   };
   return codeUtil.templateEngine(codeTemplate.formTemplate, templateData);
 }
-function generateProFormCode(data) {
-  const config = JSON.parse(
-    JSON.stringify({ ...data || {}, items: (data == null ? void 0 : data.items) || [] })
-  );
+function generateProFormCode(data, componentData) {
+  const config = buildCore.deepCloneObject({
+    ...data || {},
+    items: (data == null ? void 0 : data.items) || []
+  });
   const sfe = config.showSearchExpand;
-  if (sfe) {
-    config.submitText = "搜索";
-  }
-  const { proImports, proCodes } = getImportAndVarCode(config);
+  const { proImports, proCodes } = getImportAndVarCode(config, componentData);
   const templateData = {
     proFormConfigCode: codeUtil.obj2Str(config, false, 2, () => void 0),
     proFormImportCode: proImports.join("\n  "),
@@ -474,3 +484,4 @@ exports.getElNormalizeItems = getElNormalizeItems;
 exports.getImportAndVarCode = getImportAndVarCode;
 exports.getItemComponentTag = getItemComponentTag;
 exports.getUploadValidatorCode = getUploadValidatorCode;
+exports.isArrayOptions = isArrayOptions;

package/lib/ele-pro-form-builder/components/code-generator.d.ts

@@ -1,12 +1,19 @@
+import { EleProFormProps } from '../../ele-app/plus';
 import { ProFormItemProps, ProFormItemTypeData } from '../../ele-pro-form/types';
-import { ComponentGroup, TemplateFormConfig } from '../types';
+import { ComponentGroup } from '../types';
 
+/**
+ * 判断选项数据是否是数组类型
+ * @param item 表单项
+ * @param options 选项数据
+ */
+export declare function isArrayOptions(item?: ProFormItemProps, options?: any): boolean;
 /**
  * 生成 ElForm 底栏代码
  * @param config 表单配置数据
  * @param showFooterExpand 是否需要展开收起按钮
  */
-export declare function generateFooterCode(config: TemplateFormConfig, showFooterExpand?: boolean): string;
+export declare function generateFooterCode(config: EleProFormProps, showFooterExpand?: boolean): string;
 /**
  * 生成 ElFormItem 所有属性代码
  * @param item 表单项
@@ -57,7 +64,7 @@ export declare function getDivTag(item: ProFormItemProps): any;
  * @param componentData 组件库数据
  * @param itemTypeData 高级表单组件类型数据
  */
-export declare function generateContentCode(config: TemplateFormConfig, showFooterExpand: boolean | undefined, componentData?: ComponentGroup[], itemTypeData?: ProFormItemTypeData[]): string;
+export declare function generateContentCode(config: EleProFormProps, showFooterExpand: boolean | undefined, componentData?: ComponentGroup[], itemTypeData?: ProFormItemTypeData[]): string;
 /**
  * 获取上传组件表单验证方法代码
  * @param item 表单项
@@ -68,8 +75,9 @@ export declare function getUploadValidatorCode(item: ProFormItemProps): string;
  * @param items 表单项数据
  * @param componentData 组件库数据
  * @param itemTypeData 高级表单组件类型数据
+ * @param requiredLang 默认的必填提示文本
  */
-export declare function generateRuleCode(items: ProFormItemProps[], componentData?: ComponentGroup[], itemTypeData?: ProFormItemTypeData[]): any;
+export declare function generateRuleCode(items: ProFormItemProps[], componentData?: ComponentGroup[], itemTypeData?: ProFormItemTypeData[], requiredLang?: string): any;
 /**
  * 获取生成 ElForm 代码时组件的属性
  * @param item 表单项
@@ -82,8 +90,9 @@ export declare function getComponentProps(item: ProFormItemProps, componentData?
 /**
  * 获取导入代码和变量声明代码
  * @param config 表单配置
+ * @param componentData 组件库数据
  */
-export declare function getImportAndVarCode(config: TemplateFormConfig): {
+export declare function getImportAndVarCode(config: EleProFormProps, componentData?: ComponentGroup[]): {
     imports: string[];
     codes: string[];
     proImports: string[];
@@ -101,10 +110,12 @@ export declare function getElNormalizeItems(formItems?: ProFormItemProps[], comp
  * @param data 表单配置数据
  * @param componentData 组件库数据
  * @param itemTypeData 高级表单组件类型数据
+ * @param requiredLang 默认的必填提示文本
  */
-export declare function generateElFormCode(data?: TemplateFormConfig, componentData?: ComponentGroup[], itemTypeData?: ProFormItemTypeData[]): string;
+export declare function generateElFormCode(data?: EleProFormProps, componentData?: ComponentGroup[], itemTypeData?: ProFormItemTypeData[], requiredLang?: string): string;
 /**
  * 生成 ProForm 代码
  * @param data 表单配置数据
+ * @param componentData 组件库数据
  */
-export declare function generateProFormCode(data?: TemplateFormConfig): string;
+export declare function generateProFormCode(data?: EleProFormProps, componentData?: ComponentGroup[]): string;

package/lib/ele-pro-form-builder/components/code-js-var.cjs

@@ -3,7 +3,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const renderUtil = require("../../ele-pro-form/components/render-util");
+const renderCore = require("../../ele-pro-form/components/render-core");
 class JsVar {
   constructor(props) {
     /** 生成代码时显示的变量名称 */
@@ -16,6 +16,8 @@ class JsVar {
     __publicField(this, "imports");
     /** 生成 ProForm 代码时添加的导入代码 */
     __publicField(this, "proImports");
+    /** 原始数据类型 */
+    __publicField(this, "dataType");
     /** 转 JSON 时标识是 JsVar 对象 */
     __publicField(this, "__isJsVar", true);
     this.name = props.name;
@@ -23,6 +25,7 @@ class JsVar {
     this.proCode = props.proCode;
     this.imports = props.imports;
     this.proImports = props.proImports;
+    this.dataType = props.dataType;
   }
 }
 function removePrefixStr(content, prefix) {
@@ -41,8 +44,8 @@ function removePrefixStr(content, prefix) {
 function transformJsVar(jv) {
   if (jv != null) {
     if (typeof jv === "string") {
-      if (jv.startsWith(renderUtil.codeStringPrefix)) {
-        const codeName = removePrefixStr(jv, [renderUtil.codeStringPrefix]);
+      if (jv.startsWith(renderCore.codeStringPrefix)) {
+        const codeName = removePrefixStr(jv, [renderCore.codeStringPrefix]);
         return new JsVar({ name: codeName });
       }
     }

package/lib/ele-pro-form-builder/components/code-js-var.d.ts

@@ -12,6 +12,8 @@ export declare class JsVar {
     imports?: string[];
     /** 生成 ProForm 代码时添加的导入代码 */
     proImports?: string[];
+    /** 原始数据类型 */
+    dataType?: string;
     /** 转 JSON 时标识是 JsVar 对象 */
     __isJsVar: boolean;
     constructor(props: Omit<JsVar, '__isJsVar'>);