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

package/dist/sortable.umd.js

@@ -22093,7 +22093,8 @@
                             "&": "${list_view}",
                             "name":"",
                             "label": instance.t('frontend_listview_control_clone_defaultData_label_start') + " ${list_view.label} " + instance.t('frontend_listview_control_clone_defaultData_label_end'),
-                            "shared":false
+                            "shared":false,
+                            "object_name": "${targetObjectName}",
                           },
                           "fieldsExtend": fieldsExtend$3(),
                           "fields": fields(),
@@ -23801,7 +23802,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true, keywordsSearchBoxName });
             const isAllowCreate = refObjectConfig.permissions.allowCreate;
             const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
-            if (isAllowCreate && isCreate) {
+            // lookup字段配置过滤条件就强制不显示新建按钮
+            let isHasFilters = (field.filters || field._filtersFunction) ? true : false;
+            if (isAllowCreate && isCreate && !isHasFilters) {
                 const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
                 new_button.align = "right";
                 // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
@@ -24178,7 +24181,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // 此处不参考 steedos 的 enable_enhanced_lookup 规则. 如果默认是开启弹出选择,用户选择过程操作太繁琐, 所以默认是关闭弹出选择.
         // 由于amis picker 目前不支持联动, 配置了depend_on时, 使用使用select ,以支持联动
         // TODO: 确认 amis picker 支持联动时, 清理field.depend_on判断
-        if(refObject.enable_enhanced_lookup == true && lodash.exports.isEmpty(field.depend_on)){
+        if(refObject.enable_enhanced_lookup == true){
             return await lookupToAmisPicker(field, readonly, ctx);
         }else if(refObject.enable_tree) {
             return await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
@@ -24491,8 +24494,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2022-11-02 18:06:16
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2023-10-30 17:51:54
      * @Description: 
      */
 
@@ -24543,11 +24546,26 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             useChunk: false, // 关闭分块上传
             receiver: {
                 method: "post",
+                dataType: "form-data",
                 url: `\${context.rootUrl}/s3/${tableName}`,
-                data: {
-                    $: "$$",
-                    context: `\${context}`,
-                },
+                requestAdaptor: `
+                const { _master, global,context } = api.body;
+                // const { recordId, objectName } = _master;
+                const { spaceId, userId, user } = global;
+                /*
+                    record_id: recordId,
+                    parent: recordId,
+                    object_name: objectName,
+                    owner_name: user.name,
+                    space: spaceId,
+                    owner: userId
+                */
+                // 参考platform 2.2版本，附件字段保存时cfs.files.filerecord、cfs.images.filerecord表中的metadata下只保存space、owner两个属性值。
+                api.data.append('space', spaceId);
+                api.data.append('owner', userId);
+
+                return api;
+            `,
                 adaptor: `
                 const { context } = api.body; 
                 var rootUrl = context.rootUrl + "/api/files/${tableName}/";
@@ -25589,7 +25607,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                             {
                                 "args": {
                                     "api": {
-                                        "url": "${context.rootUrl}/api/files/files/${versions[0]}?download=true",
+                                        "url": "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}",
                                         "method": "get",
                                         "headers": {
                                             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
@@ -26069,6 +26087,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 }
                 return {
                     mode: "cards",
+                    perPageAvailable: [5, 10, 20, 50, 100, 500],
                     name: "thelist",
                     headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
                     className: "",
@@ -26091,6 +26110,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
         return {
             mode: "table",
+            perPageAvailable: [5, 10, 20, 50, 100, 500],
             name: "thelist",
             headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
             className: "",
@@ -31619,7 +31639,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 +31649,18 @@ 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 () {
+        React.useEffect(function () {
+            setItems(value);
+            setContainers(Object.keys(value));
+        }, [value]);
+        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
                             }))];
@@ -31645,7 +31669,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        setTimeout(function () { return amisOnChange(value); }, 1000);
+                        setTimeout(function () { return amisOnChange(value); }, 500);
                         return [2 /*return*/];
                 }
             });
@@ -31748,6 +31772,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 var active = _a.active, over = _a.over;
                 var overId = over === null || over === void 0 ? void 0 : over.id;
                 if (overId == null || overId === TRASH_ID || active.id in items) {
+                    // 拖动的是分组则跳过后面的逻辑
                     return;
                 }
                 var overContainer = findContainer(overId);
@@ -31823,19 +31848,44 @@ 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)));
-                        });
+                    if (activeContainer !== overContainer) {
+                        // 拖动变更分组之间的顺序时，activeContainer 与 overContainer 值不相等
+                        setTimeout(function () {
+                            var sortedGroups = over.data.current.sortable.items; //不加setTimeout的话，这里拿到的会是变更前的数据
+                            newItems = {};
+                            sortedGroups.forEach(function (groupKey) {
+                                newItems[groupKey] = items[groupKey];
+                            });
+                            delete newItems[TRASH_ID];
+                            delete newItems[PLACEHOLDER_ID];
+                            if (lodash.exports.keys(items).join(",") !== lodash.exports.keys(newItems).join(",")) {
+                                // 只有顺序发生变化时才触发change事件
+                                setItems(newItems);
+                                // console.log('拖动结束2，更新form value')
+                                handleChange(newItems);
+                            }
+                            setActiveId(null);
+                        }, 500);
+                        return;
+                    }
+                    else {
+                        // 同一个分组中字段顺序变更以及把一个字段从某个分组拖动到另一个分组内时，activeContainer 与 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;
+                                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.18",
   "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.18"
   },
-  "gitHead": "0e609d74ccbe4cf4fe69728349010d6fab90a439"
+  "gitHead": "8c6b4e9d5fd3c92df4d077cd3d1f781004a36031"
 }

package/src/components/MultipleContainers.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { createPortal, unstable_batchedUpdates } from 'react-dom';
-import { map, keyBy, cloneDeep } from 'lodash';
+import { map, keyBy, cloneDeep, keys } from 'lodash';
 
 import { createObject } from '@steedos-widgets/amis-lib'
 
@@ -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,15 @@ export function MultipleContainers(props) {
     Object.keys(items) as UniqueIdentifier[]
   );
 
-  const handleChange = async () => {
+  useEffect(() => {
+    setItems(value as Items);
+    setContainers(Object.keys(value) as UniqueIdentifier[]);
+  }, [value]);
+
+  const handleChange = async (newItems? : any) => {
     if (!amisDispatchEvent || !amisOnChange)
       return 
-    const value = items;
+    const value = newItems || items;
 
     // 支持 amis OnEvent.change
     const rendererEvent = await amisDispatchEvent(
@@ -243,7 +248,7 @@ export function MultipleContainers(props) {
       return;
     }
 
-    setTimeout(()=> amisOnChange(value), 1000);
+    setTimeout(()=> amisOnChange(value), 500);
   }
   
   const [activeId, setActiveId] = useState<UniqueIdentifier | null>(null);
@@ -384,6 +389,7 @@ export function MultipleContainers(props) {
         const overId = over?.id;
 
         if (overId == null || overId === TRASH_ID || active.id in items) {
+          // 拖动的是分组则跳过后面的逻辑
           return;
         }
 
@@ -493,26 +499,55 @@ export function MultipleContainers(props) {
 
         const overContainer = findContainer(overId);
 
-        if (overContainer) {
-          const activeIndex = items[activeContainer].indexOf(active.id);
-          const overIndex = items[overContainer].indexOf(overId);
+        let newItems = items;
 
-          if (activeIndex !== overIndex) {
-            setItems((items) => ({
-              ...items,
-              [overContainer]: arrayMove(
-                items[overContainer],
-                activeIndex,
-                overIndex
-              ),
-            }));
+        if (overContainer) {
+          if(activeContainer !== overContainer){
+            // 拖动变更分组之间的顺序时，activeContainer 与 overContainer 值不相等
+            setTimeout(function(){
+              const sortedGroups = over.data.current.sortable.items; //不加setTimeout的话，这里拿到的会是变更前的数据
+              newItems = {};
+              sortedGroups.forEach((groupKey: string) => {
+                newItems[groupKey] = items[groupKey];
+              });
+              delete newItems[TRASH_ID];
+              delete newItems[PLACEHOLDER_ID];
+              if(keys(items).join(",") !== keys(newItems).join(",")){
+              // 只有顺序发生变化时才触发change事件
+                setItems(newItems);
+                // console.log('拖动结束2，更新form value')
+                handleChange(newItems)
+              }
+
+              setActiveId(null);
+            },500);
+            return;
+          }
+          else {
+            // 同一个分组中字段顺序变更以及把一个字段从某个分组拖动到另一个分组内时，activeContainer 与 overContainer 值相等
+            const activeIndex = items[activeContainer].indexOf(active.id);
+            const overIndex = items[overContainer].indexOf(overId);
+  
+            if (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}