@steedos-widgets/sortable 1.3.5 → 1.3.7

package/dist/sortable.umd.js

@@ -21454,7 +21454,7 @@
       showFieldsFilter = true;
     }
     filterService.setData({showFieldsFilter});
-    resizeWindow();
+    // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
     // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
     let filterFormValues = event.data;
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
@@ -22946,7 +22946,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "placeholder": "搜索此列表",
             "value": crudKeywords,
             "clearable": true,
-            "clearAndSubmit": true
+            "clearAndSubmit": true,
+            "searchImediately": true
           }
         ]
       }
@@ -23181,16 +23182,50 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     async function getObjectFilter(objectSchema, fields, options) {
       const fieldsFilterBarSchema = await getObjectListHeaderFieldsFilterBar(objectSchema, null, options);
+      let onSubmitSuccScript = `
+    let isLookup = event.data.isLookup;
+    if(isLookup){
+      return;
+    }
+    // 列表搜索栏字段值变更后立刻触发提交表单执行crud搜索，所以这里需要额外重算crud高度及筛选按钮红色星号图标显示隐藏
+    let resizeWindow = function(){
+      //触发amis crud 高度重算
+      setTimeout(()=>{
+        window.dispatchEvent(new Event("resize"))
+      }, 1000);
+    }
+    resizeWindow();
+    const scope = event.context.scoped;
+    // let filterFormValues = event.data;
+    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
+    let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
+    // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
+    let filterFormValues = filterFormService.getData()
+    let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    crudService && crudService.setData({isFieldsFilterEmpty});
+  `;
       return {
         "title": "",
         "submitText": "",
         "className": "",
-        // "debug": true,
+        "debug": false,
         "mode": "normal",
         "wrapWithPanel": false,
         "body": [
           fieldsFilterBarSchema
-        ]
+        ],
+        "onEvent": {
+          "submitSucc": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": onSubmitSuccScript
+              }
+            ]
+          }
+        }
       }
     }
 
@@ -25276,7 +25311,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
             const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
             if(amisField){
-                return amisField;
+                return Object.assign({}, amisField,{
+                    submitOnChange: true
+                });
             }
         }
     }
@@ -25338,7 +25375,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     async function getQuickEditSchema(field, options){
         //判断在amis3.2以上环境下，放开批量编辑
-        const isAmisVersionforBatchEdit = amisRequire('amis').version[0] >= 3 && amisRequire('amis').version[2] >= 2;
+        let isAmisVersionforBatchEdit = false;
+        if(window.amisRequire && window.amisRequire('amis')){
+            isAmisVersionforBatchEdit = window.amisRequire('amis').version[0] >= 3 && window.amisRequire('amis').version[2] >= 2;
+        }else if(window.Amis){
+            isAmisVersionforBatchEdit = window.Amis.version[0] >= 3 && window.Amis.version[2] >= 2;
+        }
         const quickEditId = options.objectName + "_" + field.name + "_quickEdit";//定义快速编辑的表单id，用于setvalue传值
         var quickEditSchema = { body: [], id: quickEditId };
         //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "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.5"
+    "@steedos-widgets/amis-lib": "1.3.7"
   },
-  "gitHead": "696396061c57decfde1f9d8f14c36fff7f4316b9"
+  "gitHead": "7468e201ef79de9e3c0b53489b7351620829ef65"
 }