@steedos-widgets/sortable 1.3.4-beta.16 → 1.3.4-beta.17

package/dist/sortable.umd.js

@@ -31619,7 +31619,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 "type": "tpl",
                 "tpl": "${label}",
             }] : _r, _s = props.boardFooter, boardFooter = _s === void 0 ? [] : _s, _t = props.wrapperClassName, wrapperClassName = _t === void 0 ? "gap-2" : _t, _u = props.boardClassName, boardClassName = _u === void 0 ? "border rounded" : _u, _v = props.cardClassName, cardClassName = _v === void 0 ? "" : _v;
-        // defaultValue && delete(defaultValue.$$id);
+        value && delete (value.$$id);
         var _w = __read(React.useState(function () {
             var _a;
             return (_a = value) !== null && _a !== void 0 ? _a : {
@@ -31629,14 +31629,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             };
         }), 2), items = _w[0], setItems = _w[1];
         var _x = __read(React.useState(Object.keys(items)), 2), containers = _x[0], setContainers = _x[1];
-        var handleChange = function () { return __awaiter(_this, void 0, void 0, function () {
+        var handleChange = function (newItems) { return __awaiter(_this, void 0, void 0, function () {
             var value, rendererEvent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!amisDispatchEvent || !amisOnChange)
                             return [2 /*return*/];
-                        value = items;
+                        value = newItems || items;
                         return [4 /*yield*/, amisDispatchEvent('change', createObject(amisData, {
                                 value: value
                             }))];
@@ -31823,19 +31823,21 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     return;
                 }
                 var overContainer = findContainer(overId);
+                var newItems = items;
                 if (overContainer) {
                     var activeIndex_1 = items[activeContainer].indexOf(active.id);
                     var overIndex_1 = items[overContainer].indexOf(overId);
                     if (activeIndex_1 !== overIndex_1) {
                         setItems(function (items) {
                             var _a;
-                            return (__assign$1(__assign$1({}, items), (_a = {}, _a[overContainer] = arrayMove(items[overContainer], activeIndex_1, overIndex_1), _a)));
+                            newItems = __assign$1(__assign$1({}, items), (_a = {}, _a[overContainer] = arrayMove(items[overContainer], activeIndex_1, overIndex_1), _a));
+                            return newItems;
                         });
                     }
                 }
                 setActiveId(null);
                 // console.log('拖动结束2，更新form value')
-                handleChange();
+                handleChange(newItems);
             }, cancelDrop: cancelDrop, onDragCancel: onDragCancel, modifiers: modifiers },
             React__default["default"].createElement("div", { style: {
                     display: 'inline-grid',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.4-beta.16",
+  "version": "1.3.4-beta.17",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "1.3.4-beta.16"
+    "@steedos-widgets/amis-lib": "1.3.4-beta.17"
   },
-  "gitHead": "0e609d74ccbe4cf4fe69728349010d6fab90a439"
+  "gitHead": "184247f4260015e19c82a49fa4d6562839e73d2c"
 }

package/src/components/MultipleContainers.tsx

@@ -211,7 +211,7 @@ export function MultipleContainers(props) {
     cardClassName = "",
   }: Props = props
 
-  // defaultValue && delete(defaultValue.$$id);
+  value && delete(value.$$id);
 
   const [items, setItems] = useState<Items>(
     () => {
@@ -227,10 +227,10 @@ export function MultipleContainers(props) {
     Object.keys(items) as UniqueIdentifier[]
   );
 
-  const handleChange = async () => {
+  const handleChange = async (newItems? : any) => {
     if (!amisDispatchEvent || !amisOnChange)
       return 
-    const value = items;
+    const value = newItems || items;
 
     // 支持 amis OnEvent.change
     const rendererEvent = await amisDispatchEvent(
@@ -493,26 +493,31 @@ export function MultipleContainers(props) {
 
         const overContainer = findContainer(overId);
 
+        let newItems = items;
+
         if (overContainer) {
           const activeIndex = items[activeContainer].indexOf(active.id);
           const overIndex = items[overContainer].indexOf(overId);
 
           if (activeIndex !== overIndex) {
-            setItems((items) => ({
-              ...items,
-              [overContainer]: arrayMove(
-                items[overContainer],
-                activeIndex,
-                overIndex
-              ),
-            }));
+            setItems((items) => {
+              newItems = {
+                ...items,
+                [overContainer]: arrayMove(
+                  items[overContainer],
+                  activeIndex,
+                  overIndex
+                ),
+              }
+              return newItems;
+            });
           }
         }
 
         setActiveId(null);
 
         // console.log('拖动结束2，更新form value')
-        handleChange()
+        handleChange(newItems)
       }}
       cancelDrop={cancelDrop}
       onDragCancel={onDragCancel}