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

package/dist/sortable.umd.js

@@ -24178,10 +24178,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
         const refObject = await getUISchema(referenceTo.objectName);
 
-        // 此处不参考 steedos 的 enable_enhanced_lookup 规则. 如果默认是开启弹出选择,用户选择过程操作太繁琐, 所以默认是关闭弹出选择.
-        // 由于amis picker 目前不支持联动, 配置了depend_on时, 使用使用select ,以支持联动
-        // TODO: 确认 amis picker 支持联动时, 清理field.depend_on判断
-        if(refObject.enable_enhanced_lookup == true){
+        // 优先取字段中配置的enable_enhanced_lookup，字段上没配置时，才从对象上取enable_enhanced_lookup属性
+        let enableEnhancedLookup = lodash.exports.isBoolean(field.enable_enhanced_lookup) ? field.enable_enhanced_lookup : refObject.enable_enhanced_lookup;
+        // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
+        if(enableEnhancedLookup == true){
             return await lookupToAmisPicker(field, readonly, ctx);
         }else if(refObject.enable_tree) {
             return await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
@@ -25307,8 +25307,44 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     };
 
     async function getQuickEditSchema(field, options){
+        //判断在amis3.2以上环境下，放开批量编辑
+        const isAmisVersionforBatchEdit = amisRequire('amis').version[0] >= 3 && amisRequire('amis').version[2] >= 2;
         const quickEditId = options.objectName + "_" + field.name + "QuickEdit";//定义快速编辑的表单id，用于setvalue传值
         var quickEditSchema = { body: [], id: quickEditId };
+        //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；
+        if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
+            const submitEvent = {
+                submit: {
+                    actions: [
+                        {
+                            actionType: "custom",
+                            script: `
+                            const items = event.data.items;
+                            const selectedItems = event.data.selectedItems;
+                            if(event.data.isBatchEdit){
+                                selectedItems.forEach(function(selectedItem){
+                                    items[selectedItem._index-1]._display.${field.name} = event.data._display.${field.name};
+                                })
+                                doAction({actionType: 'setValue', "args": {"value": {items}},componentId: "${options.crudId}","dataMergeMode": "override"});
+                                selectedItems.forEach(function(selectedItem){
+                                    doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + selectedItem._index});
+                                })
+                            }else{
+                                items[event.data._index-1]._display.${field.name} = event.data._display.${field.name};
+                                doAction({actionType: 'setValue', "args": {"value": {items}},componentId: "${options.crudId}","dataMergeMode": "override"});
+                                doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
+                            }
+                        `
+                        },
+                        {
+                            "actionType": "closeDialog"
+                        }
+                    ]
+                }
+            };
+            quickEditSchema.onEvent = submitEvent;
+        }
+        
         if (field.disabled) {
             quickEditSchema = false;
         } else {
@@ -25542,6 +25578,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                     
                 });
+                if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
+                    quickEditSchema.body.push({
+                        "name": "isBatchEdit",
+                        "type": "checkbox",
+                        "option": "更新${COUNT(selectedItems)}个选定记录",
+                        "visibleOn": "${ARRAYSOME(selectedItems, item => item._id === _id) && COUNT(selectedItems)>1}"
+                    });
+                }
             } else {
                 quickEditSchema = false;
             }
@@ -25654,7 +25698,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             else if(field.type === 'select'){
                 const map = getSelectMap(field.options);
                 columnItem = Object.assign({}, {
-                    type: "mapping",
+                    type: "static-mapping",
                     name: field.name,
                     label: field.label,
                     map: map,
@@ -25669,7 +25713,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 const tpl = await getFieldTpl(field, options);
                 let type = 'text';
                 if(tpl){
-                    type = 'tpl';
+                    type = 'static';
                 }else if(field.type === 'html'){
                     type = 'markdown';
                 }else if(field.type === 'url'){
@@ -25710,6 +25754,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     columnItem.quickEdit = quickEditSchema;
                     columnItem.quickEditEnabledOn = "${is_system !== true}";
                 }
+                columnItem.id = `${options.objectName}_${field.name}_\${_index}`;
                 columns.push(columnItem);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.4-beta.18",
+  "version": "1.3.4-beta.19",
   "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.18"
+    "@steedos-widgets/amis-lib": "1.3.4-beta.19"
   },
-  "gitHead": "8c6b4e9d5fd3c92df4d077cd3d1f781004a36031"
+  "gitHead": "e0636927f13d497d2f2838d60ead4abaa331a615"
 }