@steedos-widgets/sortable 1.3.21 → 1.3.22-beta.2

package/dist/sortable.umd.js

@@ -21406,21 +21406,21 @@
                         break;
                     case "avatar":
                     case "image":
-                    quickEditSchema.body[0].receiver.adaptor = `
-                    const { context } = api.body; 
-                    var rootUrl = context.rootUrl + "/api/files/${field.type}s/";
-                    payload = {
-                        status: response.status == 200 ? 0 : response.status,
-                        msg: response.statusText,
-                        data: {
-                            value: rootUrl + payload._id,//为了实现图片crud的回显，需要将value从id改为url，当保存数据数据时，再在发送适配器内重新将id提取出来
-                            name: payload.original.name,
-                            url: rootUrl + payload._id,
+                        quickEditSchema.body[0].receiver.adaptor = `
+                        const { context } = api.body; 
+                        var rootUrl = context.rootUrl + "/api/files/${field.type}s/";
+                        payload = {
+                            status: response.status == 200 ? 0 : response.status,
+                            msg: response.statusText,
+                            data: {
+                                value: rootUrl + payload._id,//为了实现图片crud的回显，需要将value从id改为url，当保存数据数据时，再在发送适配器内重新将id提取出来
+                                name: payload.original.name,
+                                url: rootUrl + payload._id,
+                            }
                         }
-                    }
-                    return payload;
-                `;
-                    break;
+                        return payload;
+                    `;
+                        break;
                 }
                 quickEditSchema.body[0].visibleOn = "${quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}";
                 quickEditSchema.body.push({
@@ -21627,6 +21627,11 @@
             if(field.type == "location"){
                 quickEditSchema = false;
             }
+            if(field.type == "color"){
+                quickEditSchema = {
+                    type: "input-color"
+                };
+            }
         }
         return quickEditSchema;
     }
@@ -24477,7 +24482,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             {
               "type": "pagination",
               "maxButtons": 5,
-              "showPageInput": false
+              "showPageInput": true,
+              "layout": "total,pager,go"
             }
           ]
         }
@@ -26237,6 +26243,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';
@@ -26342,6 +26361,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 };
                 if(readonly){
                     convertData.defaultColor = null;
+                }else {
+                    convertData.pipeIn = (value, data) => {
+                        if(value && value.indexOf('#')<0){
+                            return '#'+value;
+                        }
+                        return value;
+                    };
                 }
                 break;
             case 'boolean':
@@ -26358,7 +26384,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':
@@ -26769,6 +26804,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}`;
@@ -26885,7 +26922,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.21",
+  "version": "1.3.22-beta.2",
   "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.21"
+    "@steedos-widgets/amis-lib": "1.3.22-beta.2"
   },
-  "gitHead": "b164c8836cba8d65074a9e34329739141b604240"
+  "gitHead": "ca840e37f61643b982feb7af5220a942d7dbec97"
 }