@steedos-widgets/sortable 1.3.22-beta.1 → 1.3.22-beta.3

package/dist/sortable.umd.js

@@ -21270,6 +21270,7 @@
                             {
                                 "actionType": "custom",
                                 "script": `
+
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -21656,7 +21657,9 @@
         if(!options.isLookup && !options.isInputTable){
             //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
             columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
-            columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+            if(!options.enable_tree){
+                columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+            }
         }
         const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
         
@@ -24482,7 +24485,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             {
               "type": "pagination",
               "maxButtons": 5,
-              "showPageInput": false
+              "showPageInput": true,
+              "layout": "total,pager,go"
             }
           ]
         }
@@ -26242,6 +26246,19 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return newMainField;
     }
 
+    function getTabledFieldSubFields(mainField, fields){
+        const newMainField = Object.assign({subFields: []}, mainField);
+        const subFields = lodash.exports.filter(fields, function(field){
+            let result = field.name.startsWith(`${mainField.name}.`);
+            if(result){
+                field._prefix = `${mainField.name}.`;
+            }
+            return result;
+        });
+        newMainField.subFields = subFields;
+        return newMainField;
+    }
+
 
     function getSelectFieldOptions(field){
         const dataType = field.data_type || 'text';
@@ -26370,7 +26387,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     format:'YYYY-MM-DDT00:00:00.000[Z]',
                     tpl: readonly ? getDateTpl(field) : null,
                     // utc: true,
-                    joinValues: false
+                    joinValues: false,
+                    "shortcuts": [
+                        "thismonth",
+                        "2monthsago",
+                        "3monthslater",
+                        "prevquarter",
+                        "thisquarter",
+                        "thisyear",
+                        "lastYear"
+                      ]
                 };
                 break;
             case 'date':
@@ -26781,6 +26807,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         let subFieldName = subField.name.replace(`${field.name}.$.`, '').replace(`${field.name}.`, '');
                         if(subField.type === 'grid'){
                             subField = await getGridFieldSubFields(subField, ctx.__formFields);
+                        }else if(subField.type === 'table'){
+                            subField = await getTabledFieldSubFields(subField, ctx.__formFields);
                         }else {
                             if(readonly){
                                 subFieldName = `${field.name}.${subFieldName}`;
@@ -26897,7 +26925,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 fieldNamePrefix = `${fieldNamePrefix}between__`;
             }
             if(_field.type === 'datetime'){
-                _field.type = 'input-datetime-range';
+                // 特意改为日期范围而不是日期时间范围，因为搜索时一般精确到日期就足够了，需要精确到日期时间范围需要在字段上配置amis属性来实现
+                _field.type = 'input-date-range';
                 _field.is_wide = true;
                 fieldNamePrefix = `${fieldNamePrefix}between__`;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.22-beta.1",
+  "version": "1.3.22-beta.3",
   "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.22-beta.1"
+    "@steedos-widgets/amis-lib": "1.3.22-beta.3"
   },
-  "gitHead": "90839081dd24811d0a624d9f724548d3b1437518"
+  "gitHead": "41aa5e54325d6fc200fc0828b09777f6cfc5a7fe"
 }