@cniot/mdd-editor 0.3.5 → 0.3.7

package/build/index.es.js

@@ -7213,6 +7213,22 @@ class HTML5BackendImpl {
 const HTML5Backend = function createBackend(manager, context, options) {
   return new HTML5BackendImpl(manager, context, options);
 };
+let sharedDragDropManager;
+function getSharedDragDropManager() {
+  if (!sharedDragDropManager) {
+    sharedDragDropManager = createDragDropManager(HTML5Backend);
+  }
+  return sharedDragDropManager;
+}
+function MddDndProvider({ children }) {
+  const { dragDropManager } = React$1.useContext(DndContext);
+  if (dragDropManager) {
+    return children;
+  }
+  return /* @__PURE__ */ React$1.createElement(DndProvider, {
+    manager: getSharedDragDropManager()
+  }, children);
+}
 const FormLayoutDeepContext$1 = createContext(null);
 const FormLayoutShallowContext$1 = createContext(null);
 const useFormShallowLayout$1 = () => useContext(FormLayoutShallowContext$1);
@@ -26366,6 +26382,7 @@ function MddTableForm(props, ref) {
   const [_2, _update] = useState(0);
   const [sortUpdateFlag, setSortUpdateFlag] = useState({});
   const dataRef = useRef(data);
+  const panelKeysRef = useRef([]);
   const CompSchemaMap = useMemo(
     () => penetrateType === PenetrateTypes.FORM ? { ...CompSchema, ...formItems } : CompSchema,
     []
@@ -26373,12 +26390,24 @@ function MddTableForm(props, ref) {
   const forceUpdate = () => {
     _update(Math.random());
   };
+  const syncPanelKeys = (list) => {
+    const currentKeys = panelKeysRef.current;
+    panelKeysRef.current = list.map((_22, index2) => currentKeys[index2] || uuidv4());
+  };
+  const getPanelKey = (index2) => {
+    if (!panelKeysRef.current[index2]) {
+      panelKeysRef.current[index2] = uuidv4();
+    }
+    return panelKeysRef.current[index2];
+  };
   const updateData = (newData) => {
-    dataRef.current = newData;
+    dataRef.current = Array.isArray(newData) ? newData : [];
+    syncPanelKeys(dataRef.current);
     forceUpdate();
   };
   useEffect(() => {
     dataRef.current = Array.isArray(data) ? data : [];
+    syncPanelKeys(dataRef.current);
     forceUpdate();
   }, [data]);
   useImperativeHandle(
@@ -26391,6 +26420,7 @@ function MddTableForm(props, ref) {
     []
   );
   const onRemoveHandle = (idx) => {
+    panelKeysRef.current.splice(idx, 1);
     onRemove(idx);
     forceUpdate();
   };
@@ -26403,6 +26433,8 @@ function MddTableForm(props, ref) {
       const min = Math.min(dragIndex, hoverIndex);
       const max = Math.max(dragIndex, hoverIndex);
       dataRef.current.splice(hoverIndex, 0, dataRef.current.splice(dragIndex, 1)[0]);
+      const movedPanelKey = panelKeysRef.current.splice(dragIndex, 1)[0] || uuidv4();
+      panelKeysRef.current.splice(hoverIndex, 0, movedPanelKey);
       onSort(dataRef.current);
       forceUpdate();
       for (let i = min; i <= max; i++) {
@@ -26430,14 +26462,11 @@ function MddTableForm(props, ref) {
     className: styles$b.tableFormAction
   }, actionContent)), /* @__PURE__ */ React$1.createElement("div", {
     className: styles$b.tableFormContent
-  }, /* @__PURE__ */ React$1.createElement(DndProvider, {
-    backend: HTML5Backend
-  }, /* @__PURE__ */ React$1.createElement(Collapse, {
+  }, /* @__PURE__ */ React$1.createElement(MddDndProvider, null, /* @__PURE__ */ React$1.createElement(Collapse, {
     accordion: true
   }, dataRef.current.map((item, idx) => {
-    const compKey = item.name || item.dataIndex || `${title2}_${idx}`;
     return /* @__PURE__ */ React$1.createElement(Panel$3, {
-      key: `${compKey}_${item.type || "unknown"}_${idx}`,
+      key: getPanelKey(idx),
       title: /* @__PURE__ */ React$1.createElement(TitleRender$2, {
         index: idx,
         draggable,
@@ -27791,9 +27820,7 @@ function MddTableSimpleArray(props) {
     align: "t"
   }, tip)), /* @__PURE__ */ React$1.createElement("div", {
     className: styles$9.tableArrayContent
-  }, /* @__PURE__ */ React$1.createElement(DndProvider, {
-    backend: HTML5Backend
-  }, /* @__PURE__ */ React$1.createElement(Collapse, {
+  }, /* @__PURE__ */ React$1.createElement(MddDndProvider, null, /* @__PURE__ */ React$1.createElement(Collapse, {
     accordion: true
   }, (_a2 = data == null ? void 0 : data.map) == null ? void 0 : _a2.call(data, (item, idx) => {
     return /* @__PURE__ */ React$1.createElement(Panel$2, {
@@ -28383,9 +28410,7 @@ function MddTableArray(props) {
     className: styles$6.tableArrayTitle
   }, title2), /* @__PURE__ */ React$1.createElement("div", {
     className: styles$6.tableArrayContent
-  }, /* @__PURE__ */ React$1.createElement(DndProvider, {
-    backend: HTML5Backend
-  }, /* @__PURE__ */ React$1.createElement(Collapse, {
+  }, /* @__PURE__ */ React$1.createElement(MddDndProvider, null, /* @__PURE__ */ React$1.createElement(Collapse, {
     accordion: true
   }, data.map((item, idx) => {
     var _a2;
@@ -31185,11 +31210,11 @@ function MDDEditor(props) {
   const Comp = CompAndSchema[0];
   return /* @__PURE__ */ React$1.createElement("div", {
     className: "mdd-editor-build-content"
-  }, /* @__PURE__ */ React$1.createElement(Comp, {
+  }, /* @__PURE__ */ React$1.createElement(MddDndProvider, null, /* @__PURE__ */ React$1.createElement(Comp, {
     key: editorRefreshKey,
     schema,
     moduleMap
-  }), /* @__PURE__ */ React$1.createElement(Toolbar, {
+  })), /* @__PURE__ */ React$1.createElement(Toolbar, {
     schema,
     scriptInfo: schemaAndScriptRef.current.scriptInfo,
     showScript,
@@ -31449,7 +31474,7 @@ function getDefaultIndexStyle() {
   `;
 }
 const name = "@cniot/mdd-editor";
-const version = "0.3.5";
+const version = "0.3.7";
 const description = "\u6A21\u578B\u9A71\u52A8\u7F16\u8F91\u5668";
 const scripts = {
   build: "vite build"
@@ -31465,6 +31490,7 @@ const dependencies = {
   ahooks: "^3.2.0",
   classnames: "^2.3.1",
   "cn-address-select-pro": "^0.1.5",
+  "dnd-core": "^16.0.1",
   hox: "^1.1.6",
   "immutability-helper": "^3.1.1",
   "js-cookie": "^3.0.5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cniot/mdd-editor",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "模型驱动编辑器",
   "scripts": {
     "build": "vite build"
@@ -16,6 +16,7 @@
     "ahooks": "^3.2.0",
     "classnames": "^2.3.1",
     "cn-address-select-pro": "^0.1.5",
+    "dnd-core": "^16.0.1",
     "hox": "^1.1.6",
     "immutability-helper": "^3.1.1",
     "js-cookie": "^3.0.5",