@steedos-widgets/sortable 3.6.2-beta.17 → 3.6.2-beta.18

package/dist/sortable.umd.js

@@ -24720,7 +24720,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         "timeOut": 1000
       }
     });
-    resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
@@ -26769,13 +26768,31 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 };
                 break;
             case 'input-datetime-range':
+                // convertData = {
+                //     type: "input-datetime-range",
+                //     inputFormat: 'YYYY-MM-DD HH:mm',
+                //     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+                //     utc: true,
+                //     joinValues: false
+                // }
+                // 日期时间字段，按日期方式展现显示控件，用户不用关心小时分钟
                 convertData = {
-                    type: "input-datetime-range",
-                    inputFormat: 'YYYY-MM-DD HH:mm',
+                    type: "input-date-range",
+                    inputFormat: "YYYY-MM-DD HH:mm",
                     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
                     tpl: readonly ? getDateTimeTpl(field) : null,
                     utc: true,
-                    joinValues: false
+                    joinValues: false,
+                    "shortcuts": [
+                        "thismonth",
+                        "2monthsago",
+                        "3monthslater",
+                        "prevquarter",
+                        "thisquarter",
+                        "thisyear",
+                        "lastYear"
+                      ]
                 };
                 break;
             case 'datetime':
@@ -27292,8 +27309,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 fieldNamePrefix = `${fieldNamePrefix}between__`;
             }
             if(_field.type === 'datetime'){
-                // 特意改为日期范围而不是日期时间范围，因为搜索时一般精确到日期就足够了，需要精确到日期时间范围需要在字段上配置amis属性来实现
-                _field.type = 'input-date-range';
+                // 这里如果想把搜索范围展示效果改为日期范围，不可以直接改为input-date-range，因为它们规则不一样，包括时区规则和小时分秒的存值规则都不一样
+                // 所以想改为展示日期范围效果，只能改input-datetime-range类型本身的属性来实现
+                _field.type = 'input-datetime-range';
                 _field.is_wide = true;
                 fieldNamePrefix = `${fieldNamePrefix}between__`;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.2-beta.17",
+  "version": "3.6.2-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": "3.6.2-beta.17"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.18"
   },
-  "gitHead": "0fa4e3d9e8edcf048e3d360894dbee2912e2375e"
+  "gitHead": "1c5e22cc85a08b46fbc5c74a8670253ac1f2e36f"
 }