@kp-ui/lowcode 1.0.25 → 1.0.27

package/render.js

@@ -1,27 +1,27 @@
-import { createVNode as b, render as C, resolveComponent as y, createBlock as u, openBlock as h, withCtx as m, withModifiers as $, normalizeClass as _, createElementBlock as R, Fragment as v, renderList as p, resolveDynamicComponent as S, createSlots as W, renderSlot as L, normalizeProps as O, guardReactiveProps as w } from "vue";
-import J from "./src/utils/emitter.js";
-import k from "./_virtual/_plugin-vue_export-helper.js";
+import { createVNode, render, resolveComponent, createBlock, openBlock, withCtx, withModifiers, normalizeClass, createElementBlock, Fragment, renderList, resolveDynamicComponent, createSlots, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import emitter from "./src/utils/emitter.js";
+import _export_sfc from "./_virtual/_plugin-vue_export-helper.js";
 /* empty css                                                              */
 import "./src/components/form-render/container-item/grid-col-item.vue.js";
-import P, { changeLocale as H } from "./src/utils/i18n.js";
-import { buildDefaultFormJson as z, getContainerWidgetByName as M, cloneFormConfigWithoutEventHandler as j, deepClone as d, getDSByName as E, overwriteObj as g, runDataSourceRequest as A, getAllContainerWidgets as B, getAllFieldWidgets as T, getDefaultFormConfig as N, traverseFieldWidgets as G, getFieldWidgetByName as x, traverseFieldWidgetsOfContainer as q, insertCustomCssToHead as U, insertGlobalFunctionsToHtml as K, generateId as F } from "./src/utils/util.js";
+import i18n, { changeLocale } from "./src/utils/i18n.js";
+import { buildDefaultFormJson, getContainerWidgetByName, cloneFormConfigWithoutEventHandler, deepClone, getDSByName, overwriteObj, runDataSourceRequest, getAllContainerWidgets, getAllFieldWidgets, getDefaultFormConfig, traverseFieldWidgets, getFieldWidgetByName, traverseFieldWidgetsOfContainer, insertCustomCssToHead, insertGlobalFunctionsToHtml, generateId } from "./src/utils/util.js";
 import "./src/components/form-render/container-item/grid-sub-form-item.vue.js";
 import "./src/components/form-render/container-item/sub-form-item.vue.js";
 import "./src/components/form-render/container-item/tab-item.vue.js";
 import "./src/components/form-render/container-item/table-cell-item.vue.js";
 /* empty css                                                         */
 import "./src/components/form-render/container-item/vf-collapse-item.vue.js";
-import Q from "./src/components/form-designer/form-widget/field-widget/index.js";
-import X from "./src/components/form-render/dynamic-dialog.vue.js";
-import Y from "./src/components/form-render/dynamic-drawer.vue.js";
-import { fmtHttpParams as V } from "./src/utils/request/fmtHttpParams.js";
+import comps from "./src/components/form-designer/form-widget/field-widget/index.js";
+import DynamicDialog from "./src/components/form-render/dynamic-dialog.vue.js";
+import DynamicDrawer from "./src/components/form-render/dynamic-drawer.vue.js";
+import { fmtHttpParams } from "./src/utils/request/fmtHttpParams.js";
 /* empty css                                     */
-const Z = {
+const _sfc_main = {
   name: "VFormRender",
   componentName: "VFormRender",
-  mixins: [J, P],
+  mixins: [emitter, i18n],
   components: {
-    ...Q
+    ...comps
   },
   props: {
     vfCtx: {
@@ -31,7 +31,7 @@ const Z = {
     formJson: {
       //prop传入的表单JSON配置
       type: Object,
-      default: () => z()
+      default: () => buildDefaultFormJson()
     },
     formData: {
       //prop传入的表单数据
@@ -46,20 +46,22 @@ const Z = {
     previewState: {
       //是否表单预览状态
       type: Boolean,
-      default: !1
+      default: false
     },
     disabledMode: {
       //表单禁止编辑模式
       type: Boolean,
-      default: !1
+      default: false
     },
     renderConfig: {
       //渲染配置对象
       type: Object,
-      default: () => ({
-        languageName: "zh-CN"
-        //界面语言，默认显示中文
-      })
+      default: () => {
+        return {
+          languageName: "zh-CN"
+          //界面语言，默认显示中文
+        };
+      }
     },
     globalDsv: {
       // 全局数据源变量
@@ -73,7 +75,7 @@ const Z = {
     dynamicCreation: {
       //是否弹窗、抽屉动态创建的VFormRender
       type: Boolean,
-      default: !1
+      default: false
     }
   },
   provide() {
@@ -91,7 +93,7 @@ const Z = {
       },
       previewState: this.previewState,
       getReadMode: () => this.readModeFlag,
-      getSubFormFieldFlag: () => !1,
+      getSubFormFieldFlag: () => false,
       getSubFormName: () => "",
       getDSResultCache: () => this.dsResultCache
     };
@@ -108,7 +110,7 @@ const Z = {
       //表单唯一Id，用于区分页面上的多个v-form-render组件！！
       externalComponents: {},
       //外部组件实例集合
-      readModeFlag: !1,
+      readModeFlag: false,
       //是否只读查看模式
       dialogOrDrawerRef: null,
       //保存子级VFormRender的包裹弹窗组件或抽屉组件的ref
@@ -126,254 +128,369 @@ const Z = {
       return this.formJsonObj.widgetList;
     },
     labelPosition() {
-      return this.formConfig && this.formConfig.labelPosition ? this.formConfig.labelPosition : "horizontal";
+      if (!!this.formConfig && !!this.formConfig.labelPosition) {
+        return this.formConfig.labelPosition;
+      }
+      return "horizontal";
     },
     labelWidth() {
-      return this.formConfig && this.formConfig.labelWidth ? this.formConfig.labelWidth + "px" : "80px";
+      if (!!this.formConfig && !!this.formConfig.labelWidth) {
+        return this.formConfig.labelWidth + "px";
+      }
+      return "80px";
     },
     size() {
-      return this.formConfig && this.formConfig.size ? this.formConfig.size : "default";
+      if (!!this.formConfig && !!this.formConfig.size) {
+        return this.formConfig.size;
+      }
+      return "default";
     },
     customClass() {
-      return this.formConfig && this.formConfig.customClass ? this.formConfig.customClass : "";
+      return !!this.formConfig && !!this.formConfig.customClass ? this.formConfig.customClass : "";
     }
   },
   watch: {
     //
   },
   created() {
-    this.buildFormModel(this.formJsonObj ? this.formJsonObj.widgetList : null), this.initFormObject();
+    this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
+    this.initFormObject();
   },
   mounted() {
-    this.initLocale(), this.initDataSetRequest();
+    this.initLocale();
+    this.initDataSetRequest();
   },
   methods: {
     async onFormDetail() {
-      var e;
-      const t = this.formConfig.serveList;
-      if ((e = t.vformDetail.http) != null && e.url) {
-        const i = await V.call(this, t.vformDetail, { vfCtx: this.vfCtx });
-        return console.log("res: ", i), i;
+      var _a;
+      const serveList = this.formConfig.serveList;
+      if ((_a = serveList.vformDetail.http) == null ? void 0 : _a.url) {
+        const res = await fmtHttpParams.call(this, serveList.vformDetail, { vfCtx: this.vfCtx });
+        console.log("res: ", res);
+        return res;
       }
     },
     async onFormUpdate() {
-      var i;
-      const t = await this.getFormData(), e = this.formConfig.serveList;
-      if ((i = e.vformDetail.http) != null && i.url) {
-        const o = await V.call(this, e.vformUpdate, {
-          data: t,
+      var _a;
+      const modelForm = await this.getFormData();
+      const serveList = this.formConfig.serveList;
+      if ((_a = serveList.vformDetail.http) == null ? void 0 : _a.url) {
+        const res = await fmtHttpParams.call(this, serveList.vformUpdate, {
+          data: modelForm,
           vfCtx: this.vfCtx
         });
-        return console.log("res: ", o), o;
+        console.log("res: ", res);
+        return res;
       }
     },
-    initFormObject(t = !0) {
-      this.formId = "vfRender" + F(), t && !this.dynamicCreation && this.insertCustomStyleAndScriptNode(), this.addFieldChangeEventHandler(), this.addFieldValidateEventHandler(), this.registerFormToRefList(), this.handleOnCreated(), this.disabledMode && this.$nextTick(() => {
-        this.disableForm();
-      });
+    initFormObject(insertHtmlCodeFlag = true) {
+      this.formId = "vfRender" + generateId();
+      if (!!insertHtmlCodeFlag && !this.dynamicCreation) {
+        this.insertCustomStyleAndScriptNode();
+      }
+      this.addFieldChangeEventHandler();
+      this.addFieldValidateEventHandler();
+      this.registerFormToRefList();
+      this.handleOnCreated();
+      if (!!this.disabledMode) {
+        this.$nextTick(() => {
+          this.disableForm();
+        });
+      }
     },
-    getContainerWidgetName(t) {
-      return t.type === "grid" ? "vf-grid-item" : t.type + "-item";
+    getContainerWidgetName(widget) {
+      if (widget.type === "grid") {
+        return "vf-grid-item";
+      }
+      return widget.type + "-item";
     },
-    getWidgetName(t) {
-      return t.type + "-widget";
+    getWidgetName(widget) {
+      return widget.type + "-widget";
     },
     initLocale() {
-      const t = localStorage.getItem("v_form_locale") || "zh-CN";
-      this.changeLanguage(t);
+      const curLocale = localStorage.getItem("v_form_locale") || "zh-CN";
+      this.changeLanguage(curLocale);
     },
     insertCustomStyleAndScriptNode() {
-      this.formConfig && this.formConfig.cssCode && U(this.formConfig.cssCode, this.previewState ? "" : this.formId), this.formConfig && this.formConfig.functions && K(
-        this.formConfig.functions,
-        this.previewState ? "" : this.formId
-      );
-    },
-    buildFormModel(t) {
-      t && t.length > 0 && t.forEach((e) => {
-        this.buildDataFromWidget(e);
-      });
+      if (!!this.formConfig && !!this.formConfig.cssCode) {
+        insertCustomCssToHead(this.formConfig.cssCode, !!this.previewState ? "" : this.formId);
+      }
+      if (!!this.formConfig && !!this.formConfig.functions) {
+        insertGlobalFunctionsToHtml(
+          this.formConfig.functions,
+          !!this.previewState ? "" : this.formId
+        );
+      }
     },
-    buildDataFromWidget(t) {
-      if (t.category === "container") {
-        if (!(t.type === "vf-dialog" || t.type === "vf-drawer")) if (t.type === "grid")
-          t.cols && t.cols.length > 0 && t.cols.forEach((e) => {
-            this.buildDataFromWidget(e);
-          });
-        else if (t.type === "table")
-          t.rows && t.rows.length > 0 && t.rows.forEach((e) => {
-            e.cols && e.cols.length > 0 && e.cols.forEach((i) => {
-              this.buildDataFromWidget(i);
+    buildFormModel(widgetList) {
+      if (!!widgetList && widgetList.length > 0) {
+        widgetList.forEach((wItem) => {
+          this.buildDataFromWidget(wItem);
+        });
+      }
+    },
+    buildDataFromWidget(wItem) {
+      if (wItem.category === "container") {
+        if (wItem.type === "vf-dialog" || wItem.type === "vf-drawer") ;
+        else if (wItem.type === "grid") {
+          if (!!wItem.cols && wItem.cols.length > 0) {
+            wItem.cols.forEach((childItem) => {
+              this.buildDataFromWidget(childItem);
             });
-          });
-        else if (t.type === "tab")
-          t.tabs && t.tabs.length > 0 && t.tabs.forEach((e) => {
-            e.widgetList && e.widgetList.length > 0 && e.widgetList.forEach((i) => {
-              this.buildDataFromWidget(i);
+          }
+        } else if (wItem.type === "table") {
+          if (!!wItem.rows && wItem.rows.length > 0) {
+            wItem.rows.forEach((rowItem) => {
+              if (!!rowItem.cols && rowItem.cols.length > 0) {
+                rowItem.cols.forEach((colItem) => {
+                  this.buildDataFromWidget(colItem);
+                });
+              }
             });
-          });
-        else if (t.type === "sub-form") {
-          const e = t.options.name;
-          if (this.formData.hasOwnProperty(e)) {
-            const i = this.formData[e];
-            this.formDataModel[e] = d(i);
+          }
+        } else if (wItem.type === "tab") {
+          if (!!wItem.tabs && wItem.tabs.length > 0) {
+            wItem.tabs.forEach((tabItem) => {
+              if (!!tabItem.widgetList && tabItem.widgetList.length > 0) {
+                tabItem.widgetList.forEach((childItem) => {
+                  this.buildDataFromWidget(childItem);
+                });
+              }
+            });
+          }
+        } else if (wItem.type === "sub-form") {
+          const subFormName = wItem.options.name;
+          if (!this.formData.hasOwnProperty(subFormName)) {
+            const subFormDataRow = {};
+            if (wItem.options.showBlankRow) {
+              wItem.widgetList.forEach((subFormItem) => {
+                if (!!subFormItem.formItemFlag) {
+                  subFormDataRow[subFormItem.options.name] = subFormItem.options.defaultValue;
+                }
+              });
+              this.formDataModel[subFormName] = [subFormDataRow];
+            } else {
+              this.formDataModel[subFormName] = [];
+            }
           } else {
-            const i = {};
-            t.options.showBlankRow ? (t.widgetList.forEach((o) => {
-              o.formItemFlag && (i[o.options.name] = o.options.defaultValue);
-            }), this.formDataModel[e] = [i]) : this.formDataModel[e] = [];
+            const initialValue = this.formData[subFormName];
+            this.formDataModel[subFormName] = deepClone(initialValue);
           }
-        } else if (t.type === "grid-sub-form") {
-          const e = t.options.name;
-          if (this.formData.hasOwnProperty(e)) {
-            const i = this.formData[e];
-            this.formDataModel[e] = d(i);
+        } else if (wItem.type === "grid-sub-form") {
+          const gridSubFormName = wItem.options.name;
+          if (!this.formData.hasOwnProperty(gridSubFormName)) {
+            const gsfFWList = [];
+            const fieldListFn = (fw) => {
+              gsfFWList.push(fw);
+            };
+            traverseFieldWidgetsOfContainer(wItem, fieldListFn);
+            const gridSubFormDataRow = {};
+            if (wItem.options.showBlankRow) {
+              gsfFWList.forEach((gridSubFormItem) => {
+                gridSubFormDataRow[gridSubFormItem.options.name] = gridSubFormItem.options.defaultValue;
+              });
+              this.formDataModel[gridSubFormName] = [gridSubFormDataRow];
+            } else {
+              this.formDataModel[gridSubFormName] = [];
+            }
           } else {
-            const i = [];
-            q(t, (r) => {
-              i.push(r);
+            const initialValue = this.formData[gridSubFormName];
+            this.formDataModel[gridSubFormName] = deepClone(initialValue);
+          }
+        } else if (wItem.type === "grid-col" || wItem.type === "table-cell") {
+          if (!!wItem.widgetList && wItem.widgetList.length > 0) {
+            wItem.widgetList.forEach((childItem) => {
+              this.buildDataFromWidget(childItem);
+            });
+          }
+        } else {
+          if (!!wItem.widgetList && wItem.widgetList.length > 0) {
+            wItem.widgetList.forEach((childItem) => {
+              this.buildDataFromWidget(childItem);
             });
-            const s = {};
-            t.options.showBlankRow ? (i.forEach((r) => {
-              s[r.options.name] = r.options.defaultValue;
-            }), this.formDataModel[e] = [s]) : this.formDataModel[e] = [];
           }
-        } else t.type === "grid-col" || t.type === "table-cell" ? t.widgetList && t.widgetList.length > 0 && t.widgetList.forEach((e) => {
-          this.buildDataFromWidget(e);
-        }) : t.widgetList && t.widgetList.length > 0 && t.widgetList.forEach((e) => {
-          this.buildDataFromWidget(e);
-        });
-      } else if (t.formItemFlag)
-        if (!this.formData.hasOwnProperty(t.options.name))
-          this.formDataModel[t.options.name] = t.options.defaultValue;
-        else {
-          const e = this.formData[t.options.name];
-          this.formDataModel[t.options.name] = d(e);
         }
+      } else if (!!wItem.formItemFlag) {
+        if (!this.formData.hasOwnProperty(wItem.options.name)) {
+          this.formDataModel[wItem.options.name] = wItem.options.defaultValue;
+        } else {
+          const initialValue = this.formData[wItem.options.name];
+          this.formDataModel[wItem.options.name] = deepClone(initialValue);
+        }
+      }
     },
     addFieldChangeEventHandler() {
-      this.off$("fieldChange"), this.on$("fieldChange", (t, e, i, o, s) => {
-        this.handleFieldDataChange(t, e, i, o, s), this.$emit(
+      this.off$("fieldChange");
+      this.on$("fieldChange", (fieldName, newValue, oldValue, subFormName, subFormRowIndex) => {
+        this.handleFieldDataChange(fieldName, newValue, oldValue, subFormName, subFormRowIndex);
+        this.$emit(
           "formChange",
-          t,
-          e,
-          i,
+          fieldName,
+          newValue,
+          oldValue,
           this.formDataModel,
-          o,
-          s
+          subFormName,
+          subFormRowIndex
         );
       });
     },
     addFieldValidateEventHandler() {
-      this.off$("fieldValidation"), this.on$("fieldValidation", (t) => {
-        this.$refs.renderForm && this.$refs.renderForm.validateFields(t);
+      this.off$("fieldValidation");
+      this.on$("fieldValidation", (fieldName) => {
+        if (!!this.$refs.renderForm) {
+          this.$refs.renderForm.validateFields(fieldName);
+        }
       });
     },
     registerFormToRefList() {
-      this.widgetRefList.v_form_ref = this;
-    },
-    handleFieldDataChange(t, e, i, o, s) {
-      this.formConfig && this.formConfig.onFormDataChange && new Function(
-        "fieldName",
-        "newValue",
-        "oldValue",
-        "formModel",
-        "subFormName",
-        "subFormRowIndex",
-        this.formConfig.onFormDataChange
-      ).call(
-        this,
-        t,
-        e,
-        i,
-        this.formDataModel,
-        o,
-        s
-      );
+      this.widgetRefList["v_form_ref"] = this;
+    },
+    handleFieldDataChange(fieldName, newValue, oldValue, subFormName, subFormRowIndex) {
+      if (!!this.formConfig && !!this.formConfig.onFormDataChange) {
+        const customFunc = new Function(
+          "fieldName",
+          "newValue",
+          "oldValue",
+          "formModel",
+          "subFormName",
+          "subFormRowIndex",
+          this.formConfig.onFormDataChange
+        );
+        customFunc.call(
+          this,
+          fieldName,
+          newValue,
+          oldValue,
+          this.formDataModel,
+          subFormName,
+          subFormRowIndex
+        );
+      }
     },
     handleOnCreated() {
-      this.formConfig && this.formConfig.onFormCreated && new Function(this.formConfig.onFormCreated).call(this);
+      if (!!this.formConfig && !!this.formConfig.onFormCreated) {
+        const customFunc = new Function(this.formConfig.onFormCreated);
+        customFunc.call(this);
+      }
     },
     handleOnMounted() {
-      this.formConfig && this.formConfig.onFormMounted && new Function(this.formConfig.onFormMounted).call(this);
+      if (!!this.formConfig && !!this.formConfig.onFormMounted) {
+        const customFunc = new Function(this.formConfig.onFormMounted);
+        customFunc.call(this);
+      }
     },
-    findWidgetAndSetDisabled(t, e) {
-      const i = this.getWidgetRef(t);
-      i && i.setDisabled ? i.setDisabled(e) : this.findWidgetOfSubFormAndSetDisabled(t, e);
+    findWidgetAndSetDisabled(widgetName, disabledFlag) {
+      const foundW = this.getWidgetRef(widgetName);
+      if (!!foundW && !!foundW.setDisabled) {
+        foundW.setDisabled(disabledFlag);
+      } else {
+        this.findWidgetOfSubFormAndSetDisabled(widgetName, disabledFlag);
+      }
     },
-    findWidgetOfSubFormAndSetDisabled(t, e) {
-      const i = x(this.formJsonObj.widgetList, t, !0);
-      i && i.options && i.options.hasOwnProperty("disabled") && (i.options.disabled = e), this.findWidgetNameInSubForm(t).forEach((o) => {
-        const s = this.getWidgetRef(o);
-        s && s.setDisabled && s.setDisabled(e);
+    findWidgetOfSubFormAndSetDisabled(widgetName, disabledFlag) {
+      const widgetSchema = getFieldWidgetByName(this.formJsonObj.widgetList, widgetName, true);
+      if (!!widgetSchema && !!widgetSchema.options && widgetSchema.options.hasOwnProperty("disabled")) {
+        widgetSchema.options.disabled = disabledFlag;
+      }
+      this.findWidgetNameInSubForm(widgetName).forEach((wn) => {
+        const sw = this.getWidgetRef(wn);
+        if (!!sw && !!sw.setDisabled) {
+          sw.setDisabled(disabledFlag);
+        }
       });
     },
-    findWidgetAndSetHidden(t, e) {
-      const i = this.getWidgetRef(t);
-      i && i.setDisabled ? i.setHidden(e) : this.findWidgetOfSubFormAndSetHidden(t, e);
+    findWidgetAndSetHidden(widgetName, hiddenFlag) {
+      const foundW = this.getWidgetRef(widgetName);
+      if (!!foundW && !!foundW.setDisabled) {
+        foundW.setHidden(hiddenFlag);
+      } else {
+        this.findWidgetOfSubFormAndSetHidden(widgetName, hiddenFlag);
+      }
     },
-    findWidgetOfSubFormAndSetHidden(t, e) {
-      const i = x(this.formJsonObj.widgetList, t, !0);
-      i && i.options && i.options.hasOwnProperty("hidden") && (i.options.hidden = e), this.findWidgetNameInSubForm(t).forEach((o) => {
-        const s = this.getWidgetRef(o);
-        s && s.setDisabled && s.setHidden(e);
+    findWidgetOfSubFormAndSetHidden(widgetName, hiddenFlag) {
+      const widgetSchema = getFieldWidgetByName(this.formJsonObj.widgetList, widgetName, true);
+      if (!!widgetSchema && !!widgetSchema.options && widgetSchema.options.hasOwnProperty("hidden")) {
+        widgetSchema.options.hidden = hiddenFlag;
+      }
+      this.findWidgetNameInSubForm(widgetName).forEach((wn) => {
+        const sw = this.getWidgetRef(wn);
+        if (!!sw && !!sw.setDisabled) {
+          sw.setHidden(hiddenFlag);
+        }
       });
     },
-    findWidgetNameInSubForm(t) {
-      const e = [];
-      let i = null;
-      const o = (s, r) => {
-        s.options && s.options.name === t && (i = r.options.name);
+    findWidgetNameInSubForm(widgetName) {
+      const result = [];
+      let subFormName = null;
+      const handlerFn = (field, parent) => {
+        if (!!field.options && field.options.name === widgetName) {
+          subFormName = parent.options.name;
+        }
       };
-      if (G(this.widgetList, o), i) {
-        const s = this.getWidgetRef(i);
-        if (s) {
-          const r = s.getRowIdData();
-          r && r.length > 0 && r.forEach((a) => {
-            e.push(t + "@row" + a);
-          });
+      traverseFieldWidgets(this.widgetList, handlerFn);
+      if (!!subFormName) {
+        const subFormRef = this.getWidgetRef(subFormName);
+        if (!!subFormRef) {
+          const rowIds = subFormRef.getRowIdData();
+          if (!!rowIds && rowIds.length > 0) {
+            rowIds.forEach((rid) => {
+              result.push(widgetName + "@row" + rid);
+            });
+          }
         }
       }
-      return e;
+      return result;
     },
     initDataSetRequest() {
-      const t = /* @__PURE__ */ new Set();
-      this.getFieldWidgets().forEach((e) => {
-        e.field.options.dsEnabled && e.field.options.dsName && e.field.options.dataSetName && t.add(e.field.options.dsName);
-      }), t.size > 0 && t.forEach(async (e) => {
-        const i = E(this.formConfig, e);
-        if (i) {
-          const o = new Object({});
-          g(o, this.globalDsv || {});
-          let s = null;
-          try {
-            s = await A(i, o, this, !1, this.$message), this.dsResultCache[e] = s, this.broadcast("FieldWidget", "loadOptionItemsFromDataSet", e);
-          } catch (r) {
-            this.$message.error(r.message);
-          }
+      const dsNameSet = /* @__PURE__ */ new Set();
+      this.getFieldWidgets().forEach((fw) => {
+        if (!!fw.field.options.dsEnabled && !!fw.field.options.dsName && !!fw.field.options.dataSetName) {
+          dsNameSet.add(fw.field.options.dsName);
         }
       });
+      if (dsNameSet.size > 0) {
+        dsNameSet.forEach(async (dsName) => {
+          const curDS = getDSByName(this.formConfig, dsName);
+          if (!!curDS) {
+            const localDsv = new Object({});
+            overwriteObj(localDsv, this.globalDsv || {});
+            let dsResult = null;
+            try {
+              dsResult = await runDataSourceRequest(curDS, localDsv, this, false, this.$message);
+              this.dsResultCache[dsName] = dsResult;
+              this.broadcast("FieldWidget", "loadOptionItemsFromDataSet", dsName);
+            } catch (err) {
+              this.$message.error(err.message);
+            }
+          }
+        });
+      }
     },
     //--------------------- 以下为组件支持外部调用的API方法 begin ------------------//
     /* 提示：用户可自行扩充这些方法！！！ */
-    changeLanguage(t) {
-      H(t);
+    changeLanguage(langName) {
+      changeLocale(langName);
     },
     getLanguageName() {
       return localStorage.getItem("v_form_locale") || "zh-CN";
     },
     getNativeForm() {
-      return this.$refs.renderForm;
+      return this.$refs["renderForm"];
     },
     getFormRef() {
       return this;
     },
-    getWidgetRef(t, e = !1) {
-      const i = this.widgetRefList[t];
-      return !i && e && this.$message.error(this.i18nt("render.hint.refNotFound") + t), i;
+    getWidgetRef(widgetName, showError = false) {
+      const foundRef = this.widgetRefList[widgetName];
+      if (!foundRef && !!showError) {
+        this.$message.error(this.i18nt("render.hint.refNotFound") + widgetName);
+      }
+      return foundRef;
     },
     clearFormDataModel() {
-      for (const t in this.formDataModel)
-        delete this.formDataModel[t];
+      for (const pkey in this.formDataModel) {
+        delete this.formDataModel[pkey];
+      }
     },
     getFormJson() {
       return this.formJsonObj;
@@ -382,174 +499,262 @@ const Z = {
      * 动态加载表单JSON
      * @param newFormJson
      */
-    setFormJson(t) {
-      if (t)
-        if (typeof t == "string" || t.constructor === Object) {
-          let e = null;
-          if (typeof t == "string" ? e = JSON.parse(t) : e = t, !e.formConfig || !e.widgetList) {
+    setFormJson(newFormJson) {
+      if (!!newFormJson) {
+        if (typeof newFormJson === "string" || newFormJson.constructor === Object) {
+          let newFormJsonObj = null;
+          if (typeof newFormJson === "string") {
+            newFormJsonObj = JSON.parse(newFormJson);
+          } else {
+            newFormJsonObj = newFormJson;
+          }
+          if (!newFormJsonObj.formConfig || !newFormJsonObj.widgetList) {
             this.$message.error("Invalid format of form json.");
             return;
           }
-          this.clearFormDataModel(), this.buildFormModel(e.widgetList);
-          const i = d(N());
-          g(i, e.formConfig), this.formJsonObj.formConfig = i, this.formJsonObj.widgetList = e.widgetList, this.insertCustomStyleAndScriptNode(), this.$nextTick(() => {
-            this.initFormObject(!1), this.initDataSetRequest(), this.handleOnMounted();
+          this.clearFormDataModel();
+          this.buildFormModel(newFormJsonObj.widgetList);
+          const defaultFormConfig = deepClone(getDefaultFormConfig());
+          overwriteObj(defaultFormConfig, newFormJsonObj.formConfig);
+          this.formJsonObj["formConfig"] = defaultFormConfig;
+          this.formJsonObj["widgetList"] = newFormJsonObj.widgetList;
+          this.insertCustomStyleAndScriptNode();
+          this.$nextTick(() => {
+            this.initFormObject(false);
+            this.initDataSetRequest();
+            this.handleOnMounted();
           });
-        } else
+        } else {
           this.$message.error("Set form json failed.");
+        }
+      }
     },
     /**
      * 重新加载选项数据
      * @param widgetNames 指定重新加载的组件名称或组件名数组，不传则重新加载所有选项字段
      */
-    reloadOptionData(t) {
-      let e = [];
-      t && typeof t == "string" ? e = [t] : t && Array.isArray(t) && (e = [...t]), this.broadcast("FieldWidget", "reloadOptionItems", e);
+    reloadOptionData(widgetNames) {
+      let eventParams = [];
+      if (!!widgetNames && typeof widgetNames === "string") {
+        eventParams = [widgetNames];
+      } else if (!!widgetNames && Array.isArray(widgetNames)) {
+        eventParams = [...widgetNames];
+      }
+      this.broadcast("FieldWidget", "reloadOptionItems", eventParams);
     },
-    getFormData(t = !0) {
-      if (!t)
+    getFormData(needValidation = true) {
+      if (!needValidation) {
         return this.formDataModel;
-      let e = function() {
+      }
+      let callback = function nullFunc() {
       };
-      const i = new window.Promise(function(o, s) {
-        e = function(r, a) {
-          a ? s(a) : o(r);
+      const promise = new window.Promise(function(resolve, reject) {
+        callback = function(formData, error) {
+          !error ? resolve(formData) : reject(error);
         };
       });
-      return this.$refs.renderForm.validate().then((o) => {
-        e(this.formDataModel);
+      this.$refs["renderForm"].validate().then((res) => {
+        callback(this.formDataModel);
       }).catch(() => {
-        e(this.formDataModel, this.i18nt("render.hint.validationFailed"));
-      }), i;
-    },
-    setFormData(t) {
-      console.log("setFormData: ", t), Object.keys(this.formDataModel).forEach((e) => {
-        t && t.hasOwnProperty(e) && (this.formDataModel[e] = d(t[e]));
-      }), this.broadcast("ContainerItem", "setFormData", this.formDataModel), this.broadcast("FieldWidget", "setFormData", this.formDataModel);
-    },
-    getFieldValue(t) {
-      const e = this.getWidgetRef(t);
-      if (e && e.getValue)
-        return e.getValue();
-      if (!e) {
-        const i = [];
-        return this.findWidgetNameInSubForm(t).forEach((o) => {
-          const s = this.getWidgetRef(o);
-          s && s.getValue && i.push(s.getValue());
-        }), i;
-      }
-    },
-    setFieldValue(t, e, i = !1) {
-      const o = this.getWidgetRef(t);
-      o && o.setValue && o.setValue(e, i), o || this.findWidgetNameInSubForm(t).forEach((s) => {
-        const r = this.getWidgetRef(s);
-        r && r.setValue && r.setValue(e, i);
+        callback(this.formDataModel, this.i18nt("render.hint.validationFailed"));
       });
+      return promise;
     },
-    getSubFormValues(t, e = !0) {
-      return this.subFormRefList[t].getSubFormValues(e);
+    setFormData(formData) {
+      console.log("setFormData: ", formData);
+      Object.keys(this.formDataModel).forEach((propName) => {
+        if (!!formData && formData.hasOwnProperty(propName)) {
+          this.formDataModel[propName] = deepClone(formData[propName]);
+        }
+      });
+      this.broadcast("ContainerItem", "setFormData", this.formDataModel);
+      this.broadcast("FieldWidget", "setFormData", this.formDataModel);
+    },
+    getFieldValue(fieldName) {
+      const fieldRef = this.getWidgetRef(fieldName);
+      if (!!fieldRef && !!fieldRef.getValue) {
+        return fieldRef.getValue();
+      }
+      if (!fieldRef) {
+        const result = [];
+        this.findWidgetNameInSubForm(fieldName).forEach((wn) => {
+          const sw = this.getWidgetRef(wn);
+          if (!!sw && !!sw.getValue) {
+            result.push(sw.getValue());
+          }
+        });
+        return result;
+      }
+    },
+    setFieldValue(fieldName, fieldValue, disableChangeEvent = false) {
+      const fieldRef = this.getWidgetRef(fieldName);
+      if (!!fieldRef && !!fieldRef.setValue) {
+        fieldRef.setValue(fieldValue, disableChangeEvent);
+      }
+      if (!fieldRef) {
+        this.findWidgetNameInSubForm(fieldName).forEach((wn) => {
+          const sw = this.getWidgetRef(wn);
+          if (!!sw && !!sw.setValue) {
+            sw.setValue(fieldValue, disableChangeEvent);
+          }
+        });
+      }
+    },
+    getSubFormValues(subFormName, needValidation = true) {
+      const foundSFRef = this.subFormRefList[subFormName];
+      return foundSFRef.getSubFormValues(needValidation);
     },
     disableForm() {
-      Object.keys(this.widgetRefList).forEach((e) => {
-        const i = this.getWidgetRef(e);
-        i && (i.widget && i.widget.type === "sub-form" ? i.disableSubForm() : i.widget && i.widget.type === "grid-sub-form" ? i.disableGridSubForm() : i.setDisabled && i.setDisabled(!0));
+      const wNameList = Object.keys(this.widgetRefList);
+      wNameList.forEach((wName) => {
+        const foundW = this.getWidgetRef(wName);
+        if (!!foundW) {
+          if (!!foundW.widget && foundW.widget.type === "sub-form") {
+            foundW.disableSubForm();
+          } else if (!!foundW.widget && foundW.widget.type === "grid-sub-form") {
+            foundW.disableGridSubForm();
+          } else {
+            !!foundW.setDisabled && foundW.setDisabled(true);
+          }
+        }
       });
     },
     enableForm() {
-      Object.keys(this.widgetRefList).forEach((e) => {
-        const i = this.getWidgetRef(e);
-        i && (i.widget && i.widget.type === "sub-form" ? i.enableSubForm() : i.widget && i.widget.type === "grid-sub-form" ? i.enableGridSubForm() : i.setDisabled && i.setDisabled(!1));
+      const wNameList = Object.keys(this.widgetRefList);
+      wNameList.forEach((wName) => {
+        const foundW = this.getWidgetRef(wName);
+        if (!!foundW) {
+          if (!!foundW.widget && foundW.widget.type === "sub-form") {
+            foundW.enableSubForm();
+          } else if (!!foundW.widget && foundW.widget.type === "grid-sub-form") {
+            foundW.enableGridSubForm();
+          } else {
+            !!foundW.setDisabled && foundW.setDisabled(false);
+          }
+        }
       });
     },
     resetForm() {
-      Object.keys(this.subFormRefList).forEach((i) => {
-        this.subFormRefList[i].resetSubForm && this.subFormRefList[i].resetSubForm();
-      }), Object.keys(this.widgetRefList).forEach((i) => {
-        const o = this.getWidgetRef(i);
-        o && !o.subFormItemFlag && o.resetField && o.resetField();
-      }), this.$nextTick(() => {
+      const subFormNames = Object.keys(this.subFormRefList);
+      subFormNames.forEach((sfName) => {
+        if (!!this.subFormRefList[sfName].resetSubForm) {
+          this.subFormRefList[sfName].resetSubForm();
+        }
+      });
+      const wNameList = Object.keys(this.widgetRefList);
+      wNameList.forEach((wName) => {
+        const foundW = this.getWidgetRef(wName);
+        if (!!foundW && !foundW.subFormItemFlag && !!foundW.resetField) {
+          foundW.resetField();
+        }
+      });
+      this.$nextTick(() => {
         this.clearValidate();
       });
     },
-    clearValidate(t) {
-      this.$refs.renderForm.clearValidate(t);
+    clearValidate(props) {
+      this.$refs.renderForm.clearValidate(props);
     },
     /**
      * 校验表单
      * @param callback 回调函数
      */
-    validateForm(t) {
-      this.$refs.renderForm.validate((e) => {
-        t(e);
+    validateForm(callback) {
+      this.$refs["renderForm"].validate((valid) => {
+        callback(valid);
       });
     },
     validateFields() {
     },
-    disableWidgets(t) {
-      t && (typeof t == "string" ? this.findWidgetAndSetDisabled(t, !0) : Array.isArray(t) && t.forEach((e) => {
-        this.findWidgetAndSetDisabled(e, !0);
-      }));
+    disableWidgets(widgetNames) {
+      if (!!widgetNames) {
+        if (typeof widgetNames === "string") {
+          this.findWidgetAndSetDisabled(widgetNames, true);
+        } else if (Array.isArray(widgetNames)) {
+          widgetNames.forEach((wn) => {
+            this.findWidgetAndSetDisabled(wn, true);
+          });
+        }
+      }
     },
-    enableWidgets(t) {
-      t && (typeof t == "string" ? this.findWidgetAndSetDisabled(t, !1) : Array.isArray(t) && t.forEach((e) => {
-        this.findWidgetAndSetDisabled(e, !1);
-      }));
+    enableWidgets(widgetNames) {
+      if (!!widgetNames) {
+        if (typeof widgetNames === "string") {
+          this.findWidgetAndSetDisabled(widgetNames, false);
+        } else if (Array.isArray(widgetNames)) {
+          widgetNames.forEach((wn) => {
+            this.findWidgetAndSetDisabled(wn, false);
+          });
+        }
+      }
     },
-    hideWidgets(t) {
-      t && (typeof t == "string" ? this.findWidgetAndSetHidden(t, !0) : Array.isArray(t) && t.forEach((e) => {
-        this.findWidgetAndSetHidden(e, !0);
-      }));
+    hideWidgets(widgetNames) {
+      if (!!widgetNames) {
+        if (typeof widgetNames === "string") {
+          this.findWidgetAndSetHidden(widgetNames, true);
+        } else if (Array.isArray(widgetNames)) {
+          widgetNames.forEach((wn) => {
+            this.findWidgetAndSetHidden(wn, true);
+          });
+        }
+      }
     },
-    showWidgets(t) {
-      t && (typeof t == "string" ? this.findWidgetAndSetHidden(t, !1) : Array.isArray(t) && t.forEach((e) => {
-        this.findWidgetAndSetHidden(e, !1);
-      }));
+    showWidgets(widgetNames) {
+      if (!!widgetNames) {
+        if (typeof widgetNames === "string") {
+          this.findWidgetAndSetHidden(widgetNames, false);
+        } else if (Array.isArray(widgetNames)) {
+          widgetNames.forEach((wn) => {
+            this.findWidgetAndSetHidden(wn, false);
+          });
+        }
+      }
     },
     /**
      * 获取所有字段组件
      * @param staticWidgetsIncluded 是否包含按钮等静态组件，默认不包含
      * @returns {*[]}
      */
-    getFieldWidgets(t = !1) {
-      return T(this.formJsonObj.widgetList, t);
+    getFieldWidgets(staticWidgetsIncluded = false) {
+      return getAllFieldWidgets(this.formJsonObj.widgetList, staticWidgetsIncluded);
     },
     /**
      * 获取所有容器组件
      * @returns {*[]}
      */
     getContainerWidgets() {
-      return B(this.formJsonObj.widgetList);
+      return getAllContainerWidgets(this.formJsonObj.widgetList);
     },
     /**
      * 增加外部组件引用，可通过getEC()方法获取外部组件，以便在VForm内部调用外部组件方法
      * @param componentName 外部组件名称
      * @param externalComponent 外部组件实例
      */
-    addEC(t, e) {
-      this.externalComponents[t] = e;
+    addEC(componentName, externalComponent) {
+      this.externalComponents[componentName] = externalComponent;
     },
     /**
      * 判断外部组件是否可获取
      * @param componentName 外部组件名称
      * @returns {boolean}
      */
-    hasEC(t) {
-      return this.externalComponents.hasOwnProperty(t);
+    hasEC(componentName) {
+      return this.externalComponents.hasOwnProperty(componentName);
     },
     /**
      * 获取外部组件实例
      * @param componentName
      * @returns {*}
      */
-    getEC(t) {
-      return this.externalComponents[t];
+    getEC(componentName) {
+      return this.externalComponents[componentName];
     },
     /**
      * 设置或取消设置表单为只读查看模式
      * @param readonlyFlag
      */
-    setReadMode(t = !0) {
-      this.readModeFlag = t;
+    setReadMode(readonlyFlag = true) {
+      this.readModeFlag = readonlyFlag;
     },
     /**
      * 获取表单当前是否只读查看模式
@@ -570,9 +775,12 @@ const Z = {
      * @param dsName
      * @param localDsv
      */
-    async executeDataSource(t, e) {
-      const i = E(this.formJsonObj.formConfig, t), o = new Object({});
-      return g(o, this.globalDsv), g(o, e), await A(i, o, this, !1, this.$message);
+    async executeDataSource(dsName, localDsv) {
+      const ds = getDSByName(this.formJsonObj.formConfig, dsName);
+      const newDsv = new Object({});
+      overwriteObj(newDsv, this.globalDsv);
+      overwriteObj(newDsv, localDsv);
+      return await runDataSourceRequest(ds, newDsv, this, false, this.$message);
     },
     /**
      * 获取父级VFormRender组件实例
@@ -586,15 +794,17 @@ const Z = {
      * @returns {object}
      */
     getTopFormRef() {
-      if (!this.parentForm)
+      if (!this.parentForm) {
         return this;
-      let t = this.parentForm;
-      for (; t.parentForm; )
-        t = t.parentForm;
-      return t;
+      }
+      let topFormRef = this.parentForm;
+      while (topFormRef.parentForm) {
+        topFormRef = topFormRef.parentForm;
+      }
+      return topFormRef;
     },
-    setChildFormRef(t) {
-      this.childFormRef = t;
+    setChildFormRef(childFormRef) {
+      this.childFormRef = childFormRef;
     },
     getChildFormRef() {
       return this.childFormRef;
@@ -606,8 +816,8 @@ const Z = {
     isDynamicCreation() {
       return this.dynamicCreation;
     },
-    setDialogOrDrawerRef(t) {
-      this.dialogOrDrawerRef = t;
+    setDialogOrDrawerRef(ddRef) {
+      this.dialogOrDrawerRef = ddRef;
     },
     /**
      * 获取子级VFormRender的包裹弹窗组件或抽屉组件实例ref
@@ -622,52 +832,66 @@ const Z = {
      * @param formData
      * @param extraData
      */
-    showDialog(t, e = {}, i = {}) {
-      const o = this.getTopFormRef(), s = M(o.widgetList, t);
-      if (!t || s.type !== "vf-dialog") {
-        this.$message.error(this.i18nt("render.hint.refNotFound") + t);
+    showDialog(dialogName, formData = {}, extraData = {}) {
+      const topFormRef = this.getTopFormRef();
+      const dialogCon = getContainerWidgetByName(topFormRef.widgetList, dialogName);
+      if (!dialogName || dialogCon.type !== "vf-dialog") {
+        this.$message.error(this.i18nt("render.hint.refNotFound") + dialogName);
         return;
       }
-      const r = {
-        widgetList: d(s.widgetList),
-        formConfig: j(o.formConfig)
-      }, a = F() + "", f = b(X, {
-        options: s.options,
-        formJson: r,
-        formData: { ...e },
-        optionData: o.optionData,
-        globalDsv: o.globalDsv,
+      const dFormJson = {
+        widgetList: deepClone(dialogCon.widgetList),
+        formConfig: cloneFormConfigWithoutEventHandler(topFormRef.formConfig)
+      };
+      const wrapperDivId = generateId() + "";
+      const dialogInstance = createVNode(DynamicDialog, {
+        options: dialogCon.options,
+        formJson: dFormJson,
+        formData: { ...formData },
+        optionData: topFormRef.optionData,
+        globalDsv: topFormRef.globalDsv,
         parentFormRef: this,
-        extraData: i,
-        wrapperId: a,
-        vfCtx: { ...e }
+        extraData,
+        wrapperId: wrapperDivId,
+        vfCtx: { ...formData }
       });
-      f.appContext = this.$root.$.appContext;
-      const n = document.createElement("div");
-      n.id = "vf-dynamic-dialog-wrapper" + a, document.body.appendChild(n), C(f, n), document.body.appendChild(f.el), f.component.ctx.show();
-    },
-    showDrawer(t, e = {}, i = {}) {
-      const o = this.getTopFormRef(), s = M(o.widgetList, t);
-      if (!s || s.type !== "vf-drawer") {
-        this.$message.error(this.i18nt("render.hint.refNotFound") + t);
+      dialogInstance.appContext = this.$root.$.appContext;
+      const wrapperDiv = document.createElement("div");
+      wrapperDiv.id = "vf-dynamic-dialog-wrapper" + wrapperDivId;
+      document.body.appendChild(wrapperDiv);
+      render(dialogInstance, wrapperDiv);
+      document.body.appendChild(dialogInstance.el);
+      dialogInstance.component.ctx.show();
+    },
+    showDrawer(drawerName, formData = {}, extraData = {}) {
+      const topFormRef = this.getTopFormRef();
+      const drawerCon = getContainerWidgetByName(topFormRef.widgetList, drawerName);
+      if (!drawerCon || drawerCon.type !== "vf-drawer") {
+        this.$message.error(this.i18nt("render.hint.refNotFound") + drawerName);
         return;
       }
-      const r = {
-        widgetList: d(s.widgetList),
-        formConfig: j(o.formConfig)
-      }, a = F() + "", f = b(Y, {
-        options: s.options,
-        formJson: r,
-        formData: e || {},
-        optionData: o.optionData,
-        globalDsv: o.globalDsv,
+      const dFormJson = {
+        widgetList: deepClone(drawerCon.widgetList),
+        formConfig: cloneFormConfigWithoutEventHandler(topFormRef.formConfig)
+      };
+      const wrapperDivId = generateId() + "";
+      const drawerInstance = createVNode(DynamicDrawer, {
+        options: drawerCon.options,
+        formJson: dFormJson,
+        formData: formData || {},
+        optionData: topFormRef.optionData,
+        globalDsv: topFormRef.globalDsv,
         parentFormRef: this,
-        extraData: i,
-        wrapperId: a
+        extraData,
+        wrapperId: wrapperDivId
       });
-      f.appContext = this.$root.$.appContext;
-      const n = document.createElement("div");
-      n.id = "vf-dynamic-drawer-wrapper" + a, document.body.appendChild(n), C(f, n), document.body.appendChild(f.el), f.component.ctx.show();
+      drawerInstance.appContext = this.$root.$.appContext;
+      const wrapperDiv = document.createElement("div");
+      wrapperDiv.id = "vf-dynamic-drawer-wrapper" + wrapperDivId;
+      document.body.appendChild(wrapperDiv);
+      render(drawerInstance, wrapperDiv);
+      document.body.appendChild(drawerInstance.el);
+      drawerInstance.component.ctx.show();
     },
     /**
      * 判断表单是否处于设计器预览状态
@@ -679,55 +903,62 @@ const Z = {
     //--------------------- 以上为组件支持外部调用的API方法 end ------------------//
   }
 };
-function I(t, e, i, o, s, r) {
-  const a = y("a-form"), f = y("a-config-provider");
-  return h(), u(f, {
-    "component-size": r.size,
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_a_form = resolveComponent("a-form");
+  const _component_a_config_provider = resolveComponent("a-config-provider");
+  return openBlock(), createBlock(_component_a_config_provider, {
+    "component-size": $options.size,
     input: { autocomplete: "off" }
   }, {
-    default: m(() => [
-      b(a, {
-        layout: r.labelPosition,
-        class: _([[r.customClass, s.readModeFlag ? "readonly-mode-form" : ""], "render-form tpf-form"]),
-        "label-width": r.labelWidth,
-        "validate-on-rule-change": !1,
-        model: s.formDataModel,
+    default: withCtx(() => [
+      createVNode(_component_a_form, {
+        layout: $options.labelPosition,
+        class: normalizeClass([[$options.customClass, $data.readModeFlag ? "readonly-mode-form" : ""], "render-form tpf-form"]),
+        "label-width": $options.labelWidth,
+        "validate-on-rule-change": false,
+        model: $data.formDataModel,
         ref: "renderForm",
-        onSubmit: e[0] || (e[0] = $(() => {
+        onSubmit: _cache[0] || (_cache[0] = withModifiers(() => {
         }, ["prevent"]))
       }, {
-        default: m(() => [
-          (h(!0), R(v, null, p(r.widgetList, (n, D) => (h(), R(v, null, [
-            n.category === "container" ? (h(), u(S(r.getContainerWidgetName(n)), {
-              widget: n,
-              key: n.id,
-              "parent-list": r.widgetList,
-              "index-of-parent-list": D,
-              "parent-widget": null
-            }, W({ _: 2 }, [
-              p(Object.keys(t.$slots), (l) => ({
-                name: l,
-                fn: m((c) => [
-                  L(t.$slots, l, O(w(c)), void 0, !0)
-                ])
-              }))
-            ]), 1032, ["widget", "parent-list", "index-of-parent-list"])) : (h(), u(S(r.getWidgetName(n)), {
-              field: n,
-              "form-model": s.formDataModel,
-              designer: null,
-              key: n.id,
-              "parent-list": r.widgetList,
-              "index-of-parent-list": D,
-              "parent-widget": null
-            }, W({ _: 2 }, [
-              p(Object.keys(t.$slots), (l) => ({
-                name: l,
-                fn: m((c) => [
-                  L(t.$slots, l, O(w(c)), void 0, !0)
-                ])
-              }))
-            ]), 1032, ["field", "form-model", "parent-list", "index-of-parent-list"]))
-          ], 64))), 256))
+        default: withCtx(() => [
+          (openBlock(true), createElementBlock(Fragment, null, renderList($options.widgetList, (widget, index) => {
+            return openBlock(), createElementBlock(Fragment, null, [
+              "container" === widget.category ? (openBlock(), createBlock(resolveDynamicComponent($options.getContainerWidgetName(widget)), {
+                widget,
+                key: widget.id,
+                "parent-list": $options.widgetList,
+                "index-of-parent-list": index,
+                "parent-widget": null
+              }, createSlots({ _: 2 }, [
+                renderList(Object.keys(_ctx.$slots), (slot) => {
+                  return {
+                    name: slot,
+                    fn: withCtx((scope) => [
+                      renderSlot(_ctx.$slots, slot, normalizeProps(guardReactiveProps(scope)), void 0, true)
+                    ])
+                  };
+                })
+              ]), 1032, ["widget", "parent-list", "index-of-parent-list"])) : (openBlock(), createBlock(resolveDynamicComponent($options.getWidgetName(widget)), {
+                field: widget,
+                "form-model": $data.formDataModel,
+                designer: null,
+                key: widget.id,
+                "parent-list": $options.widgetList,
+                "index-of-parent-list": index,
+                "parent-widget": null
+              }, createSlots({ _: 2 }, [
+                renderList(Object.keys(_ctx.$slots), (slot) => {
+                  return {
+                    name: slot,
+                    fn: withCtx((scope) => [
+                      renderSlot(_ctx.$slots, slot, normalizeProps(guardReactiveProps(scope)), void 0, true)
+                    ])
+                  };
+                })
+              ]), 1032, ["field", "form-model", "parent-list", "index-of-parent-list"]))
+            ], 64);
+          }), 256))
         ]),
         _: 3
       }, 8, ["layout", "class", "label-width", "model"])
@@ -735,7 +966,7 @@ function I(t, e, i, o, s, r) {
     _: 3
   }, 8, ["component-size"]);
 }
-const bt = /* @__PURE__ */ k(Z, [["render", I], ["__scopeId", "data-v-ab2b030a"]]);
+const VFormRender = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ab2b030a"]]);
 export {
-  bt as default
+  VFormRender as default
 };