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

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.1/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.1/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.3/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.3/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.1/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.3/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.1/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.1/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.3/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@1.3.22-beta.3/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -54969,6 +54969,7 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
+
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -55355,7 +55356,9 @@ async function getTableColumns(fields, options){
     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;
     
@@ -58181,7 +58184,8 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
         {
           "type": "pagination",
           "maxButtons": 5,
-          "showPageInput": false
+          "showPageInput": true,
+          "layout": "total,pager,go"
         }
       ]
     }
@@ -59941,6 +59945,19 @@ function getGridFieldSubFields(mainField, fields){
     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';
@@ -60069,7 +60086,16 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 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':
@@ -60480,6 +60506,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     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}`;
@@ -60596,7 +60624,8 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             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__`;
         }