element-less 0.0.60 → 0.0.62

package/{index-B3gKKAuH.js → index-7c_sNy4-.js}

@@ -1163,7 +1163,7 @@ class NodeRange {
   }
 }
 const emptyAttrs = /* @__PURE__ */ Object.create(null);
-class Node {
+let Node$1 = class Node2 {
   /**
   @internal
   */
@@ -1293,14 +1293,14 @@ class Node {
   copy(content = null) {
     if (content == this.content)
       return this;
-    return new Node(this.type, this.attrs, content, this.marks);
+    return new Node2(this.type, this.attrs, content, this.marks);
   }
   /**
   Create a copy of this node, with the given set of marks instead
   of the node's own marks.
   */
   mark(marks) {
-    return marks == this.marks ? this : new Node(this.type, this.attrs, this.content, marks);
+    return marks == this.marks ? this : new Node2(this.type, this.attrs, this.content, marks);
   }
   /**
   Create a copy of this node with only the content between the
@@ -1563,9 +1563,9 @@ class Node {
     node.type.checkAttrs(node.attrs);
     return node;
   }
-}
-Node.prototype.text = void 0;
-class TextNode extends Node {
+};
+Node$1.prototype.text = void 0;
+class TextNode extends Node$1 {
   /**
   @internal
   */
@@ -2152,7 +2152,7 @@ let NodeType$1 = class NodeType {
   create(attrs = null, content, marks) {
     if (this.isText)
       throw new Error("NodeType.create can't construct text nodes");
-    return new Node(this, this.computeAttrs(attrs), Fragment.from(content), Mark$1.setFrom(marks));
+    return new Node$1(this, this.computeAttrs(attrs), Fragment.from(content), Mark$1.setFrom(marks));
   }
   /**
   Like [`create`](https://prosemirror.net/docs/ref/#model.NodeType.create), but check the given content
@@ -2162,7 +2162,7 @@ let NodeType$1 = class NodeType {
   createChecked(attrs = null, content, marks) {
     content = Fragment.from(content);
     this.checkContent(content);
-    return new Node(this, this.computeAttrs(attrs), content, Mark$1.setFrom(marks));
+    return new Node$1(this, this.computeAttrs(attrs), content, Mark$1.setFrom(marks));
   }
   /**
   Like [`create`](https://prosemirror.net/docs/ref/#model.NodeType.create), but see if it is
@@ -2185,7 +2185,7 @@ let NodeType$1 = class NodeType {
     let after = matched && matched.fillBefore(Fragment.empty, true);
     if (!after)
       return null;
-    return new Node(this, attrs, content.append(after), Mark$1.setFrom(marks));
+    return new Node$1(this, attrs, content.append(after), Mark$1.setFrom(marks));
   }
   /**
   Returns true if the given fragment is valid content for this node
@@ -2381,7 +2381,7 @@ class Schema {
       let type = this.marks[prop], excl = type.spec.excludes;
       type.excluded = excl == null ? [type] : excl == "" ? [] : gatherMarks(this, excl.split(" "));
     }
-    this.nodeFromJSON = (json) => Node.fromJSON(this, json);
+    this.nodeFromJSON = (json) => Node$1.fromJSON(this, json);
     this.markFromJSON = (json) => Mark$1.fromJSON(this, json);
     this.topNodeType = this.nodes[this.spec.topNode || "doc"];
     this.cached.wrappings = /* @__PURE__ */ Object.create(null);
@@ -2451,7 +2451,7 @@ function isTagRule(rule) {
 function isStyleRule(rule) {
   return rule.style != null;
 }
-class DOMParser {
+let DOMParser$1 = class DOMParser2 {
   /**
   Create a parser that targets the given schema, using the given
   parsing rules.
@@ -2577,9 +2577,9 @@ class DOMParser {
   [priority](https://prosemirror.net/docs/ref/#model.GenericParseRule.priority).
   */
   static fromSchema(schema2) {
-    return schema2.cached.domParser || (schema2.cached.domParser = new DOMParser(schema2, DOMParser.schemaRules(schema2)));
+    return schema2.cached.domParser || (schema2.cached.domParser = new DOMParser2(schema2, DOMParser2.schemaRules(schema2)));
   }
-}
+};
 const blockTags = {
   address: true,
   article: true,
@@ -6023,7 +6023,7 @@ class EditorState {
     let instance2 = new EditorState($config);
     $config.fields.forEach((field) => {
       if (field.name == "doc") {
-        instance2.doc = Node.fromJSON(config.schema, json.doc);
+        instance2.doc = Node$1.fromJSON(config.schema, json.doc);
       } else if (field.name == "selection") {
         instance2.selection = Selection.fromJSON(instance2.doc, json.selection);
       } else if (field.name == "storedMarks") {
@@ -9285,7 +9285,7 @@ function parseFromClipboard(view, text, html, plainText, $context) {
       dom = child;
     }
   if (!slice2) {
-    let parser = view.someProp("clipboardParser") || view.someProp("domParser") || DOMParser.fromSchema(view.state.schema);
+    let parser = view.someProp("clipboardParser") || view.someProp("domParser") || DOMParser$1.fromSchema(view.state.schema);
     slice2 = parser.parseSlice(dom, {
       preserveWhitespace: !!(asText || sliceData),
       context: $context,
@@ -11157,7 +11157,7 @@ function parseBetween(view, from_, to_) {
     }
   }
   let startDoc = view.state.doc;
-  let parser = view.someProp("domParser") || DOMParser.fromSchema(view.state.schema);
+  let parser = view.someProp("domParser") || DOMParser$1.fromSchema(view.state.schema);
   let $from = startDoc.resolve(from2);
   let sel = null, doc2 = parser.parse(parent, {
     topNode: $from.parent,
@@ -12649,7 +12649,7 @@ function elementFromString(value) {
   return removeWhitespaces(html);
 }
 function createNodeFromContent(content, schema2, options2) {
-  if (content instanceof Node || content instanceof Fragment) {
+  if (content instanceof Node$1 || content instanceof Fragment) {
     return content;
   }
   options2 = {
@@ -12705,9 +12705,9 @@ function createNodeFromContent(content, schema2, options2) {
         })
       });
       if (options2.slice) {
-        DOMParser.fromSchema(contentCheckSchema).parseSlice(elementFromString(content), options2.parseOptions);
+        DOMParser$1.fromSchema(contentCheckSchema).parseSlice(elementFromString(content), options2.parseOptions);
       } else {
-        DOMParser.fromSchema(contentCheckSchema).parse(elementFromString(content), options2.parseOptions);
+        DOMParser$1.fromSchema(contentCheckSchema).parse(elementFromString(content), options2.parseOptions);
       }
       if (options2.errorOnInvalidContent && hasInvalidContent) {
         throw new Error("[tiptap error]: Invalid HTML content", {
@@ -12715,7 +12715,7 @@ function createNodeFromContent(content, schema2, options2) {
         });
       }
     }
-    const parser = DOMParser.fromSchema(schema2);
+    const parser = DOMParser$1.fromSchema(schema2);
     if (options2.slice) {
       return parser.parseSlice(elementFromString(content), options2.parseOptions).content;
     }
@@ -23280,7 +23280,7 @@ var Mention = Node3.create({
         if (!empty2) {
           return false;
         }
-        let mentionNode = new Node();
+        let mentionNode = new Node$1();
         let mentionPos = 0;
         state.doc.nodesBetween(anchor - 1, anchor, (node, pos) => {
           if (node.type.name === this.name) {
@@ -26861,6 +26861,76 @@ const _sfc_main$2q = /* @__PURE__ */ Object.assign({ name: "ElsTiptapEditor" },
       getPlainText: () => getPlainTextWithMentions(),
       getMentions: () => currentMentions.value
     });
+    const INLINE_TAG_MAP = {
+      div: "span",
+      p: "span"
+    };
+    const htmlNodeToSpec = (node) => {
+      if (node.nodeType === Node.TEXT_NODE) return node.textContent || "";
+      if (node.nodeType !== Node.ELEMENT_NODE) return "";
+      const tag = INLINE_TAG_MAP[node.tagName.toLowerCase()] || node.tagName.toLowerCase();
+      const attrs = {};
+      Array.from(node.attributes).forEach((attr) => {
+        const name2 = attr.name.toLowerCase();
+        const value = attr.value;
+        if (name2.startsWith("on")) return;
+        if ((name2 === "src" || name2 === "href") && /^javascript:/i.test(value.trim())) return;
+        attrs[attr.name] = value;
+      });
+      return [
+        tag,
+        attrs,
+        ...Array.from(node.childNodes).map(htmlNodeToSpec).filter((child) => child !== "")
+      ];
+    };
+    const htmlStringToMentionSpec = (html, HTMLAttributes) => {
+      if (typeof window === "undefined" || typeof DOMParser === "undefined") {
+        return [
+          "span",
+          { ...HTMLAttributes, contenteditable: "false" },
+          html
+        ];
+      }
+      const doc2 = new DOMParser().parseFromString(html, "text/html");
+      const children = Array.from(doc2.body.childNodes).map(htmlNodeToSpec).filter((child) => child !== "");
+      return [
+        "span",
+        { ...HTMLAttributes, contenteditable: "false" },
+        ...children
+      ];
+    };
+    const sanitizeHtmlElement = (element) => {
+      Array.from(element.attributes).forEach((attr) => {
+        const name2 = attr.name.toLowerCase();
+        const value = attr.value;
+        if (name2.startsWith("on")) {
+          element.removeAttribute(attr.name);
+          return;
+        }
+        if ((name2 === "src" || name2 === "href") && /^javascript:/i.test(value.trim())) {
+          element.removeAttribute(attr.name);
+        }
+      });
+      Array.from(element.children).forEach(sanitizeHtmlElement);
+    };
+    const appendHtmlString = (container, html) => {
+      if (typeof window === "undefined" || typeof DOMParser === "undefined") {
+        container.textContent = html;
+        return;
+      }
+      const doc2 = new DOMParser().parseFromString(html, "text/html");
+      Array.from(doc2.body.children).forEach(sanitizeHtmlElement);
+      container.append(...Array.from(doc2.body.childNodes));
+    };
+    const appendRenderOptionContent = (container, option) => {
+      const result = props2.renderOption ? props2.renderOption(option) : option[props2.labelField];
+      const content = result && typeof result === "object" && "html" in result ? result.html : result;
+      if (typeof content === "string") {
+        appendHtmlString(container, content);
+        return;
+      }
+      container.textContent = String(content ?? "");
+    };
     const CustomMention = index_default.extend({
       draggable: true,
       addOptions() {
@@ -26884,7 +26954,9 @@ const _sfc_main$2q = /* @__PURE__ */ Object.assign({ name: "ElsTiptapEditor" },
           try {
             const result = renderMention(mentionData);
             if (result) {
+              if (typeof result === "string") return htmlStringToMentionSpec(result, HTMLAttributes);
               if (Array.isArray(result)) return result;
+              if (result.html && typeof result.html === "string") return htmlStringToMentionSpec(result.html, HTMLAttributes);
               if (result.html && Array.isArray(result.html)) return result.html;
             }
           } catch (error) {
@@ -27143,7 +27215,7 @@ const _sfc_main$2q = /* @__PURE__ */ Object.assign({ name: "ElsTiptapEditor" },
           div2.appendChild(badge);
         }
         const labelSpan = document.createElement("span");
-        labelSpan.textContent = props2.renderOption ? props2.renderOption(item) : item[props2.labelField];
+        appendRenderOptionContent(labelSpan, item);
         div2.appendChild(labelSpan);
         if (item.type === "container") {
           const drillArrow = document.createElement("span");
@@ -27247,7 +27319,7 @@ const _sfc_main$2q = /* @__PURE__ */ Object.assign({ name: "ElsTiptapEditor" },
     };
   }
 });
-const TipTapEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$2q, [["__scopeId", "data-v-7bfd3d3b"]]);
+const TipTapEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$2q, [["__scopeId", "data-v-329f0d4d"]]);
 const { saveAs } = pkg;
 function _toConsumableArray(e) {
   if (Array.isArray(e)) {
@@ -40010,6 +40082,7 @@ const _sfc_main$1Z = /* @__PURE__ */ defineComponent({
     let currSpanMethod;
     let currSummaryMethod;
     let currSortChange;
+    let rowSortableInstance = null;
     let columnEditData = reactive([]);
     let columnSortData = reactive({});
     let columnMergeData = reactive([]);
@@ -40024,6 +40097,7 @@ const _sfc_main$1Z = /* @__PURE__ */ defineComponent({
     let mobilePageLayout = "total, prev, next, jumper";
     const bottomScroll = ref();
     const dataTable = ref();
+    const tableRenderKey = ref(0);
     const tableForm = ref();
     const tableGlobalData = ref({
       isEdit: props2.isEdit
@@ -40198,13 +40272,15 @@ const _sfc_main$1Z = /* @__PURE__ */ defineComponent({
             group: props2.tagId,
             animation: 300,
             onAdd: (evt) => {
-              if (props2.dragCol.onAdd) {
-                props2.dragCol.onAdd(evt);
+              const dragColOptions = props2.dragCol;
+              if (dragColOptions == null ? void 0 : dragColOptions.onAdd) {
+                dragColOptions.onAdd(evt);
               }
             },
             onEnd: (evt) => {
-              if (props2.dragCol.onEnd) {
-                props2.dragCol.onEnd(evt);
+              const dragColOptions = props2.dragCol;
+              if (dragColOptions == null ? void 0 : dragColOptions.onEnd) {
+                dragColOptions.onEnd(evt);
               } else {
                 const { oldIndex, newIndex } = evt;
                 const [movedColumn] = tableColumns.value.splice(oldIndex, 1);
@@ -40217,33 +40293,276 @@ const _sfc_main$1Z = /* @__PURE__ */ defineComponent({
       }
     }
     function setRowDragSortable() {
-      if (props2.dragRow) {
-        new Sortable(dataTable.value.$el.querySelector(".el-table__body-wrapper tbody"), {
-          handle: ".els-table-drag",
-          draggable: ".el-table__row",
-          // 允许拖拽的项目类名
-          // 拖拽中 回调函数
-          onMove(customEvent) {
+      if (!props2.dragRow) return;
+      if (rowSortableInstance) {
+        rowSortableInstance.destroy();
+        rowSortableInstance = null;
+      }
+      const parentKeyMap = /* @__PURE__ */ new Map();
+      const rowDataMap = /* @__PURE__ */ new Map();
+      const getRowKey = (row) => String(row[dataKey.value]);
+      const buildMaps = () => {
+        parentKeyMap.clear();
+        rowDataMap.clear();
+        if (!dataKey.value) return;
+        const traverse = (rows, parentKey) => {
+          rows.forEach((row) => {
+            var _a;
+            const key = getRowKey(row);
+            rowDataMap.set(key, row);
+            if (parentKey !== void 0) parentKeyMap.set(key, parentKey);
+            if ((_a = row.children) == null ? void 0 : _a.length) traverse(row.children, key);
+          });
+        };
+        traverse(tableData);
+      };
+      buildMaps();
+      const tbody = dataTable.value.$el.querySelector(".el-table__body-wrapper tbody");
+      let hiddenRows = [];
+      let rowDragStarted = false;
+      const resetRowDragTable = () => {
+        tableRenderKey.value++;
+        nextTick(() => setRowDragSortable());
+      };
+      const getRowLevel = (tr2) => {
+        var _a;
+        const levelClass = Array.from(tr2.classList).find((className) => className.includes("el-table__row--level-"));
+        const level = (_a = levelClass == null ? void 0 : levelClass.match(/el-table__row--level-(\d+)/)) == null ? void 0 : _a[1];
+        return level ? Number(level) : 0;
+      };
+      const syncDomRowKeys = () => {
+        if (!dataKey.value) return;
+        const rows = Array.from(tbody.querySelectorAll("tr.el-table__row"));
+        const levelRows = [];
+        const levelChildIndex = [];
+        let rootIndex = 0;
+        rows.forEach((tr2) => {
+          var _a;
+          const level = getRowLevel(tr2);
+          let row;
+          if (level === 0) {
+            row = tableData[rootIndex];
+            rootIndex++;
+          } else {
+            const parent = levelRows[level - 1];
+            const childIndex = levelChildIndex[level] ?? 0;
+            row = (_a = parent == null ? void 0 : parent.children) == null ? void 0 : _a[childIndex];
+            levelChildIndex[level] = childIndex + 1;
+          }
+          if (row) {
+            tr2.dataset.rowKey = getRowKey(row);
+            levelRows[level] = row;
+            levelChildIndex[level + 1] = 0;
+          }
+        });
+        rowDragLog("sync-dom-row-keys", {
+          domKeys: rows.map((tr2) => tr2.dataset.rowKey),
+          rootDataKeys: getRootDataKeys()
+        });
+      };
+      const getDomRowKeys = () => Array.from(tbody.querySelectorAll("tr.el-table__row")).map((tr2) => tr2.dataset.rowKey);
+      const getRootDataKeys = () => tableData.map((row) => dataKey.value ? getRowKey(row) : "");
+      const rowDragLog = (step, data = {}) => {
+        console.log("[ElsTable row-drag]", step, data);
+      };
+      const isDescendantOf = (key, parentKey) => {
+        let currParentKey = parentKeyMap.get(key);
+        while (currParentKey !== void 0) {
+          if (currParentKey === parentKey) return true;
+          currParentKey = parentKeyMap.get(currParentKey);
+        }
+        return false;
+      };
+      const hideDescendantRows = (rowKey) => {
+        clearHiddenRows();
+        const rows = Array.from(tbody.querySelectorAll("tr.el-table__row"));
+        hiddenRows = rows.filter((tr2) => {
+          const key = tr2.dataset.rowKey;
+          return key && isDescendantOf(key, rowKey);
+        });
+        hiddenRows.forEach((tr2) => {
+          tr2.style.display = "none";
+        });
+        rowDragLog("hide-descendants", {
+          rowKey,
+          hiddenKeys: hiddenRows.map((tr2) => tr2.dataset.rowKey),
+          domKeys: getDomRowKeys(),
+          parentKeyMap: Array.from(parentKeyMap.entries())
+        });
+      };
+      const clearHiddenRows = () => {
+        const restoreKeys = hiddenRows.map((tr2) => tr2.dataset.rowKey);
+        hiddenRows.forEach((tr2) => {
+          tr2.style.display = "";
+        });
+        hiddenRows = [];
+        if (restoreKeys.length) rowDragLog("restore-hidden-rows", { restoreKeys });
+      };
+      rowSortableInstance = new Sortable(tbody, {
+        handle: ".els-table-drag",
+        draggable: ".el-table__row",
+        animation: 150,
+        onChoose(dragEvent) {
+          var _a, _b, _c;
+          rowDragStarted = false;
+          syncDomRowKeys();
+          if (!dataKey.value) {
+            rowDragLog("choose-no-row-key", { domKeys: getDomRowKeys() });
+            return;
+          }
+          buildMaps();
+          const draggedKey = dragEvent.item.dataset.rowKey;
+          const row = draggedKey ? rowDataMap.get(draggedKey) : void 0;
+          rowDragLog("choose", {
+            draggedKey,
+            hasRow: !!row,
+            hasChildren: !!((_a = row == null ? void 0 : row.children) == null ? void 0 : _a.length),
+            childrenKeys: (_b = row == null ? void 0 : row.children) == null ? void 0 : _b.map((child) => getRowKey(child)),
+            rootDataKeys: getRootDataKeys(),
+            domKeys: getDomRowKeys(),
+            parentKeyMap: Array.from(parentKeyMap.entries())
+          });
+          if (!draggedKey) return;
+          if (!((_c = row == null ? void 0 : row.children) == null ? void 0 : _c.length)) return;
+          hideDescendantRows(draggedKey);
+        },
+        onUnchoose() {
+          rowDragLog("unchoose", { rowDragStarted, domKeys: getDomRowKeys(), rootDataKeys: getRootDataKeys() });
+          if (!rowDragStarted) clearHiddenRows();
+        },
+        onStart() {
+          rowDragStarted = true;
+          rowDragLog("start", { domKeys: getDomRowKeys(), rootDataKeys: getRootDataKeys() });
+        },
+        onMove(customEvent) {
+          var _a, _b;
+          if (!dataKey.value) {
             emits2("dragMove", customEvent);
-          },
-          onStart() {
-          },
-          // 拖拽结束，调整位置
-          onEnd(dragEvent) {
-            const newIndex = dragEvent.newIndex;
-            const oldIndex = dragEvent.oldIndex;
-            if (newIndex !== void 0 && oldIndex !== void 0) {
-              if (oldIndex > -1 && newIndex > -1) {
-                const startRow = tableData[oldIndex];
-                const endRow = tableData[newIndex];
-                const currRow = tableData.splice(oldIndex, 1)[0];
-                tableData.splice(newIndex, 0, currRow);
-                emits2("dragEnd", { startRow, endRow });
+            return;
+          }
+          buildMaps();
+          const draggedKey = customEvent.dragged.dataset.rowKey;
+          const relatedKey = (_b = (_a = customEvent.related) == null ? void 0 : _a.dataset) == null ? void 0 : _b.rowKey;
+          rowDragLog("move", {
+            draggedKey,
+            relatedKey,
+            draggedIsChild: draggedKey ? parentKeyMap.has(draggedKey) : void 0,
+            relatedIsChild: relatedKey ? parentKeyMap.has(relatedKey) : void 0,
+            relatedIsDescendantOfDragged: draggedKey && relatedKey ? isDescendantOf(relatedKey, draggedKey) : void 0
+          });
+          if (!draggedKey || !relatedKey) {
+            emits2("dragMove", customEvent);
+            return;
+          }
+          if (isDescendantOf(relatedKey, draggedKey)) {
+            rowDragLog("move-block-descendant", { draggedKey, relatedKey });
+            return false;
+          }
+          emits2("dragMove", customEvent);
+        },
+        onEnd(dragEvent) {
+          rowDragStarted = true;
+          buildMaps();
+          const draggedKey = dragEvent.item.dataset.rowKey;
+          const restoreHiddenRows = () => resetRowDragTable();
+          rowDragLog("end-start", {
+            draggedKey,
+            oldIndex: dragEvent.oldIndex,
+            newIndex: dragEvent.newIndex,
+            oldDraggableIndex: dragEvent.oldDraggableIndex,
+            newDraggableIndex: dragEvent.newDraggableIndex,
+            domKeys: getDomRowKeys(),
+            rootDataKeys: getRootDataKeys(),
+            parentKeyMap: Array.from(parentKeyMap.entries())
+          });
+          if (!draggedKey || !dataKey.value) {
+            const oi = dragEvent.oldDraggableIndex;
+            const ni = dragEvent.newDraggableIndex;
+            if (oi > -1 && ni > -1 && oi !== ni) {
+              const startRow = tableData[oi];
+              const endRow = tableData[ni];
+              tableData.splice(ni, 0, tableData.splice(oi, 1)[0]);
+              emits2("dragEnd", { startRow, endRow });
+            }
+            restoreHiddenRows();
+            return;
+          }
+          const allRows = Array.from(tbody.querySelectorAll("tr[data-row-key]"));
+          const originalParentKey = parentKeyMap.get(draggedKey);
+          if (originalParentKey === void 0) {
+            const rootKeys = allRows.map((tr2) => tr2.dataset.rowKey).filter((k) => !parentKeyMap.has(k));
+            const startRow = rowDataMap.get(draggedKey);
+            const reordered = rootKeys.map((k) => rowDataMap.get(k)).filter(Boolean);
+            rowDragLog("end-root", {
+              draggedKey,
+              rootKeys,
+              reorderedKeys: reordered.map((row) => getRowKey(row)),
+              tableDataLength: tableData.length,
+              canSplice: reordered.length === tableData.length
+            });
+            if (reordered.length === tableData.length) {
+              tableData.splice(0, tableData.length, ...reordered);
+              rowDragLog("end-root-after-splice", { rootDataKeys: getRootDataKeys() });
+              emits2("dragEnd", { startRow, endRow: reordered[rootKeys.indexOf(draggedKey)] });
+            }
+            restoreHiddenRows();
+            return;
+          }
+          const originalParent = rowDataMap.get(originalParentKey);
+          const siblings = originalParent == null ? void 0 : originalParent.children;
+          if (!siblings) {
+            restoreHiddenRows();
+            return;
+          }
+          const sibKeySet = new Set(siblings.map((c) => getRowKey(c)));
+          const parentDomPos = allRows.findIndex((tr2) => tr2.dataset.rowKey === originalParentKey);
+          const consecutiveSibKeys = [];
+          for (let i = parentDomPos + 1; i < allRows.length; i++) {
+            const k = allRows[i].dataset.rowKey;
+            if (!sibKeySet.has(k)) break;
+            consecutiveSibKeys.push(k);
+          }
+          const movedToRoot = !consecutiveSibKeys.includes(draggedKey);
+          rowDragLog("end-child", {
+            draggedKey,
+            originalParentKey,
+            siblingsKeys: Array.from(sibKeySet),
+            parentDomPos,
+            consecutiveSibKeys,
+            movedToRoot,
+            domKeys: allRows.map((tr2) => tr2.dataset.rowKey)
+          });
+          if (!movedToRoot) {
+            const childKeys = allRows.map((tr2) => tr2.dataset.rowKey).filter((k) => sibKeySet.has(k));
+            const startRow = rowDataMap.get(draggedKey);
+            const reordered = childKeys.map((k) => rowDataMap.get(k)).filter(Boolean);
+            if (reordered.length === siblings.length) {
+              siblings.splice(0, siblings.length, ...reordered);
+              emits2("dragEnd", { startRow, endRow: reordered[childKeys.indexOf(draggedKey)] });
+            }
+          } else {
+            const childRow = rowDataMap.get(draggedKey);
+            const draggedDomPos = allRows.findIndex((tr2) => tr2.dataset.rowKey === draggedKey);
+            const childIdx = siblings.findIndex((c) => getRowKey(c) === draggedKey);
+            if (childIdx > -1) {
+              siblings.splice(childIdx, 1);
+              if (siblings.length === 0) originalParent.children = [];
+            }
+            let insertAfterTableIdx = -1;
+            for (let i = draggedDomPos - 1; i >= 0; i--) {
+              const k = allRows[i].dataset.rowKey;
+              if (!parentKeyMap.has(k)) {
+                insertAfterTableIdx = tableData.findIndex((r) => getRowKey(r) === k);
+                break;
               }
             }
+            tableData.splice(insertAfterTableIdx + 1, 0, childRow);
+            buildMaps();
+            emits2("dragEnd", { startRow: childRow, endRow: childRow });
           }
-        });
-      }
+          restoreHiddenRows();
+        }
+      });
     }
     function setEditData(fields, isEdit) {
       if (!fields) {
@@ -41453,7 +41772,7 @@ const _sfc_main$1Z = /* @__PURE__ */ defineComponent({
           ref: tableForm
         }, {
           default: withCtx(() => [
-            withDirectives((openBlock(), createBlock(_component_el_table, mergeProps(unref(attrProps), {
+            withDirectives((openBlock(), createBlock(_component_el_table, mergeProps({ key: tableRenderKey.value }, unref(attrProps), {
               data: tableData,
               "header-sticky-top": unref(currHeaderStickyTop),
               class: [!unref(isMobile) && _ctx.hasBottomFixdScroll ? unref(tagID) + " els-table-noScroll" : unref(tagID), { "els-drag-col": _ctx.dragCol }],
@@ -41651,7 +41970,7 @@ const _sfc_main$1Z = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table$1 = /* @__PURE__ */ _export_sfc$1(_sfc_main$1Z, [["__scopeId", "data-v-2628571f"]]);
+const Table$1 = /* @__PURE__ */ _export_sfc$1(_sfc_main$1Z, [["__scopeId", "data-v-d9cadba2"]]);
 const ElsTable = withInstall$1(Table$1);
 const treeProps = buildProps({
   ...formItemProps$1,
@@ -72877,7 +73196,7 @@ const _sfc_main$1l = /* @__PURE__ */ defineComponent({
   emits: /* @__PURE__ */ mergeModels(["removeItem"], ["update:children"]),
   setup(__props, { emit: __emit }) {
     const DynamicDesignerInnerItem = defineAsyncComponent(() => {
-      return import("./innerItem-B7YlXTWE.js");
+      return import("./innerItem-D_eodwMh.js");
     });
     const { getValue: getValue2 } = useProps();
     const tagID = getValue2("tagID");
@@ -73616,7 +73935,8 @@ const _sfc_main$1k = /* @__PURE__ */ defineComponent({
         }
       }
       collect(designerObj.value);
-      return result;
+      const seen = /* @__PURE__ */ new Set();
+      return result.filter((f) => !seen.has(f.keyCode) && !!seen.add(f.keyCode));
     });
     function findItemContextDesigner(targetKeyID) {
       function traverse(items) {
@@ -73732,7 +74052,7 @@ const _sfc_main$1k = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Designer = /* @__PURE__ */ _export_sfc$1(_sfc_main$1k, [["__scopeId", "data-v-abd9a30e"]]);
+const Designer = /* @__PURE__ */ _export_sfc$1(_sfc_main$1k, [["__scopeId", "data-v-e20fc7da"]]);
 const ElsDynamicDesigner = withInstall$1(Designer);
 const renderProps = buildProps({
   ...formItemProps$1,
@@ -73831,10 +74151,10 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const DynamicRenderInner = defineAsyncComponent(() => {
-      return import("./inner-DcyBCxEU.js").then((n) => n.i);
+      return import("./inner-DmSBxfiK.js").then((n) => n.i);
     });
     const DynamicRenderForm = defineAsyncComponent(() => {
-      return import("./inner-DcyBCxEU.js").then((n) => n.f);
+      return import("./inner-DmSBxfiK.js").then((n) => n.f);
     });
     const props2 = __props;
     const { getValue: getValue2, setValue, formNodeProps } = useProps(props2);
@@ -74064,10 +74384,10 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const DynamicRenderInnerAsync = defineAsyncComponent(() => {
-      return import("./inner-DcyBCxEU.js").then((n) => n.i);
+      return import("./inner-DmSBxfiK.js").then((n) => n.i);
     });
     const DynamicRenderFormAsync = defineAsyncComponent(() => {
-      return import("./inner-DcyBCxEU.js").then((n) => n.f);
+      return import("./inner-DmSBxfiK.js").then((n) => n.f);
     });
     const props2 = __props;
     const { getValue: getValue2, setValue, formNodeProps } = useProps(props2);
@@ -77341,7 +77661,8 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
         }
       }
       collect(renderData.value);
-      return result;
+      const seen = /* @__PURE__ */ new Set();
+      return result.filter((f) => !seen.has(f.keyCode) && !!seen.add(f.keyCode));
     });
     function findItemContext(targetKeyID) {
       function traverse(items) {
@@ -77705,7 +78026,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
                                       tag: "div",
                                       class: "container-widget",
                                       move: handleMove,
-                                      list: controlData.value.filter((ele) => _ctx.filterComponentTypes.includes(ele.componentType)),
+                                      list: controlData.value.filter((ele) => _ctx.filterComponentTypes.includes(ele.componentType) && ele.componentShow !== false),
                                       "item-key": "keyID",
                                       group: { name: "dragGroup", pull: "clone", put: false },
                                       clone: handleClone,
@@ -77761,7 +78082,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
                                               tag: "div",
                                               class: "container-widget",
                                               move: handleMove,
-                                              list: controlData.value.filter((ele) => ele.componentGroup === "Form"),
+                                              list: controlData.value.filter((ele) => ele.componentGroup === "Form" && ele.componentShow !== false),
                                               "item-key": "keyID",
                                               group: { name: "dragGroup", pull: "clone", put: false },
                                               clone: handleClone,
@@ -78456,7 +78777,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DesignerView = /* @__PURE__ */ _export_sfc$1(_sfc_main$u, [["__scopeId", "data-v-64779c43"]]);
+const DesignerView = /* @__PURE__ */ _export_sfc$1(_sfc_main$u, [["__scopeId", "data-v-a9af3092"]]);
 const ElsDesignerView = withInstall$1(DesignerView);
 (function(Prism2) {
   var string = /(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;
@@ -79195,31 +79516,31 @@ let AceEditor$1 = class AceEditor extends TBaseFormItem {
     __publicField(this, "editor", ref());
     onMounted(() => {
       if (props2.language === "json") {
-        const currModule = import("./mode-json-Cto-DCln.js").then((n) => n.m);
+        const currModule = import("./mode-json-CmVf14v7.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/json", res);
           this.init();
         });
       } else if (props2.language === "javascript") {
-        const currModule = import("./mode-javascript-Um7L44Eo.js").then((n) => n.m);
+        const currModule = import("./mode-javascript-CgNYP0ZB.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/javascript", res);
           this.init();
         });
       } else if (props2.language === "csharp") {
-        const currModule = import("./mode-csharp-CeawYoKB.js").then((n) => n.m);
+        const currModule = import("./mode-csharp-DXxph2IU.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/csharp", res);
           this.init();
         });
       } else if (props2.language === "mysql") {
-        const currModule = import("./mode-mysql-CGwsxeGV.js").then((n) => n.m);
+        const currModule = import("./mode-mysql-CQl5Sngg.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/mysql", res);
           this.init();
         });
       } else if (props2.language === "css") {
-        const currModule = import("./mode-css-oOW9LZxM.js").then((n) => n.m);
+        const currModule = import("./mode-css-DNuBwejm.js").then((n) => n.m);
         currModule.then((res) => {
           ace.config.setModuleUrl("ace/mode/css", res);
           this.init();