@steedos-widgets/sortable 1.3.15 → 1.3.16

package/dist/assets.json

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

package/dist/sortable.cjs.js

@@ -54946,6 +54946,17 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     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";
@@ -54980,7 +54991,9 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       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";
     });
@@ -56396,7 +56409,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)) {
@@ -56433,23 +56446,22 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "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);
-                    }
+                      }
+                  )
                 `
               }
             ]
@@ -56461,7 +56473,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
 }
 
 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)
@@ -56565,7 +56577,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     };
   }
   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中
@@ -56731,6 +56743,26 @@ async function getObjectFilter(objectSchema, fields, options) {
             "script": onSubmitSuccScript
           }
         ]
+      },
+      "change": {
+        "actions": [
+          {
+            "actionType": "custom",
+            "script": `
+              doAction(
+                  {
+                    "componentId": 'service_${options.crudId}',
+                    "actionType": "setValue",
+                    "args": {
+                      "value": {
+                        "__filterFormValues": event.data
+                      }
+                    }
+                  }
+              )
+            `
+          }
+        ]
       }
     }
   }
@@ -56934,19 +56966,12 @@ async function lookupToAmisTreeSelect(field, readonly, ctx) {
 
 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;
@@ -56969,6 +56994,28 @@ const getReferenceTo = async (field)=>{
     }
 };
 
+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",
@@ -57562,7 +57609,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
     // [["_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]];
         }
@@ -57868,6 +57915,12 @@ async function getIdsPickerSchema(field, readonly, ctx){
     return data;
 }
 
+
+if(typeof window != 'undefined'){
+    window.getReferenceTo = getReferenceTo;
+    window.getReferenceToSync = getReferenceToSync;
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
@@ -58657,6 +58710,29 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 }
             }
             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 = {
@@ -58728,7 +58804,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             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});
         // }
@@ -58820,38 +58898,9 @@ async function getFieldSearchable(perField, permissionFields, ctx){
 
         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);
+            });
         }
     }
 }
@@ -59100,7 +59149,7 @@ async function getUISchema(objectName, force) {
     return getUISchemaCache(objectName);
 }
 
-function getUISchemaSync(objectName, force) {
+function getUISchemaSync$1(objectName, force) {
     if (!objectName) {
         return;
     }
@@ -59284,7 +59333,7 @@ async function getListSchema(
 
 if(typeof window != 'undefined'){
     window.getUISchema = getUISchema;
-    window.getUISchemaSync = getUISchemaSync;
+    window.getUISchemaSync = getUISchemaSync$1;
     window.getListSchema = getListSchema;
 }