@steedos-widgets/sortable 1.3.13 → 1.3.15

package/dist/sortable.umd.js

@@ -20443,6 +20443,7 @@
     var frontend_record_detail_tab_related$1 = "Related";
     var frontend_all_apps$1 = "All apps";
     var frontend_all_projects$1 = "All projects";
+    var frontend_open_app_launcher$1 = "Open App Launcher";
     var frontend_application_launcher$1 = "Application launcher";
     var frontend_menu$1 = "Menu";
     var frontend_help$1 = "Help";
@@ -20528,6 +20529,7 @@
     	frontend_record_detail_tab_related: frontend_record_detail_tab_related$1,
     	frontend_all_apps: frontend_all_apps$1,
     	frontend_all_projects: frontend_all_projects$1,
+    	frontend_open_app_launcher: frontend_open_app_launcher$1,
     	frontend_application_launcher: frontend_application_launcher$1,
     	frontend_menu: frontend_menu$1,
     	frontend_help: frontend_help$1,
@@ -20615,6 +20617,7 @@
     var frontend_record_detail_tab_related = "相关";
     var frontend_all_apps = "所有应用";
     var frontend_all_projects = "所有项目";
+    var frontend_open_app_launcher = "打开应用程序启动器";
     var frontend_application_launcher = "应用程序启动器";
     var frontend_menu = "菜单";
     var frontend_help = "帮助";
@@ -20701,6 +20704,7 @@
     	frontend_record_detail_tab_related: frontend_record_detail_tab_related,
     	frontend_all_apps: frontend_all_apps,
     	frontend_all_projects: frontend_all_projects,
+    	frontend_open_app_launcher: frontend_open_app_launcher,
     	frontend_application_launcher: frontend_application_launcher,
     	frontend_menu: frontend_menu,
     	frontend_help: frontend_help,
@@ -31937,6 +31941,12 @@ 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;
+        if (!props.data) {
+            // 为了解决3.2 dispatchevent不生效的问题, https://github.com/baidu/amis/issues/7488
+            // 如果data为undefined，dispatchEvent时第三个参数传入的current的data为undefined会报错
+            props.data = {};
+        }
+        var MultipleContainersRef = React.useRef();
         value && delete (value.$$id);
         var _w = __read(React.useState(function () {
             var _a;
@@ -31961,7 +31971,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         value = newItems || items;
                         return [4 /*yield*/, amisDispatchEvent('change', createObject(amisData, {
                                 value: value
-                            }))];
+                            }), MultipleContainersRef.current)];
                     case 1:
                         rendererEvent = _a.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -32058,7 +32068,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 recentlyMovedToNewContainer.current = false;
             });
         }, [items]);
-        return (React__default["default"].createElement(DndContext, { sensors: sensors, collisionDetection: collisionDetectionStrategy, measuring: {
+        var multipleContainers = (React__default["default"].createElement(DndContext, __assign$1({ sensors: sensors, collisionDetection: collisionDetectionStrategy, measuring: {
                 droppable: {
                     strategy: MeasuringStrategy.Always,
                 },
@@ -32184,7 +32194,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 setActiveId(null);
                 // console.log('拖动结束2，更新form value')
                 handleChange(newItems);
-            }, cancelDrop: cancelDrop, onDragCancel: onDragCancel, modifiers: modifiers },
+            }, cancelDrop: cancelDrop, onDragCancel: onDragCancel, modifiers: modifiers }, props),
             React__default["default"].createElement("div", { style: {
                     display: 'inline-grid',
                     boxSizing: 'border-box',
@@ -32216,6 +32226,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         : renderSortableItemDragOverlay(activeId)
                     : null), document.body),
                 trashable && activeId && !containers.includes(activeId) ? (React__default["default"].createElement(Trash, { id: TRASH_ID })) : null)));
+        // 为了解决3.2 dispatchevent不生效的问题, https://github.com/baidu/amis/issues/7488
+        // dispatchEvent时第三个参数传入的current必须是一个带props属性的对象
+        MultipleContainersRef.current = multipleContainers;
+        return multipleContainers;
         function renderSortableItemDragOverlay(id) {
             var item = lodash.exports.cloneDeep(lodash.exports.keyBy(cardSource, 'id')[id]) || { id: id, label: '' + id, columnSpan: 1 };
             if (item.columnSpan && item.columnSpan > columns)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "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.13"
+    "@steedos-widgets/amis-lib": "1.3.15"
   },
-  "gitHead": "11697007cd418c8ce791321a167e9e709825680d"
+  "gitHead": "c2075c7a140975ac068732b2fc34cf031cef9def"
 }

package/src/components/MultipleContainers.tsx

@@ -213,6 +213,13 @@ export function MultipleContainers(props) {
     cardClassName = "",
   }: Props = props
 
+  if(!props.data){
+    // 为了解决3.2 dispatchevent不生效的问题, https://github.com/baidu/amis/issues/7488
+    // 如果data为undefined，dispatchEvent时第三个参数传入的current的data为undefined会报错
+    props.data = {}
+  }
+  const MultipleContainersRef: any = useRef();
+
   value && delete(value.$$id);
 
   const [items, setItems] = useState<Items>(
@@ -244,7 +251,8 @@ export function MultipleContainers(props) {
       'change',
       createObject(amisData, {
         value
-      })
+      }),
+      MultipleContainersRef.current
     );
     if (rendererEvent?.prevented) {
       return;
@@ -374,7 +382,7 @@ export function MultipleContainers(props) {
     });
   }, [items]);
 
-  return (
+  let multipleContainers = (
     <DndContext
       sensors={sensors}
       collisionDetection={collisionDetectionStrategy}
@@ -554,6 +562,7 @@ export function MultipleContainers(props) {
       cancelDrop={cancelDrop}
       onDragCancel={onDragCancel}
       modifiers={modifiers}
+      {...props}//dispatchevent需要实例中的props有amis的各项属性，因此将所有props一起传下来
     >
       <div
         style={{
@@ -654,6 +663,11 @@ export function MultipleContainers(props) {
     </DndContext>
   );
 
+  // 为了解决3.2 dispatchevent不生效的问题, https://github.com/baidu/amis/issues/7488
+  // dispatchEvent时第三个参数传入的current必须是一个带props属性的对象
+  MultipleContainersRef.current = multipleContainers;
+  return multipleContainers;
+
   function renderSortableItemDragOverlay(id: UniqueIdentifier) {
     const item = cloneDeep(keyBy(cardSource, 'id')[id]) || {id: id, label: '' + id, columnSpan:1}
     if (item.columnSpan && item.columnSpan > columns)