@steedos-widgets/sortable 1.3.17-beta.2 → 1.3.17

package/dist/sortable.umd.js

@@ -22639,6 +22639,7 @@
       const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
       const keywordsSearchBoxName = ctx.keywordsSearchBoxName || "__keywords";
       const onSearchScript = `
+    // console.log("===onSearchScript=form==");
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
@@ -22695,25 +22696,13 @@
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
       const onCancelScript = `
-    doAction(
-      {
-        "componentId": 'service_${ctx.crudId}',
-        "actionType": "setValue",
-        "args": {
-          "value": {
-            "__filterFormValues": null
-          }
-        }
-      }
-    )
+    // console.log("===onCancelScript=form==");
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
     var filterFormValues = filterForm.getValues();
-    var listView = scope.parent.parent.parent.getComponents().find(function(n){
-      return n.props.type === "crud";
-    });
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     const removedValues = {};
     for(var k in filterFormValues){
       if(/^__searchable__/.test(k)){
@@ -22728,7 +22717,7 @@
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          if(k !== "__keywords"){
+          if(/^__searchable__/.test(k)){
             removedValues[k] = null;
           }
         }
@@ -22739,20 +22728,35 @@
       //lookup字段保留快速搜索条件
       removedValues[keywordsSearchBoxName] = filterFormValues[keywordsSearchBoxName];
     }
-    filterForm.reset();
-    setTimeout(()=>{
-      listView.handleFilterSubmit(removedValues);
-    }, 100); 
-    const filterService = filterForm.context.getComponents().find(function(n){
-      return n.props.type === "service";
-    });
-    filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+    filterForm.setValues(removedValues);//会把表单提交到toolbar的快速搜索区域，造成在快速搜索框中触发搜索时再次把搜索表单中的字段值清除掉的bug，已单独在快速搜索框那边添加搜索事件代码处理过了
+    // 以下方法都无法实现清除表单值
+    // filterForm.setValues({}, true)
+    // filterForm.reset();
+    // filterForm.handleAction({},{
+    //   "actionType": "setValue",
+    //   "args": {
+    //     "value": removedValues
+    //   }
+    // });
+    // 下面触发clear动作可以清除表单值，且不会把表单提交到toolbar的快速搜索区域，但是会把金额等范围字段清空成非范围字段
+    // filterForm.handleAction({},{
+    //   "actionType": "clear"
+    // });
+
+    // 清除__changedFilterFormValues中的值
+    crud && crud.setData({__changedFilterFormValues: {}});
+    filterForm.handleFormSubmit(event);
+    // crud.handleFilterSubmit(removedValues);
+
+    let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
+    filterFormService.setData({showFieldsFilter: !!!filterFormService.props.data.showFieldsFilter});
     //触发amis crud 高度重算
     setTimeout(()=>{
       window.dispatchEvent(new Event("resize"))
     }, 100);
     // 移除搜索按钮上的红点
-    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    // let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
     crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
       const dataProviderInited = `
@@ -24158,7 +24162,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 // }
 `;
 
-    function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords", crudId } = {}){
+    // function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords", crudId } = {}){
+    function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
       const searchableFieldsLabel = [];
       _.each(mainObject.fields, function (field) {
         if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
@@ -24174,6 +24179,33 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         crudKeywords = (localListViewProps && localListViewProps.__keywords) || "";
       }
 
+      const onChangeScript = `
+    const scope = event.context.scoped;
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let __changedSearchBoxValues = {};
+    __changedSearchBoxValues["${keywordsSearchBoxName}"] = event.data["${keywordsSearchBoxName}"];
+    // crudService && crudService.setData({__changedSearchBoxValues: __changedSearchBoxValues});
+    // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
+    crud && crud.setData({__changedSearchBoxValues: __changedSearchBoxValues});
+  `;
+
+      // onSearchScript中加上了onChangeScript中的脚本，是因为amis 3.2不能用change事件执行onChangeScript
+      // 而点击回车按键又不会触发blur事件，所以只能每次回车事件中额外再执行一次onChangeScript
+      // 等升级到amis 3.4+，blur事件换成change事件执行onChangeScript，就可以不用在onSearchScript中执行onChangeScript了
+      const onSearchScript = `
+    ${onChangeScript}
+
+    // 下面的脚本只为解决点击搜索表单取消按钮，再重新在其中输入过滤条件但是不点击搜索按钮或回车按键触发搜索，此时在快速搜索框输入过滤条件按回车按键会把搜索表单中的过滤条件清空的问题
+    // const scope = event.context.scoped;
+    // 如果点击过顶部搜索栏表单的取消按钮，会把此处event.data.__super.__super.__super中的搜索表单项的所有字段设置为null
+    // 点击取消按钮后继续在表单项中输入过滤条件且最后没有点击回车按键或点击表单项搜索按钮的话，在快速搜索中点击回车按钮提交搜索会所顶部搜索表单中的字段值清空
+    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
+    setTimeout(function(){
+      filterForm.setValues(event.data.__changedFilterFormValues);
+    }, 500);
+  `;
+
       return {
         "type": "tooltip-wrapper",
         "id": "steedos_crud_toolbar_quick_search",
@@ -24192,28 +24224,24 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "placeholder": "搜索此列表",
             "value": crudKeywords,
             "clearable": true,
-            "clearAndSubmit": true,
+            // "clearAndSubmit": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
             "searchImediately": false,
             "onEvent": {
-              "change": {
+              "search": {
                 "actions": [
                   {
                     "actionType": "custom",
-                    "script": `
-                  doAction(
-                      {
-                        "componentId": 'service_${crudId}',
-                        "actionType": "setValue",
-                        "args": {
-                          "value": {
-                            "__serachBoxValues": event.data
-                          }
-                        }
-                      }
-                  )
-                `
+                    "script": onSearchScript
                   }
                 ]
+              },
+              "blur": { //这里把change事件换成blur是因为amis 3.2change事件中setData会卡，升级到3.4+后就可以换回change事件
+                "actions": [
+                  {
+                    "actionType": "custom",
+                    "script": onChangeScript
+                  },
+                ]
               }
             }
           }
@@ -24222,7 +24250,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     function getObjectHeaderToolbar(mainObject, fields, formFactor, { 
-      showDisplayAs = false, hiddenCount = false, headerToolbarItems, crudId,
+      showDisplayAs = false, hiddenCount = false, headerToolbarItems,
       filterVisible = true, isLookup = false, keywordsSearchBoxName } = {}){
       // console.log(`getObjectHeaderToolbar====>`, filterVisible)
       // console.log(`getObjectHeaderToolbar`, mainObject)
@@ -24326,7 +24354,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         };
       }
       let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
-      let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName, crudId });
+      let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
 
       // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
       // 当出现空的.antd-Crud-toolbar-item dom时会影响toolbar元素的maring-right css样式计算，如果有动态需要应该加到动态数组变量toolbars中
@@ -24473,6 +24501,20 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
     crudService && crudService.setData({isFieldsFilterEmpty});
+  `;
+      let onChangeScript = `
+    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 crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});;
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    // crudService && crudService.setData({__changedFilterFormValues: changedFilterFormValues});
+    // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
+    crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
   `;
       return {
         "title": "",
@@ -24497,19 +24539,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "actions": [
               {
                 "actionType": "custom",
-                "script": `
-              doAction(
-                  {
-                    "componentId": 'service_${options.crudId}',
-                    "actionType": "setValue",
-                    "args": {
-                      "value": {
-                        "__filterFormValues": event.data
-                      }
-                    }
-                  }
-              )
-            `
+                "script": onChangeScript
               }
             ]
           }
@@ -25298,6 +25328,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         source.data.$self = "$$";
         
         source.requestAdaptor = `
+        let __changedFilterFormValues = api.data.$self.__changedFilterFormValues || {};
+        let __changedSearchBoxValues = api.data.$self.__changedSearchBoxValues || {};
+        // 把表单搜索和快速搜索中的change事件中记录的过滤条件也拼到$self中，是为解决触发搜索请求时，两边输入的过滤条件都带上，即：
+        // 有时在搜索表单中输入过滤条件事，忘记点击回车键或搜索按钮，而是进一步修改快速搜索框中的关键字点击其中回车键触发搜索
+        // 这种情况下，触发的搜索请求中没有带上搜索表单中输入的过滤条件。
+        // 反过来先在快速搜索框中输入过滤条件却不点击其中回车键触发搜索，而是到搜索表单中触发搜索请求也是一样的。
+        Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
         var filters = [];
         var pageSize = api.data.pageSize || 10;
@@ -26817,9 +26854,7 @@ 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 Object.assign({}, amisField,{
-                    submitOnChange: false
-                });
+                return amisField;
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.17-beta.2",
+  "version": "1.3.17",
   "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.17-beta.2"
+    "@steedos-widgets/amis-lib": "1.3.17"
   },
-  "gitHead": "1edf17c0b251e4dd4bb23383cc700b53498ea700"
+  "gitHead": "d5913f7f83ea078e461357d66193d77874ef0c06"
 }