@steedos-widgets/sortable 1.3.14 → 1.3.16

package/dist/sortable.umd.js

@@ -21247,6 +21247,17 @@
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
       const onCancelScript = `
+    doAction(
+      {
+        "componentId": 'service_${ctx.crudId}',
+        "actionType": "setValue",
+        "args": {
+          "value": {
+            "__filterFormValues": null
+          }
+        }
+      }
+    )
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
@@ -21281,7 +21292,9 @@
       removedValues[keywordsSearchBoxName] = filterFormValues[keywordsSearchBoxName];
     }
     filterForm.reset();
-    listView.handleFilterSubmit(removedValues);
+    setTimeout(()=>{
+      listView.handleFilterSubmit(removedValues);
+    }, 100); 
     const filterService = filterForm.context.getComponents().find(function(n){
       return n.props.type === "service";
     });
@@ -22697,7 +22710,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 // }
 `;
 
-    function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
+    function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords", crudId } = {}){
       const searchableFieldsLabel = [];
       _.each(mainObject.fields, function (field) {
         if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
@@ -22734,23 +22747,22 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "clearAndSubmit": true,
             "searchImediately": false,
             "onEvent": {
-              "blur": {
+              "change": {
                 "actions": [
                   {
                     "actionType": "custom",
                     "script": `
-                    try {
-                        const scope = event.context.scoped;
-                        const filterCrud = scope.parent.getComponents().find(function(n) {
-                            return n.props.type === "crud";
-                        });
-                        if (filterCrud && typeof filterCrud.reload === 'function') {
-                            const keyWords = { '${keywordsSearchBoxName}': event.data.value };
-                            filterCrud.reload(null, keyWords);
+                  doAction(
+                      {
+                        "componentId": 'service_${crudId}',
+                        "actionType": "setValue",
+                        "args": {
+                          "value": {
+                            "__serachBoxValues": event.data
+                          }
                         }
-                    } catch (error) {
-                        console.error('An error occurred:', error);
-                    }
+                      }
+                  )
                 `
                   }
                 ]
@@ -22762,7 +22774,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     function getObjectHeaderToolbar(mainObject, fields, formFactor, { 
-      showDisplayAs = false, hiddenCount = false, headerToolbarItems, 
+      showDisplayAs = false, hiddenCount = false, headerToolbarItems, crudId,
       filterVisible = true, isLookup = false, keywordsSearchBoxName } = {}){
       // console.log(`getObjectHeaderToolbar====>`, filterVisible)
       // console.log(`getObjectHeaderToolbar`, mainObject)
@@ -22866,7 +22878,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         };
       }
       let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
-      let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
+      let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName, crudId });
 
       // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
       // 当出现空的.antd-Crud-toolbar-item dom时会影响toolbar元素的maring-right css样式计算，如果有动态需要应该加到动态数组变量toolbars中
@@ -23032,6 +23044,26 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 "script": onSubmitSuccScript
               }
             ]
+          },
+          "change": {
+            "actions": [
+              {
+                "actionType": "custom",
+                "script": `
+              doAction(
+                  {
+                    "componentId": 'service_${options.crudId}',
+                    "actionType": "setValue",
+                    "args": {
+                      "value": {
+                        "__filterFormValues": event.data
+                      }
+                    }
+                  }
+              )
+            `
+              }
+            ]
           }
         }
       }
@@ -23235,19 +23267,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     const keywordsSearchBoxName = `__keywords_lookup`;
 
-    const getReferenceTo = async (field)=>{
+    const getReferenceToFieldSchema = (field, refObjectConfig)=>{
         let referenceTo = field.reference_to;
         if(!referenceTo){
-            return ;
-        }
-
-        if(referenceTo === 'users'){
-            referenceTo = 'space_users';
-            field.reference_to_field = 'user';
+            return;
         }
 
-        const refObjectConfig = await getUISchema(referenceTo);
-
         // 如果lookup 引用的对象未定义
         if (!refObjectConfig)
             return null;
@@ -23270,6 +23295,28 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
     };
 
+    const getReferenceTo = async (field)=>{
+        let referenceTo = field.reference_to;
+        if(referenceTo === 'users'){
+            field.reference_to = 'space_users';
+            field.reference_to_field = 'user';
+        }
+
+        const refObjectConfig = await getUISchema(field.reference_to);
+        return getReferenceToFieldSchema(field, refObjectConfig);
+    };
+
+    function getReferenceToSync(field) {
+        let referenceTo = field.reference_to;
+        if(referenceTo === 'users'){
+            field.reference_to = 'space_users';
+            field.reference_to_field = 'user';
+        }
+
+        const refObjectConfig = getUISchemaSync(field.reference_to);
+        return getReferenceToFieldSchema(field, refObjectConfig);
+    }
+
     function getLookupSapceUserTreeSchema(isMobile){
         const treeSchema = {
             "type": "input-tree",
@@ -23863,7 +23910,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // [["_id", "=", "$${field.name}._id"],"or",["name", "contains", "$term"]]
         apiInfo.requestAdaptor = `
         var filters = [];
-        var top = 10;
+        var top = 200;
         if(api.data.$term){
             filters = [["${referenceTo?.NAME_FIELD_KEY || 'name'}", "contains", api.data.$term]];
         }
@@ -24169,6 +24216,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return data;
     }
 
+
+    if(typeof window != 'undefined'){
+        window.getReferenceTo = getReferenceTo;
+        window.getReferenceToSync = getReferenceToSync;
+    }
+
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2023-01-13 17:27:54
@@ -24346,8 +24399,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
-     * @LastEditors: 孙浩林 sunhaolin@steedos.com
-     * @LastEditTime: 2023-11-24 13:45:24
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2023-10-30 17:51:54
      * @Description: 
      */
 
@@ -24384,7 +24437,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
                     <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
                     <% fileData.forEach(function(item) { %> 
-                        <a href='<%= item.url+"?download=1" %>' target='_self' class='block'><%= item.name %></a> 
+                        <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
                 <% });} %>`
             }
         }
@@ -24958,6 +25011,29 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                 }
                 break;
+            case 'table':
+                if(field.subFields){
+                    convertData = {
+                        type: 'steedos-input-table',
+                        showIndex: true,
+                        editable: !readonly,
+                        addable: !readonly,
+                        removable: !readonly,
+                        draggable: !readonly,
+                        fields: [],
+                        amis:{
+                            columnsTogglable: false
+                        }
+                    };
+                    for (const subField of field.subFields) {
+                        const subFieldName = subField.name.replace(`${field._prefix || ''}${field.name}.$.`, '').replace(`${field.name}.`, '');
+                        const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
+                        if(gridSub){
+                            convertData.fields.push(Object.assign({}, subField, {name: subFieldName}));
+                        }
+                    }
+                }
+                break;
             case 'object':
                 if(field.subFields){
                     convertData = {
@@ -25029,7 +25105,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 return  convertData
             }
             // if(ctx.mode === 'edit'){
-            return Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+            let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+            // console.log("convertDataResult:", convertDataResult);
+            return convertDataResult;
             // }else{
             //     return Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name});
             // }
@@ -25121,38 +25199,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){
-                const changeActionsFields = ['select', 'boolean', 'toggle', 'date', 'datetime', 'time', 'number', 'currency', 'lookup', 'master_detail'];
-                const isChangeActions = changeActionsFields.indexOf(field.type) > -1;
-                let additionalProps = {
+                return Object.assign({}, amisField,{
                     submitOnChange: false
-                };
-                if (isChangeActions) {
-                    additionalProps.submitOnChange = true;
-                } else {
-                    additionalProps.onEvent = {
-                        blur: {
-                            actions: [
-                                {
-                                    actionType: "custom",
-                                    script: `
-                                    try {
-                                        const scope = event.context.scoped;
-                                        const filterForm = scope.parent.parent.parent.getComponents().find(function(n) {
-                                            return n.props.type === "form";
-                                        });
-                                        if (filterForm && typeof filterForm.handleFormSubmit === 'function') {
-                                            filterForm.handleFormSubmit(event);
-                                        }
-                                    } catch (error) {
-                                        console.error('An error occurred:', error);
-                                    }
-                                `
-                                }
-                            ]
-                        }
-                    };
-                }
-                return Object.assign({}, amisField, additionalProps);
+                });
             }
         }
     }
@@ -25401,7 +25450,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return getUISchemaCache(objectName);
     }
 
-    function getUISchemaSync(objectName, force) {
+    function getUISchemaSync$1(objectName, force) {
         if (!objectName) {
             return;
         }
@@ -25585,7 +25634,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     if(typeof window != 'undefined'){
         window.getUISchema = getUISchema;
-        window.getUISchemaSync = getUISchemaSync;
+        window.getUISchemaSync = getUISchemaSync$1;
         window.getListSchema = getListSchema;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "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.14"
+    "@steedos-widgets/amis-lib": "1.3.16"
   },
-  "gitHead": "dc2ef13db1c9e63ff77eb708f920b266e77d2756"
+  "gitHead": "9dcffb0762807385032d09f79c0cf2bb45e21edf"
 }