element-less 0.0.8 → 0.0.10

package/{index-B27t8vvK.js → index-Cig-voSg.js}

@@ -6,9 +6,10 @@ import { onUnmounted, onDeactivated, isRef, watch, onMounted, nextTick, onActiva
 import pkg from "file-saver";
 import * as XLSX from "xlsx";
 import { ElMessage, formItemProps as formItemProps$2, formProps as formProps$2, inputProps as inputProps$1, ElSpace, inputEmits, radioProps as radioProps$1, checkboxProps as checkboxProps$1, rowProps, useNamespace, rowContextKey, colProps, ElForm, ElButton, paginationProps, ElLoading, menuProps as menuProps$1, ElMenu, menuItemProps as menuItemProps$1, menuItemEmits, ElMenuItem, subMenuProps as subMenuProps$1, ElSubMenu, switchProps as switchProps$1, imageProps as imageProps$1, imageViewerProps as imageViewerProps$1, autocompleteProps as autocompleteProps$1, cascaderProps as cascaderProps$1, dialogProps as dialogProps$1, drawerProps as drawerProps$1, dropdownProps as dropdownProps$1, sliderProps as sliderProps$1, inputNumberProps as inputNumberProps$1, uploadProps as uploadProps$1, ElNotification, timePickerDefaultProps, datePickerProps as datePickerProps$1, tabsProps as tabsProps$1, colorPickerProps as colorPickerProps$1, ElContainer, ElMessageBox, useSizeProp as useSizeProp$1 } from "element-plus";
-import lodash from "lodash";
+import lodash, { cloneDeep } from "lodash";
 import draggable from "vuedraggable";
 import Sortable from "sortablejs";
+import { onClickOutside } from "@vueuse/core";
 import { MdPreview, MdEditor } from "md-editor-v3";
 import { defineStore } from "pinia";
 import prism from "prismjs";
@@ -2214,7 +2215,7 @@ const utils = {
     if (!obj) {
       return {};
     }
-    return JSON.parse(JSON.stringify(obj));
+    return cloneDeep(obj);
   },
   isObject: (obj) => {
     return Object.prototype.toString.call(obj).indexOf("Object") > -1 || Object.prototype.toString.call(obj).indexOf("Array") > -1;
@@ -5148,7 +5149,21 @@ const selectProps = buildProps({
   /**
    * @description 是否显示全选
    */
-  showCheckAll: Boolean
+  showCheckAll: Boolean,
+  /**
+   * @description 选项排列方向
+   */
+  optionDirection: {
+    type: String,
+    values: ["horizontal", "vertical"],
+    default: "vertical"
+  },
+  /**
+   * @description 输入框高度
+   */
+  height: {
+    type: String
+  }
 });
 const _hoisted_1$1t = {
   key: 0,
@@ -5521,6 +5536,31 @@ const _sfc_main$28 = /* @__PURE__ */ defineComponent({
         selectValue.value = [];
       }
     };
+    const currStyle = computed(() => {
+      let st2 = [{ width: currWidth.value.appendPx() }];
+      if (props.height) {
+        st2.push({ "--wrapperHeight": props.height.appendPx() });
+        st2.push({ "--wrapperSelectionHeight": "calc(var(--wrapperHeight) - 10px)" });
+        st2.push({ "--wrapperSelectionScroll": "scroll" });
+      } else {
+        st2.push({ "--wrapperHeight": "32px" });
+        st2.push({ "--wrapperSelectionHeight": "auto" });
+        st2.push({ "--wrapperSelectionScroll": "inherit" });
+      }
+      if (props.width && props.optionDirection === "horizontal") {
+        st2.push({ "--wrapperWidth": currWidth.value.appendPx() });
+      } else {
+        st2.push({ "--wrapperWidth": "auto" });
+      }
+      return st2;
+    });
+    const currPoperClass = computed(() => {
+      let currClass = props.popperClass;
+      if (props.optionDirection === "horizontal") {
+        currClass += " horizontal";
+      }
+      return currClass;
+    });
     const currPlaceholder = ref();
     watchEffect(() => {
       if (isMobile) {
@@ -5547,16 +5587,17 @@ const _sfc_main$28 = /* @__PURE__ */ defineComponent({
             !unref(isMobile) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
               !_ctx.isVirtual ? (openBlock(), createBlock(_component_el_select, mergeProps({
                 key: 0,
-                style: [{ width: currWidth.value.appendPx() }]
+                style: currStyle.value
               }, unref(componentProps), {
-                modelValue: selectValue.value,
-                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => selectValue.value = $event),
+                popperClass: currPoperClass.value,
                 placeholder: currPlaceholder.value,
                 "remote-method": handleSearch,
                 loading: currLoading.value,
-                "remote-show-suffix": "",
                 onVisibleChange: handleVisibleChange,
-                onClear: handleClear
+                onClear: handleClear,
+                "remote-show-suffix": "",
+                modelValue: selectValue.value,
+                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => selectValue.value = $event)
               }), createSlots({
                 default: withCtx(() => [
                   renderSlot(_ctx.$slots, "extra"),
@@ -5652,8 +5693,18 @@ const _sfc_main$28 = /* @__PURE__ */ defineComponent({
                     renderSlot(_ctx.$slots, "prefix")
                   ]),
                   key: "2"
+                } : void 0,
+                unref(slots)["label"] ? {
+                  name: "label",
+                  fn: withCtx(({ label, value }) => [
+                    renderSlot(_ctx.$slots, "label", {
+                      label,
+                      value
+                    })
+                  ]),
+                  key: "3"
                 } : void 0
-              ]), 1040, ["style", "modelValue", "placeholder", "loading"])) : (openBlock(), createBlock(_component_el_select_v2, mergeProps({ key: 1 }, unref(componentProps), {
+              ]), 1040, ["style", "popperClass", "placeholder", "loading", "modelValue"])) : (openBlock(), createBlock(_component_el_select_v2, mergeProps({ key: 1 }, unref(componentProps), {
                 modelValue: selectValue.value,
                 "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => selectValue.value = $event),
                 options,
@@ -8776,26 +8827,52 @@ const tableProps = Object.assign({}, defaultProps, buildProps({
     type: String,
     values: ["left", "center", "right"]
   },
-  /** 是否显示分页 */
+  /** @description 是否显示分页 */
   hasPage: {
     type: Boolean,
     default: true
   },
+  /**
+   * @description 分页页大小
+   */
   pageSize: {
     type: Number,
     default: 20
   },
+  /**
+   * @description 分页页设置
+   */
   pageSizes: {
     type: Array,
     default: [10, 20, 30, 40, 50, 100]
   },
+  /**
+   * @description 当前页
+   */
   currentPage: {
     type: Number,
     default: 1
   },
+  /**
+   * @description 分页
+   */
   layout: {
     type: String,
     default: "total,slot, sizes, prev, pager, next, jumper"
+  },
+  /**
+   * @description 是否要高亮当前行
+   */
+  highlightCurrentRow: {
+    type: Boolean,
+    default: true
+  },
+  /**
+   * @description 是否带有纵向边框
+   */
+  border: {
+    type: Boolean,
+    default: true
   }
 }));
 const _hoisted_1$1n = {
@@ -8831,7 +8908,6 @@ const _sfc_main$1Q = /* @__PURE__ */ defineComponent({
     const { $pageDataField, $menuField, $pageSizeField, $currentPageField, $totalField, $pageCountField, $avgDayField } = utils.getTableConfig();
     const { getValue: getValue2, setValue, attrProps } = useProps(props);
     const tagID = props.tagId ?? "els_table_" + utils.shortid();
-    const wrapTagID = "els-wrap-" + tagID;
     const queryFormData = ref({});
     const elsPageStore = container == null ? void 0 : container.$pageStore;
     const elsApiResult = container == null ? void 0 : container.$apiResult;
@@ -10026,16 +10102,11 @@ const _sfc_main$1Q = /* @__PURE__ */ defineComponent({
           default: withCtx(() => [
             withDirectives((openBlock(), createBlock(_component_el_table, mergeProps(unref(attrProps), {
               data: tableData,
-              "inner-wrapper-class": wrapTagID,
-              border: true,
-              fit: "",
-              "highlight-current-row": "",
               class: !unref(isMobile) && _ctx.hasBottomFixdScroll ? unref(tagID) + " els-table-noScroll" : unref(tagID),
-              "row-key": _ctx.rowKey,
+              rowKey: _ctx.rowKey,
               ref_key: "dataTable",
               ref: dataTable,
-              "header-sticky-top": unref(currHeaderStickyTop),
-              "row-class-name": currRowClassName.value,
+              rowClassName: currRowClassName.value,
               "show-summary": unref(currShowSummary),
               onSortChange: unref(currSortChange),
               onRowContextmenu: handleRowContextMenu,
@@ -10115,7 +10186,7 @@ const _sfc_main$1Q = /* @__PURE__ */ defineComponent({
                 renderSlot(_ctx.$slots, "empty", {}, void 0, true)
               ]),
               _: 3
-            }, 16, ["data", "class", "row-key", "header-sticky-top", "row-class-name", "show-summary", "onSortChange", "span-method", "summary-method"])), [
+            }, 16, ["data", "class", "rowKey", "rowClassName", "show-summary", "onSortChange", "span-method", "summary-method"])), [
               [_directive_loading, unref(dataLoading)]
             ]),
             !unref(isMobile) && _ctx.hasBottomFixdScroll && unref(tableBodyWidth) ? (openBlock(), createBlock(_component_el_affix, {
@@ -10188,17 +10259,18 @@ const _sfc_main$1Q = /* @__PURE__ */ defineComponent({
           key: 2,
           ref_key: "contentMenu",
           ref: contentMenu,
-          menus: unref(currContextMenus),
-          visible: unref(contextMenuVisible),
+          data: unref(currContextMenus),
+          modelValue: unref(contextMenuVisible),
+          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(contextMenuVisible) ? contextMenuVisible.value = $event : contextMenuVisible = $event),
           positionLeft: unref(contextMenuPositionLeft),
           positionTop: unref(contextMenuPositionTop),
           onClick: handleMenuCommand
-        }, null, 8, ["menus", "visible", "positionLeft", "positionTop"])) : createCommentVNode("", true)
+        }, null, 8, ["data", "modelValue", "positionLeft", "positionTop"])) : createCommentVNode("", true)
       ], 64);
     };
   }
 });
-const Table$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1Q, [["__scopeId", "data-v-91777593"]]);
+const Table$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1Q, [["__scopeId", "data-v-abcfc49e"]]);
 const ElsTable = withInstall(Table$1);
 const treeProps = buildProps({
   ...formItemProps$1,
@@ -12323,7 +12395,7 @@ const _sfc_main$1J = /* @__PURE__ */ defineComponent({
         ])) : (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(thumbnailPicUrls.value, (item, index) => {
           return openBlock(), createBlock(_component_el_image, mergeProps({ ref_for: true }, props, {
             src: item,
-            style: [{ width: _ctx.width }, { height: _ctx.height }, { cursor: _ctx.isPreview ? "zoom-in" : "default" }],
+            style: [{ width: _ctx.width.appendPx() }, { height: _ctx.height.appendPx() }, { cursor: _ctx.isPreview ? "zoom-in" : "default" }],
             onClick: ($event) => preview(item, index)
           }), {
             placeholder: withCtx(() => [
@@ -16089,28 +16161,27 @@ const menuContextProps = buildProps({
     type: Number,
     default: 0
   },
-  /**
-   * @description 是否显示
-   */
-  visible: {
-    type: Boolean,
-    default: false
-  },
   /**
    * @description 点击事件
    */
   onClick: Function
 });
 const _hoisted_1$19 = ["onClick"];
-const _hoisted_2$_ = { class: "air-table__context--info" };
+const _hoisted_2$_ = { class: "els-context-info" };
 const _sfc_main$1q = /* @__PURE__ */ defineComponent({
-  ...{ name: "ElsMenuContext" },
+  ...{ name: "ElsMenuContext", inheritAttrs: false },
   __name: "menuContext",
-  props: menuContextProps,
+  props: /* @__PURE__ */ mergeModels(menuContextProps, {
+    "modelValue": { type: Boolean },
+    "modelModifiers": {}
+  }),
+  emits: ["update:modelValue"],
   setup(__props) {
     var _a;
     const container = useContainer();
     const { proxy } = getCurrentInstance();
+    const modelValue = useModel$1(__props, "modelValue");
+    const contextMenu = ref();
     const props = __props;
     const menuData = reactive([]);
     let idFieldname = "";
@@ -16136,12 +16207,6 @@ const _sfc_main$1q = /* @__PURE__ */ defineComponent({
         menuData.push(...val);
       }
     }, { immediate: true, deep: true });
-    const triggerHideFn = clickDocumentHandler.bind(this);
-    function clickDocumentHandler(e) {
-      if (e.srcElement.className.indexOf && e.srcElement.className.indexOf("air-table__context") === -1 && e.srcElement.tagName !== "I") {
-        proxy.$parent.contextMenuVisible = false;
-      }
-    }
     function menuCommand(menu) {
       if (container) {
         container.$menuCommand(menu);
@@ -16149,21 +16214,21 @@ const _sfc_main$1q = /* @__PURE__ */ defineComponent({
       if (props.onClick) {
         props.onClick(menu);
       }
+      modelValue.value = false;
     }
-    onMounted(() => {
-      document.addEventListener("mousedown", triggerHideFn);
-    });
-    onUnmounted(() => {
-      document.removeEventListener("mousedown", triggerHideFn);
+    onClickOutside(contextMenu, (event) => {
+      modelValue.value = false;
     });
     return (_ctx, _cache) => {
       return withDirectives((openBlock(), createElementBlock("ul", {
-        class: normalizeClass(["air-table__context--menu", { "outscreen-menu": isOutScreen.value }]),
+        ref_key: "contextMenu",
+        ref: contextMenu,
+        class: normalizeClass(["els-context-menu", { "outscreen-menu": isOutScreen.value }]),
         style: normalizeStyle([{ left: _ctx.positionLeft + "px" }, { top: isOutBottom.value ? "auto" : _ctx.positionTop + "px" }, { bottom: !isOutBottom.value ? "auto" : positionBottom.value + "px" }])
       }, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(menuData, (item) => {
           return openBlock(), createElementBlock("li", {
-            class: "air-table__context--list",
+            class: "els-context-list",
             key: item[unref(idFieldname)],
             onClick: ($event) => menuCommand(item)
           }, [
@@ -16174,12 +16239,12 @@ const _sfc_main$1q = /* @__PURE__ */ defineComponent({
           ], 8, _hoisted_1$19);
         }), 128))
       ], 6)), [
-        [vShow, _ctx.visible]
+        [vShow, modelValue.value]
       ]);
     };
   }
 });
-const MenuContext = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["__scopeId", "data-v-fece398f"]]);
+const MenuContext = /* @__PURE__ */ _export_sfc(_sfc_main$1q, [["__scopeId", "data-v-e0c03318"]]);
 const ElsMenuContext = withInstall(MenuContext);
 const menuDropdownProps = buildProps({
   /**
@@ -17733,12 +17798,15 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
           }
         }
       }
-      currItemClassName.value = props.itemClassName ?? [];
-      if (props.itemComponent === "div") {
-        if (typeof currItemClassName.value === "string") {
-          currItemClassName.value += " listitem flex";
-        } else {
-          currItemClassName.value.push(...["listitem", "flex"]);
+      if (!currItemClassName.value || currItemClassName.value.indexOf("listitem") === -1) {
+        currItemClassName.value = props.itemClassName ?? [];
+        if (props.itemComponent === "div") {
+          console.log("333");
+          if (typeof currItemClassName.value === "string") {
+            currItemClassName.value += " listitem flex";
+          } else {
+            currItemClassName.value.push(...["listitem", "flex"]);
+          }
         }
       }
     });
@@ -17958,7 +18026,7 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const List = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["__scopeId", "data-v-15145cad"]]);
+const List = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["__scopeId", "data-v-6d40759c"]]);
 const ElsList = withInstall(List);
 const _hoisted_1$13 = { class: "custom-block-title" };
 const _sfc_main$1g = /* @__PURE__ */ defineComponent({
@@ -20973,54 +21041,111 @@ const property_select = [
     "keyCode": "g2IUO-5Ioa",
     "children": [
       {
-        "keyID": "c22a17d687c1569a7fe2e7979b12e9a0",
-        "keyName": "数据源",
-        "keyCode": "dataType",
-        "children": [],
-        "config": {
-          "arrayConfig": {
-            "componentName": "ElsFormItem",
-            "type": "bottom",
-            "arrayDefaultLength": 0,
-            "arrangementType": "Vertical",
-            "maxHeight": "",
-            "maxWidth": ""
-          },
-          "formConfig": {
-            "labelWidth": "",
-            "required": false,
-            "requiredMessage": "",
-            "validType": "",
-            "validExpression": "",
-            "validMessage": "",
-            "validMethod": ""
-          },
-          "baseConfig": {
-            "type": "button",
-            "dataType": "String",
-            "data": [
-              {
-                "label": "数据列表",
-                "value": 1
+        "keyID": "id_6196",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "c22a17d687c1569a7fe2e7979b12e9a0",
+            "keyName": "数据源",
+            "keyCode": "dataType",
+            "children": [],
+            "config": {
+              "arrayConfig": {
+                "componentName": "ElsFormItem",
+                "type": "bottom",
+                "arrayDefaultLength": 0,
+                "arrangementType": "Vertical",
+                "maxHeight": "",
+                "maxWidth": ""
               },
-              {
-                "label": "接口读取",
-                "value": 2
+              "formConfig": {
+                "labelWidth": "",
+                "required": false,
+                "requiredMessage": "",
+                "validType": "",
+                "validExpression": "",
+                "validMessage": "",
+                "validMethod": ""
+              },
+              "baseConfig": {
+                "type": "button",
+                "dataType": "String",
+                "data": [
+                  {
+                    "label": "数据",
+                    "value": 1
+                  },
+                  {
+                    "label": "接口",
+                    "value": 2
+                  }
+                ],
+                "labelField": "label",
+                "valueField": "value"
+              },
+              "advancedConfig": {
+                "style": "",
+                "vif": "",
+                "disabled": "",
+                "eventChange": ""
               }
-            ],
-            "labelField": "label",
-            "valueField": "value"
+            },
+            "componentType": "Radio",
+            "dataType": "Number",
+            "defaultValue": 1
           },
-          "advancedConfig": {
-            "style": "",
-            "vif": "",
-            "disabled": "",
-            "eventChange": ""
+          {
+            "keyID": "0f273ad1e2f7cfde654ba61f8b7c7696",
+            "keyName": "占位文本",
+            "keyCode": "placeholder",
+            "children": [],
+            "config": {
+              "formConfig": {
+                "labelWidth": "",
+                "required": false,
+                "requiredMessage": "",
+                "validType": "",
+                "validExpression": "",
+                "validMessage": "",
+                "validMethod": ""
+              },
+              "baseConfig": {
+                "showWordLimit": false,
+                "clearable": false,
+                "isPassword": false,
+                "isTrim": false,
+                "encode": false
+              },
+              "advancedConfig": {
+                "style": "",
+                "vif": "",
+                "disabled": "",
+                "eventChange": ""
+              },
+              "arrayConfig": {}
+            },
+            "componentType": "Input",
+            "dataType": "String"
           }
-        },
-        "componentType": "Radio",
-        "dataType": "Number",
-        "defaultValue": "1"
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "gutter": 10,
+            "justify": "start",
+            "align": "",
+            "tag": "div"
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
       },
       {
         "keyID": "67cecb440365abb61e4aace2d5686cb9",
@@ -21690,37 +21815,32 @@ const property_select = [
             "dataType": "String"
           },
           {
-            "keyID": "0f273ad1e2f7cfde654ba61f8b7c7696",
-            "keyName": "占位文本",
-            "keyCode": "placeholder",
+            "keyID": "id_624",
+            "keyName": "高度",
+            "keyCode": "height",
             "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "输入框",
+            "componentType": "Input",
+            "icon": "text",
+            "operateType": "input",
+            "slots": [],
             "config": {
-              "formConfig": {
-                "labelWidth": "",
-                "required": false,
-                "requiredMessage": "",
-                "validType": "",
-                "validExpression": "",
-                "validMessage": "",
-                "validMethod": ""
-              },
+              "formConfig": {},
               "baseConfig": {
-                "showWordLimit": false,
-                "clearable": false,
-                "isPassword": false,
-                "isTrim": false,
-                "encode": false
-              },
-              "advancedConfig": {
-                "style": "",
-                "vif": "",
-                "disabled": "",
-                "eventChange": ""
+                "width": "",
+                "placeholder": "",
+                "prefixIcon": "",
+                "suffixIcon": "",
+                "prefixTag": "",
+                "suffixTag": "",
+                "maxlength": "",
+                "clearable": true
               },
+              "advancedConfig": {},
               "arrayConfig": {}
-            },
-            "componentType": "Input",
-            "dataType": "String"
+            }
           }
         ],
         "config": {
@@ -21836,37 +21956,148 @@ const property_select = [
         "dataType": "None"
       },
       {
-        "keyID": "645dfc27b5e7fc8d70eed47c2bc868c4",
-        "keyName": "允许创建",
-        "keyCode": "allow-create",
-        "children": [],
-        "config": {
-          "formConfig": {
-            "labelWidth": "",
-            "tip": "",
-            "tipPosition": "left",
-            "suffixContent": "",
-            "required": false,
-            "requiredMessage": "",
-            "validType": "",
-            "validExpression": "",
-            "validMessage": "",
-            "validMethod": ""
-          },
-          "baseConfig": {
-            "active-value": true,
-            "inactive-value": false
+        "keyID": "id_2975",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_1851",
+            "keyName": "排列方式",
+            "keyCode": "optionDirection",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "单选列表",
+            "componentType": "Radio",
+            "icon": "radio-two",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "type": "button",
+                "dataType": 1,
+                "data": [
+                  {
+                    "label": "纵向",
+                    "value": "vertical"
+                  },
+                  {
+                    "label": "横向",
+                    "value": "horizontal"
+                  }
+                ]
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
           },
-          "advancedConfig": {
-            "style": "",
-            "vif": "currNode['filterable'].value==true",
-            "disabled": "",
-            "eventChange": ""
+          {
+            "keyID": "645dfc27b5e7fc8d70eed47c2bc868c4",
+            "keyName": "允许创建",
+            "keyCode": "allow-create",
+            "children": [],
+            "config": {
+              "formConfig": {
+                "labelWidth": "",
+                "tip": "",
+                "tipPosition": "left",
+                "suffixContent": "",
+                "required": false,
+                "requiredMessage": "",
+                "validType": "",
+                "validExpression": "",
+                "validMessage": "",
+                "validMethod": ""
+              },
+              "baseConfig": {
+                "active-value": true,
+                "inactive-value": false
+              },
+              "advancedConfig": {
+                "style": "",
+                "vif": "currNode['filterable'].value==true",
+                "disabled": "",
+                "eventChange": ""
+              },
+              "arrayConfig": {}
+            },
+            "componentType": "Switch",
+            "dataType": "Bool"
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {},
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_5872",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_4052",
+            "keyName": "下拉框与输入框宽度相同",
+            "keyCode": "fit-input-width",
+            "children": [],
+            "dataType": "Bool",
+            "arrayDataType": "",
+            "componentTypeLabel": "开关",
+            "componentType": "Switch",
+            "icon": "switch-one",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "active-text": "",
+                "inactive-text": "",
+                "active-value": true,
+                "inactive-value": false
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
           },
+          {
+            "keyID": "id_503",
+            "keyName": "无匹配时显示的文字",
+            "keyCode": "no-match-text",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "输入框",
+            "componentType": "Input",
+            "icon": "text",
+            "operateType": "input",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {},
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {},
+          "advancedConfig": {},
           "arrayConfig": {}
-        },
-        "componentType": "Switch",
-        "dataType": "Bool"
+        }
       }
     ],
     "dataType": "None",
@@ -35647,14 +35878,14 @@ const property_tag = [
         }
       },
       {
-        "keyID": "id_rz9a_h_ze",
+        "keyID": "id_194",
         "keyName": "栅格行",
         "keyCode": "",
         "children": [
           {
-            "keyID": "id_zcC2ooo87",
-            "keyName": "Tag 的类型",
-            "keyCode": "type",
+            "keyID": "id_2766",
+            "keyName": "颜色",
+            "keyCode": "color",
             "children": [],
             "dataType": "String",
             "arrayDataType": "",
@@ -35670,6 +35901,108 @@ const property_tag = [
               "arrayConfig": {}
             }
           },
+          {
+            "keyID": "id_588",
+            "keyName": "类型",
+            "keyCode": "type",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "下拉列表",
+            "componentType": "Select",
+            "icon": "select",
+            "operateType": "picker",
+            "slots": [
+              {
+                "name": "header",
+                "children": []
+              },
+              {
+                "name": "default",
+                "children": []
+              }
+            ],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "dataType": 1,
+                "data": [
+                  {
+                    "label": "primary",
+                    "value": "primary"
+                  },
+                  {
+                    "label": "success",
+                    "value": "success"
+                  },
+                  {
+                    "label": "info",
+                    "value": "info"
+                  },
+                  {
+                    "label": "warning",
+                    "value": "warning"
+                  },
+                  {
+                    "label": "danger",
+                    "value": "danger"
+                  }
+                ],
+                "filterable": true,
+                "width": "",
+                "placeholder": "",
+                "clearable": true,
+                "teleported": true
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "gutter": 10,
+            "justify": "start",
+            "align": "",
+            "tag": "div"
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_rz9a_h_ze",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_559",
+            "keyName": "Tag 是否为圆形",
+            "keyCode": "round",
+            "children": [],
+            "dataType": "Bool",
+            "arrayDataType": "",
+            "componentTypeLabel": "开关",
+            "componentType": "Switch",
+            "icon": "switch-one",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "active-value": true,
+                "inactive-value": false
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          },
           {
             "keyID": "id_Y86Ihl_4O",
             "keyName": "是否可关闭",
@@ -36500,6 +36833,614 @@ const property_formQuery = [
     }
   }
 ];
+const property_text = [
+  {
+    "keyID": "id_6529",
+    "keyName": "Form",
+    "keyCode": "key_7389",
+    "children": [
+      {
+        "keyID": "id_4230",
+        "keyName": "默认内容",
+        "keyCode": "innerContent",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "文本域",
+        "componentType": "Textarea",
+        "icon": "expand-text-input",
+        "operateType": "input",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "width": "",
+            "placeholder": "",
+            "rows": "3",
+            "maxlength": ""
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_357",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_1702",
+            "keyName": "下拉列表",
+            "keyCode": "type",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "下拉列表",
+            "componentType": "Select",
+            "icon": "select",
+            "operateType": "picker",
+            "slots": [
+              {
+                "name": "header",
+                "children": []
+              },
+              {
+                "name": "default",
+                "children": []
+              }
+            ],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "dataType": 1,
+                "data": [
+                  {
+                    "label": "primary",
+                    "value": "primary"
+                  },
+                  {
+                    "label": "success",
+                    "value": "success"
+                  },
+                  {
+                    "label": "warning",
+                    "value": "warning"
+                  },
+                  {
+                    "label": "danger",
+                    "value": "danger"
+                  },
+                  {
+                    "label": "info",
+                    "value": "info"
+                  }
+                ],
+                "filterable": true,
+                "width": "",
+                "placeholder": "",
+                "clearable": true,
+                "teleported": true
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          },
+          {
+            "keyID": "id_1021",
+            "keyName": "开关",
+            "keyCode": "key_7288",
+            "children": [],
+            "dataType": "Bool",
+            "arrayDataType": "",
+            "componentTypeLabel": "开关",
+            "componentType": "Switch",
+            "icon": "switch-one",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "active-value": true,
+                "inactive-value": false
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "gutter": 10,
+            "justify": "start",
+            "align": "",
+            "tag": "div"
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_9382",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_2873",
+            "keyName": "输入框",
+            "keyCode": "key_1610",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "输入框",
+            "componentType": "Input",
+            "icon": "text",
+            "operateType": "input",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {},
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          },
+          {
+            "keyID": "id_1573",
+            "keyName": "数字输入框",
+            "keyCode": "key_2127",
+            "children": [],
+            "dataType": "Number",
+            "arrayDataType": "",
+            "componentTypeLabel": "数字输入框",
+            "componentType": "InputNumber",
+            "icon": "list-numbers",
+            "operateType": "input",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {},
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "gutter": 10,
+            "justify": "start",
+            "align": "",
+            "tag": "div"
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      }
+    ],
+    "dataType": "None",
+    "arrayDataType": "",
+    "componentTypeLabel": "Form表单",
+    "componentType": "Form",
+    "config": {
+      "baseConfig": {
+        "labelPosition": "top",
+        "labelWidth": "",
+        "labelSuffix": "",
+        "requireAsteriskPosition": ""
+      },
+      "advancedConfig": {
+        "style": "",
+        "vif": "",
+        "disabled": "",
+        "eventChange": ""
+      },
+      "arrayConfig": {}
+    }
+  }
+];
+const property_div = [
+  {
+    "keyID": "id_6922",
+    "keyName": "Form",
+    "keyCode": "key_5800",
+    "children": [
+      {
+        "keyID": "id_9407",
+        "keyName": "布局方式",
+        "keyCode": "display",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "单选列表",
+        "componentType": "Radio",
+        "icon": "radio-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "type": "button",
+            "dataType": 1,
+            "data": [
+              {
+                "label": "inherit",
+                "value": "inherit"
+              },
+              {
+                "label": "flex",
+                "value": "flex"
+              }
+            ]
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        },
+        "defaultValue": "inherit"
+      },
+      {
+        "keyID": "id_9624",
+        "keyName": "换行",
+        "keyCode": "flex-wrap",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "单选列表",
+        "componentType": "Radio",
+        "icon": "radio-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "type": "button",
+            "dataType": 1,
+            "data": [
+              {
+                "label": "不换行",
+                "value": "nowrap"
+              },
+              {
+                "label": "换行",
+                "value": "wrap"
+              }
+            ]
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_782",
+        "keyName": "主轴对齐方式",
+        "keyCode": "justify-content",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "单选列表",
+        "componentType": "Radio",
+        "icon": "radio-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "type": "button",
+            "dataType": 1,
+            "data": [
+              {
+                "label": "居左",
+                "value": "left"
+              },
+              {
+                "label": "居中",
+                "value": "center"
+              },
+              {
+                "label": "居右",
+                "value": "right"
+              },
+              {
+                "label": "两侧对齐",
+                "value": "space-between"
+              }
+            ]
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_6025",
+        "keyName": "交叉轴对齐方式",
+        "keyCode": "align-items",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "单选列表",
+        "componentType": "Radio",
+        "icon": "radio-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "type": "button",
+            "dataType": 1,
+            "data": [
+              {
+                "label": "起点对齐",
+                "value": "flex-start"
+              },
+              {
+                "label": "终点对齐",
+                "value": "flex-end"
+              },
+              {
+                "label": "居中对齐",
+                "value": "center"
+              },
+              {
+                "label": "两端对齐",
+                "value": "space-between"
+              }
+            ]
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_3526",
+        "keyName": "间距",
+        "keyCode": "gap",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "输入框",
+        "componentType": "Input",
+        "icon": "text",
+        "operateType": "input",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {},
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      }
+    ],
+    "dataType": "None",
+    "arrayDataType": "",
+    "componentTypeLabel": "Form表单",
+    "componentType": "Form",
+    "config": {
+      "baseConfig": {
+        "labelPosition": "top",
+        "labelWidth": "",
+        "labelSuffix": "",
+        "requireAsteriskPosition": ""
+      },
+      "advancedConfig": {
+        "style": "",
+        "vif": "",
+        "disabled": "",
+        "eventChange": ""
+      },
+      "arrayConfig": {}
+    }
+  }
+];
+const property_image = [
+  {
+    "keyID": "id_3408",
+    "keyName": "Form",
+    "keyCode": "key_9008",
+    "children": [
+      {
+        "keyID": "id_6831",
+        "keyName": "地址",
+        "keyCode": "url",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "输入框",
+        "componentType": "Input",
+        "icon": "text",
+        "operateType": "input",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "width": "",
+            "placeholder": "",
+            "prefixIcon": "",
+            "suffixIcon": "",
+            "prefixTag": "",
+            "suffixTag": "",
+            "maxlength": "",
+            "clearable": true
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_4831",
+        "keyName": "缩略图地址",
+        "keyCode": "thumbnailUrl",
+        "children": [],
+        "dataType": "String",
+        "arrayDataType": "",
+        "componentTypeLabel": "输入框",
+        "componentType": "Input",
+        "icon": "text",
+        "operateType": "input",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {},
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_6839",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_385",
+            "keyName": "图片宽度",
+            "keyCode": "width",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "输入框",
+            "componentType": "Input",
+            "icon": "text",
+            "operateType": "input",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {},
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          },
+          {
+            "keyID": "id_3489",
+            "keyName": "图片高度",
+            "keyCode": "height",
+            "children": [],
+            "dataType": "String",
+            "arrayDataType": "",
+            "componentTypeLabel": "输入框",
+            "componentType": "Input",
+            "icon": "text",
+            "operateType": "input",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {},
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "gutter": 10,
+            "justify": "start",
+            "align": "",
+            "tag": "div"
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      },
+      {
+        "keyID": "id_7639",
+        "keyName": "栅格行",
+        "keyCode": "",
+        "children": [
+          {
+            "keyID": "id_7977",
+            "keyName": "点击预览",
+            "keyCode": "isPreview",
+            "children": [],
+            "dataType": "Bool",
+            "arrayDataType": "",
+            "componentTypeLabel": "开关",
+            "componentType": "Switch",
+            "icon": "switch-one",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "active-value": true,
+                "inactive-value": false
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            },
+            "defaultValue": true
+          },
+          {
+            "keyID": "id_8494",
+            "keyName": "插入至 body 元素上",
+            "keyCode": "previewTeleported",
+            "children": [],
+            "dataType": "Bool",
+            "arrayDataType": "",
+            "componentTypeLabel": "开关",
+            "componentType": "Switch",
+            "icon": "switch-one",
+            "slots": [],
+            "config": {
+              "formConfig": {},
+              "baseConfig": {
+                "active-value": true,
+                "inactive-value": false
+              },
+              "advancedConfig": {},
+              "arrayConfig": {}
+            }
+          }
+        ],
+        "dataType": "None",
+        "arrayDataType": "",
+        "componentTypeLabel": "栅格行",
+        "componentType": "Row",
+        "icon": "layout-two",
+        "slots": [],
+        "config": {
+          "formConfig": {},
+          "baseConfig": {
+            "gutter": 10,
+            "justify": "start",
+            "align": "",
+            "tag": "div"
+          },
+          "advancedConfig": {},
+          "arrayConfig": {}
+        }
+      }
+    ],
+    "dataType": "None",
+    "arrayDataType": "",
+    "componentTypeLabel": "Form表单",
+    "componentType": "Form",
+    "config": {
+      "baseConfig": {
+        "labelPosition": "top",
+        "labelWidth": "",
+        "labelSuffix": "",
+        "requireAsteriskPosition": ""
+      },
+      "advancedConfig": {
+        "style": "",
+        "vif": "",
+        "disabled": "",
+        "eventChange": ""
+      },
+      "arrayConfig": {}
+    }
+  }
+];
 const dynamicComponentTypes = [
   {
     componentName: "ElsInput",
@@ -36591,6 +37532,7 @@ const dynamicComponentTypes = [
     operateType: "picker",
     dataTypes: ["String", "Number", "Bool"],
     defaultPropertys: {},
+    slots: ["header", "default", "label"],
     propertys: property_select,
     group: "Form",
     formItem: true,
@@ -36612,7 +37554,7 @@ const dynamicComponentTypes = [
   {
     componentName: "ElsUpload",
     icon: "add-picture",
-    label: "图片",
+    label: "上传图片",
     value: "UploadPic",
     type: "UploadPic",
     dataTypes: ["String"],
@@ -36625,7 +37567,7 @@ const dynamicComponentTypes = [
   {
     componentName: "ElsUpload",
     icon: "picture-album",
-    label: "图集",
+    label: "上传图集",
     value: "UploadMutiPic",
     type: "UploadMutiPic",
     dataTypes: ["String"],
@@ -36638,7 +37580,7 @@ const dynamicComponentTypes = [
   {
     componentName: "ElsUpload",
     icon: "upload",
-    label: "文件",
+    label: "上传文件",
     value: "UploadFile",
     type: "UploadFile",
     dataTypes: ["String"],
@@ -36962,7 +37904,7 @@ const dynamicComponentTypes = [
     type: "Html",
     dataTypes: ["None"],
     defaultPropertys: {},
-    propertys: [],
+    propertys: property_div,
     group: "Container",
     formItem: false,
     isShow: true
@@ -37058,6 +38000,32 @@ const dynamicComponentTypes = [
     formItem: false,
     isShow: true
   },
+  {
+    componentName: "ElText",
+    icon: "text",
+    label: "Text",
+    value: "Text",
+    type: "Text",
+    dataTypes: ["None"],
+    defaultPropertys: {},
+    propertys: property_text,
+    group: "Show",
+    formItem: false,
+    isShow: true
+  },
+  {
+    componentName: "ElsImage",
+    icon: "add-picture",
+    label: "图片",
+    value: "Image",
+    type: "Image",
+    dataTypes: ["None"],
+    defaultPropertys: { width: "100", height: "100" },
+    propertys: property_image,
+    group: "Show",
+    formItem: false,
+    isShow: true
+  },
   {
     componentName: "ElsTable",
     icon: "table",
@@ -37655,7 +38623,7 @@ const containerProps = buildProps({
    */
   selectMenuPostQuery: Boolean
 });
-const _hoisted_1$12 = { class: "page_container" };
+const _hoisted_1$12 = { class: "els-page-container" };
 const _sfc_main$1f = /* @__PURE__ */ defineComponent({
   ...{
     name: "ElsContainer"
@@ -38601,7 +39569,7 @@ const _sfc_main$1d = /* @__PURE__ */ defineComponent({
   emits: /* @__PURE__ */ mergeModels(["removeItem"], ["update:children"]),
   setup(__props, { emit: __emit }) {
     const DynamicDesignerInnerItem = defineAsyncComponent(() => {
-      return import("./innerItem-DAz6yQRH.js");
+      return import("./innerItem-vzH3yn3m.js");
     });
     const { getValue: getValue2 } = useProps();
     const tagID = getValue2("tagID");
@@ -39433,7 +40401,10 @@ const renderProps = buildProps({
     default: {}
   }
 });
-function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
+function useDesigner(props, nodeItem) {
+  return useRender(props, nodeItem, void 0, void 0, true);
+}
+function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0, isDesigner = false) {
   const { getValue: getValue2 } = useProps();
   const componentData = getValue2("componentData", []);
   const isMobile = getValue2("isMobile", false);
@@ -39452,7 +40423,9 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
   const getArrayNodeValue = getValue2("getArrayNodeValue", () => {
     return [];
   });
-  const globalData = getValue2("globalData", {});
+  const getGlobalData = getValue2("getGlobalData", () => {
+    return {};
+  });
   const refsData = getValue2("refsData", {});
   const getFormPropIndex = getValue2("getFormPropIndex", () => {
     return "";
@@ -39469,7 +40442,15 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
       return {};
     }
     const itemConfig = nodeItem.config;
-    let baseProps = { "style": itemConfig.advancedConfig.style };
+    let baseProps = { "style": itemConfig.advancedConfig.style ?? "" };
+    if (nodeItem.componentName === "div") {
+      Object.keys(itemConfig.baseConfig).forEach((key) => {
+        if (itemConfig.baseConfig[key] !== "") {
+          baseProps.style += `;${key}:${itemConfig.baseConfig[key]}`;
+        }
+      });
+      return baseProps;
+    }
     if (itemConfig.advancedConfig.disabled) {
       baseProps["disabled"] = renderDisabled();
     }
@@ -39558,8 +40539,11 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
       if (!currContent) {
         return "";
       }
+      if (isDesigner) {
+        return "属性计算";
+      }
       let currEvent = new Function("globalData,rootNode,parentNode,currNode,utils", currContent.indexOf("return") > -1 ? currContent : `return ${currContent}`);
-      return currEvent(globalData, getRootNode(), getParentNode(), handleGetCurrNode(), utils);
+      return currEvent(getGlobalData(), getRootNode(), getParentNode(), handleGetCurrNode(), utils);
     } catch (err) {
       console.error(err);
       console.log("RenderContent异常");
@@ -39568,9 +40552,12 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
     }
   }
   function renderEvent(eventExpress) {
+    if (isDesigner) {
+      return "事件计算";
+    }
     try {
       let currEvent = new Function("refs,globalData,rootNode,parentNode,currNode,currValue,dataType,slotRootHasDefault,slotValue,utils", eventExpress);
-      return currEvent(refsData.value, globalData, getRootNode(), getParentNode(), handleGetCurrNode(), modelValue, nodeItem == null ? void 0 : nodeItem.dataType, slotRootHasDefault, slotValue.value, utils);
+      return currEvent(refsData.value, getGlobalData(), getRootNode(), getParentNode(), handleGetCurrNode(), modelValue, nodeItem == null ? void 0 : nodeItem.dataType, slotRootHasDefault, slotValue.value, utils);
     } catch (err) {
       console.log("RenderEvent异常");
       console.log(eventExpress);
@@ -39611,7 +40598,7 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
     try {
       if (nodeItem.config.advancedConfig && nodeItem.config.advancedConfig.vif) {
         let currEvent = new Function("globalData,rootNode,parentNode,currNode,utils", "return " + nodeItem.config.advancedConfig.vif);
-        const isShow = currEvent(globalData, getRootNode(), getParentNode(), handleGetCurrNode(), utils);
+        const isShow = currEvent(getGlobalData(), getRootNode(), getParentNode(), handleGetCurrNode(), utils);
         nodeItem.isShow = isShow;
         return isShow;
       }
@@ -39624,7 +40611,7 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
     try {
       if (nodeItem.config.advancedConfig && nodeItem.config.advancedConfig.disabled) {
         let currEvent = new Function("globalData,rootNode,parentNode,currNode,utils", "return " + nodeItem.config.advancedConfig.disabled);
-        return currEvent(globalData, getRootNode(), getParentNode(), handleGetCurrNode(), utils);
+        return currEvent(getGlobalData(), getRootNode(), getParentNode(), handleGetCurrNode(), utils);
       }
     } catch (err) {
       console.error(err);
@@ -39636,7 +40623,7 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
     try {
       if (nodeItem.config.advancedConfig && nodeItem.config.advancedConfig.eventChange) {
         let currEvent = new Function("val,globalData,rootNode,parentNode,currNode,utils", nodeItem.config.advancedConfig.eventChange);
-        return currEvent(val, globalData, getRootNode(), getParentNode(), handleGetCurrNode(), utils);
+        return currEvent(val, getGlobalData(), getRootNode(), getParentNode(), handleGetCurrNode(), utils);
       }
     } catch (err) {
       console.log("ValueCahnge异常");
@@ -39651,7 +40638,7 @@ function useRender(props, nodeItem, modelValue = void 0, slotValue = void 0) {
     getParentNode,
     getNodeValue,
     getArrayNodeValue,
-    globalData,
+    getGlobalData,
     getCurrNode: handleGetCurrNode,
     renderProps: renderProps2,
     renderContent,
@@ -39696,7 +40683,7 @@ const _sfc_main$1b = /* @__PURE__ */ defineComponent({
     const props = __props;
     const { setValue } = useProps();
     const nodeItem = useModel$1(__props, "nodeItem");
-    const { isMobile, componentProps, getArrayNodeValue, renderProps: renderProps2, globalData, getRootNode, getParentNode, getCurrNode, getNodeValue } = useRender(props, nodeItem.value);
+    const { isMobile, componentProps, getArrayNodeValue, renderProps: renderProps2, getGlobalData, getRootNode, getParentNode, getCurrNode, getNodeValue } = useRender(props, nodeItem.value);
     const list = ref();
     const listProps2 = computed(() => {
       const currProps = { ...nodeItem.value.config.arrayConfig };
@@ -39722,7 +40709,7 @@ const _sfc_main$1b = /* @__PURE__ */ defineComponent({
       }
       const item = getNodeValue(arrayChildren);
       let currEvent = new Function("globalData,rootNode,parentNode,currNode,item,utils", currContent.indexOf("return") > -1 ? currContent : `return ${currContent}`);
-      return currEvent(globalData, getRootNode(), getParentNode(), getCurrNode(), item, utils);
+      return currEvent(getGlobalData(), getRootNode(), getParentNode(), getCurrNode(), item, utils);
     }
     setValue({
       getCurrNode: () => {
@@ -39820,7 +40807,7 @@ const _sfc_main$1b = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicRenderInnerObjectArray = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["__scopeId", "data-v-6d987d9c"]]);
+const DynamicRenderInnerObjectArray = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["__scopeId", "data-v-ef473194"]]);
 const _hoisted_1$Z = { class: "els-node els-dynamic-render" };
 const _hoisted_2$R = { class: "els-dynamic-render-inner" };
 const _sfc_main$1a = /* @__PURE__ */ defineComponent({
@@ -39977,11 +40964,14 @@ const _sfc_main$1a = /* @__PURE__ */ defineComponent({
     function removeComponentRef(id) {
       delete refsData.value[id];
     }
+    function getGlobalData() {
+      return props.globalData;
+    }
     setValue({
       "tagID": "els-dynamic-render-" + utils.randomNumber(),
       "componentData": currComponentTypes.value,
       "dataTypeData": currDynamicDataType.value,
-      globalData: props.globalData,
+      getGlobalData,
       refsData,
       setComponentRef,
       removeComponentRef,
@@ -40040,7 +41030,7 @@ const _sfc_main$1a = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ElsDynamicRenderAsync = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["__scopeId", "data-v-e22a9de1"]]);
+const ElsDynamicRenderAsync = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["__scopeId", "data-v-957795fa"]]);
 const _sfc_main$19 = /* @__PURE__ */ defineComponent({
   ...{
     inheritAttrs: false
@@ -40088,26 +41078,28 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
     });
     useComponentRef(props.nodeItem, dyComponent);
     return (_ctx, _cache) => {
+      var _a;
       return componentName.value ? (openBlock(), createBlock(resolveDynamicComponent(componentName.value), mergeProps({ key: 0 }, Object.assign({}, unref(componentProps), unref(attrs)), {
         modelValue: currValue.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => currValue.value = $event),
         ref_key: "dyComponent",
         ref: dyComponent
-      }), {
-        default: withCtx(() => [
-          _ctx.nodeItem.slots && _ctx.nodeItem.slots.length ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(_ctx.nodeItem.slots, (slot) => {
-            return renderSlot(_ctx.$slots, slot.name, {}, () => [
+      }), createSlots({ _: 2 }, [
+        renderList((_a = _ctx.nodeItem.slots) == null ? void 0 : _a.filter((ele) => ele.children.length), (slot) => {
+          return {
+            name: slot.name,
+            fn: withCtx((slotProps) => [
               createVNode(ElsDynamicRenderAsync, {
                 config: slot.children,
                 modelValue: slotValue.value[slot.name],
                 "onUpdate:modelValue": ($event) => slotValue.value[slot.name] = $event,
+                globalData: Object.assign({}, slotProps, { componentValue: currValue.value }),
                 isMobile: unref(isMobile)
-              }, null, 8, ["config", "modelValue", "onUpdate:modelValue", "isMobile"])
-            ]);
-          }), 256)) : createCommentVNode("", true)
-        ]),
-        _: 3
-      }, 16, ["modelValue"])) : createCommentVNode("", true);
+              }, null, 8, ["config", "modelValue", "onUpdate:modelValue", "globalData", "isMobile"])
+            ])
+          };
+        })
+      ]), 1040, ["modelValue"])) : createCommentVNode("", true);
     };
   }
 });
@@ -40126,9 +41118,6 @@ const _sfc_main$18 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const { getValue: getValue2 } = useProps();
     const dataTypes = getValue2("dataTypeData", []);
-    getValue2("getCurrNode", () => {
-      return {};
-    });
     const nodeItem = useModel$1(__props, "nodeItem");
     const { isMobile, formProps: formProps2, componentProps, renderDisabled } = useRender(props, nodeItem.value);
     function handleValueChange(val) {
@@ -40242,7 +41231,7 @@ const _sfc_main$18 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicRenderInnerArray = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__scopeId", "data-v-174af7e7"]]);
+const DynamicRenderInnerArray = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__scopeId", "data-v-fc00363b"]]);
 const _sfc_main$17 = /* @__PURE__ */ defineComponent({
   ...{
     inheritAttrs: false
@@ -40792,11 +41781,14 @@ const _sfc_main$13 = /* @__PURE__ */ defineComponent({
     function removeComponentRef(id) {
       delete refsData.value[id];
     }
+    function getGlobalData() {
+      return props.globalData;
+    }
     setValue({
       "tagID": "els-dynamic-render-" + utils.randomNumber(),
       "componentData": currComponentTypes.value,
       "dataTypeData": currDynamicDataType.value,
-      globalData: props.globalData,
+      getGlobalData,
       refsData,
       setComponentRef,
       removeComponentRef,
@@ -40849,7 +41841,7 @@ const _sfc_main$13 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicRender = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["__scopeId", "data-v-703dd30b"]]);
+const DynamicRender = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["__scopeId", "data-v-2944b7e0"]]);
 const ElsRender = withInstall(DynamicRender);
 const ElsRenderAsync = withInstall(ElsDynamicRenderAsync);
 const _sfc_main$12 = {};
@@ -42318,7 +43310,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
     const currValue = ref();
     const setSelectItem = getValue2("setSelectItem", () => {
     });
-    const { componentProps } = useRender(props, props.nodeItem);
+    const { componentProps } = useDesigner(props, props.nodeItem);
     function handleSelectItem() {
       setSelectItem(props.nodeItem);
     }
@@ -42459,7 +43451,7 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const { getValue: getValue2, setValue } = useProps(props);
-    const { componentProps, getNodeValue, getCurrNode } = useRender(props, props.nodeItem);
+    const { componentProps, getNodeValue, getCurrNode } = useDesigner(props, props.nodeItem);
     const recordComponent = getValue2("recordComponent", () => {
     });
     const getSelectItem = getValue2("getSelectItem", () => {
@@ -42472,7 +43464,7 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
     });
     const wrapStyle = computed(() => {
       var _a;
-      return "min-height:30px;width:100%;padding:10px 0px;" + ((_a = props.nodeItem.config.advancedConfig) == null ? void 0 : _a.style);
+      return "min-height:30px;width:100%;padding:10px 0px;" + ((_a = componentProps.value) == null ? void 0 : _a.style);
     });
     function handleAddComponent(e) {
       recordComponent();
@@ -42604,7 +43596,7 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicDesignerViewWrap = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-1b755875"]]);
+const DynamicDesignerViewWrap = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-c71304d5"]]);
 const _hoisted_1$e = ["innerHTML"];
 const _sfc_main$j = /* @__PURE__ */ defineComponent({
   ...{
@@ -42616,7 +43608,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const { componentProps, renderContent } = useRender(props, props.nodeItem);
+    const { componentProps, renderContent } = useDesigner(props, props.nodeItem);
     const componentName = ref("");
     const innerContent = computed(() => {
       return props.nodeItem.config.baseConfig.innerContent;
@@ -42669,7 +43661,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     });
     const getSelectItem = getValue2("getSelectItem", () => {
     });
-    const { isMobile, formProps: formProps2, renderDisabled } = useRender(props, props.nodeItem);
+    const { isMobile, formProps: formProps2, renderDisabled } = useDesigner(props, props.nodeItem);
     const slotVisible = ref();
     function handleSelectItem() {
       setSelectItem(props.nodeItem);
@@ -42789,7 +43781,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicDesignerViewInner = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-fb38343e"]]);
+const DynamicDesignerViewInner = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-3eb98d32"]]);
 const _sfc_main$h = /* @__PURE__ */ defineComponent({
   __name: "form",
   props: /* @__PURE__ */ mergeModels({
@@ -42807,7 +43799,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     const recordComponent = getValue2("recordComponent", () => {
     });
     const nodeItem = useModel$1(__props, "nodeItem");
-    const { isMobile, componentProps, getCurrNode, getNodeValue } = useRender(props, nodeItem.value);
+    const { isMobile, componentProps, getCurrNode, getNodeValue } = useDesigner(props, nodeItem.value);
     const setSelectItem = getValue2("setSelectItem", () => {
     });
     const getSelectItem = getValue2("getSelectItem", () => {
@@ -42929,7 +43921,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DynamicDesignerViewForm = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-d963bbee"]]);
+const DynamicDesignerViewForm = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-02e5e3d1"]]);
 const _sfc_main$g = /* @__PURE__ */ defineComponent({
   __name: "body",
   props: /* @__PURE__ */ mergeModels({
@@ -43151,7 +44143,7 @@ const useDesign = defineStore("dynamic-design", () => {
     clear
   };
 });
-const _withScopeId = (n) => (pushScopeId("data-v-fe55c5e4"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-3fff1023"), n = n(), popScopeId(), n);
 const _hoisted_1$c = {
   style: { "display": "flex", "background": "#f8f8f8" },
   class: "els-dynamic-d-view"
@@ -44343,7 +45335,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DesignerView = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-fe55c5e4"]]);
+const DesignerView = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-3fff1023"]]);
 const ElsDesignerView = withInstall(DesignerView);
 (function(Prism2) {
   var string = /(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;
@@ -45150,31 +46142,31 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
     }
     onMounted(() => {
       if (props.language === "json") {
-        const currModule = import("./mode-json-BwaIV5ov.js").then((n) => n.m);
+        const currModule = import("./mode-json-W24VUbho.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/json", res);
           init();
         });
       } else if (props.language === "javascript") {
-        const currModule = import("./mode-javascript-BUpWtpG0.js").then((n) => n.m);
+        const currModule = import("./mode-javascript-BiP9yoWP.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/javascript", res);
           init();
         });
       } else if (props.language === "csharp") {
-        const currModule = import("./mode-csharp-BH3u3Lz_.js").then((n) => n.m);
+        const currModule = import("./mode-csharp-CJYppySx.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/csharp", res);
           init();
         });
       } else if (props.language === "mysql") {
-        const currModule = import("./mode-mysql-DzS4SCkv.js").then((n) => n.m);
+        const currModule = import("./mode-mysql-D2Rn7oSL.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/mysql", res);
           init();
         });
       } else if (props.language === "css") {
-        const currModule = import("./mode-css-CHfB4rk0.js").then((n) => n.m);
+        const currModule = import("./mode-css-CT2qzIxT.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/css", res);
           init();