@steedos-widgets/amis-lib 1.3.0-beta.2 → 1.3.0-beta.4

package/dist/index.cjs.js

@@ -814,7 +814,7 @@ function getScriptForRemoveUrlPrefixForImgFields(fields){
                 if(imgFields[item].multiple){
                     if(imgFieldValue instanceof Array){
                         formData[item] = imgFieldValue.map((value)=>{ 
-                            let itemValue = value?.split('/');
+                            let itemValue = value && value.split('/');
                             return itemValue[itemValue.length - 1];
                         });
                     }
@@ -2285,7 +2285,7 @@ const getSchema$2 = (uiSchema) => {
                                     "Bearer ${context.tenantId},${context.authToken}",
                                 },
                                 requestAdaptor:
-                                  "\n        const selfData = JSON.parse(JSON.stringify(api.data.$self));\n        var filters = [];\n        var pageSize = api.data.pageSize || 10;\n        var pageNo = api.data.pageNo || 1;\n        var skip = (pageNo - 1) * pageSize;\n        var orderBy = api.data.orderBy || '';\n        var orderDir = api.data.orderDir || '';\n        var sort = orderBy + ' ' + orderDir;\n        var allowSearchFields = [\"description\"];\n        if(api.data.$term){\n            filters = [[\"name\", \"contains\", \"'+ api.data.$term +'\"]];\n        }else if(selfData.op === 'loadOptions' && selfData.value){\n            if(selfData.value?.indexOf(',') > 0){\n                filters = [[\"_id\", \"=\", selfData.value.split(',')]];\n            }else{\n                filters = [[\"_id\", \"=\", selfData.value]];\n            }\n        }\n        if(allowSearchFields){\n            allowSearchFields.forEach(function(key){\n                const keyValue = selfData[key];\n                if(keyValue){\n                    filters.push([key, \"contains\", keyValue]);\n                }\n            })\n        }\n\n        const filtersFunction = function(filters, values){return ['object_name', '=', values.object_name]};\n\n        if(filtersFunction){\n            const _filters = filtersFunction(filters, api.data.$self.__super.__super);\n            if(_filters && _filters.length > 0){\n                filters.push(_filters);\n            }\n        }\n\n        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());\n        return api;\n    ",
+                                  "\n        const selfData = JSON.parse(JSON.stringify(api.data.$self));\n        var filters = [];\n        var pageSize = api.data.pageSize || 10;\n        var pageNo = api.data.pageNo || 1;\n        var skip = (pageNo - 1) * pageSize;\n        var orderBy = api.data.orderBy || '';\n        var orderDir = api.data.orderDir || '';\n        var sort = orderBy + ' ' + orderDir;\n        var allowSearchFields = [\"description\"];\n        if(api.data.$term){\n            filters = [[\"name\", \"contains\", \"'+ api.data.$term +'\"]];\n        }else if(selfData.op === 'loadOptions' && selfData.value){\n            if(selfData.value && selfData.value.indexOf(',') > 0){\n                filters = [[\"_id\", \"=\", selfData.value.split(',')]];\n            }else{\n                filters = [[\"_id\", \"=\", selfData.value]];\n            }\n        }\n        if(allowSearchFields){\n            allowSearchFields.forEach(function(key){\n                const keyValue = selfData[key];\n                if(keyValue){\n                    filters.push([key, \"contains\", keyValue]);\n                }\n            })\n        }\n\n        const filtersFunction = function(filters, values){return ['object_name', '=', values.object_name]};\n\n        if(filtersFunction){\n            const _filters = filtersFunction(filters, api.data.$self.__super.__super);\n            if(_filters && _filters.length > 0){\n                filters.push(_filters);\n            }\n        }\n\n        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());\n        return api;\n    ",
                                 adaptor:
                                   "\n    const enable_tree = undefined;\n    if(enable_tree){\n        const records = payload.data.rows;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds)=>{\n            if(!childrenIds){\n                return;\n            }\n            const children = _.filter(records, (record)=>{\n                return _.includes(childrenIds, record._id)\n            });\n            _.each(children, (item)=>{\n                if(item.children){\n                    item.children = getChildren(records, item.children)\n                }\n            })\n            return children;\n        }\n\n        _.each(records, (record)=>{\n            if(!record.parent){\n                treeRecords.push(Object.assign({}, record, {children: getChildren(records, record.children)}));\n            }\n        });\n        payload.data.rows = treeRecords;\n    }\n    return payload;\n    ",
                               },
@@ -3667,7 +3667,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                       const selfData = api.body.$self;
                                       const uiSchema = selfData.uiSchema;
                                       const fields = uiSchema.fields;
-                                      const options = (payload.data?.options || []).filter(function(item){
+                                      const options = ((payload.data && payload.data.options) || []).filter(function(item){
                                         let field = fields[item.value];
                                         // TODO: 暂时禁用location类型字段的列表搜索
                                         return !!field && window.isFieldTypeSearchable(field.type) && field.type !== 'location'
@@ -4946,10 +4946,10 @@ function apiRequestAdaptor$1(){
     const recordId_tmp = api.body.recordId;
     
     if (typeof formData_tmp.columns == 'string') {
-      formData_tmp.columns = formData_tmp.columns?.split(',');
+      formData_tmp.columns = formData_tmp.columns && formData_tmp.columns.split(',');
     }
     if (typeof formData_tmp.mobile_columns == 'string') {
-      formData_tmp.mobile_columns = formData_tmp.mobile_columns?.split(',');
+      formData_tmp.mobile_columns = formData_tmp.mobile_columns && formData_tmp.mobile_columns.split(',');
     }
     
     // 数据格式转换
@@ -5082,7 +5082,7 @@ function apiRequestAdaptor(){
     const recordId = api.body.recordId;
     //数据格式转换
     if (typeof formData.sort == 'string') {
-      formData.sort = formData.sort?.split(',');
+      formData.sort = formData.sort && formData.sort.split(',');
     }
     formData.sort = lodash.map(formData.sort, (item) => {
       const arr = item.split(':');
@@ -5272,7 +5272,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
 function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
   const searchableFieldsLabel = [];
-  _.each(fields, function (field) {
+  _.each(mainObject.fields, function (field) {
     if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
       searchableFieldsLabel.push(field.label);
     }
@@ -5464,8 +5464,14 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
   if (formFactor === 'SMALL') {
+    // return [
+    //   "load-more",
+    // ]
     return [
-      "load-more",
+      {
+        "type": "pagination",
+        "maxButtons": 5
+      }
     ]
   }
   else {
@@ -5864,13 +5870,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
             })){
                 i++;
                 tableFields.push(field);
-                if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
-                    searchableFields.push(field.name);
-                }
             }
         }
     });
 
+    ___namespace.each(refObjectConfig.fields, function (field) {
+      if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
+          searchableFields.push(field.name);
+      }
+    });
+
     const fields = {
         [referenceTo.labelField.name]: referenceTo.labelField,
         [referenceTo.valueField.name]: referenceTo.valueField
@@ -5922,7 +5931,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(api.data.$term){
             filters = [["name", "contains", "'+ api.data.$term +'"]];
         }else if(selfData.op === 'loadOptions' && selfData.value){
-            if(selfData.value?.indexOf(',') > 0){
+            if(selfData.value && selfData.value.indexOf(',') > 0){
                 fieldValue = selfData.value.split(',');
                 filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }else{
@@ -6117,7 +6126,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
               {
                 "actionType": "custom",
                 "script": `
-                    const masterRecord = event.data._master?.record;
+                    const masterRecord = event.data._master && event.data._master.record;
                     const fieldConfig = ${JSON.stringify(field)};
                     let reference_to = fieldConfig.reference_to;
                     let saveValue;
@@ -6500,7 +6509,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
         if(selfData.op === 'loadOptions' && selfData.value){
-            if(selfData.value?.indexOf(',') > 0){
+            if(selfData.value && selfData.value.indexOf(',') > 0){
                 filters = [["${referenceTo.valueField.name}", "=", selfData.value.split(',')]];
             }else{
                 filters = [["${referenceTo.valueField.name}", "=", selfData.value]];
@@ -7739,7 +7748,7 @@ async function getQuickEditSchema(field, options){
                 case "number":
                 case "currency":
                     TempDisplayField = `
-                            _display["${field.name}"] = event.data.value?.toFixed(${field.scale});
+                            _display["${field.name}"] = event.data.value && event.data.value.toFixed(${field.scale});
                         `;
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
 
@@ -7927,13 +7936,15 @@ async function getTableColumns(fields, options){
                                 }
                             },
                             "actionType": "download",
-                            "expression": "!!!window?.nw?.require"//浏览器上直接下载
+                            // "expression": "!!!window?.nw?.require"//浏览器上直接下载
+                            "expression": "!!!(window && window.nw && window.nw.require)"//浏览器上直接下载
                         },
                         {
                           "args": {},
                           "actionType": "custom",
                           "script": previewFileScript,
-                          "expression": "!!window?.nw?.require" //PC客户端预览附件
+                        //   "expression": "!!window?.nw?.require" //PC客户端预览附件
+                          "expression": "!!!(window && window.nw && window.nw.require)"//PC客户端预览附件
                         }
                     ]
                   }
@@ -8075,7 +8086,7 @@ function getMobileLines(tpls){
             lineChildrenClassName = "steedos-listview-item-left two-lines-truncate";
             if(item.field.is_wide){
                 // 左侧全行样式可以单独写
-                lineChildrenClassName = "steedos-listview-item-wide truncate";
+                lineChildrenClassName = "steedos-listview-item-wide two-lines-truncate";
             }
             if(lines.length === 0){
                 // 第一个字段加粗黑色显示
@@ -8388,7 +8399,7 @@ async function getTableApi(mainObject, fields, options){
         baseFilters = filter;
     }
 
-    ___namespace.each(fields, function (field) {
+    ___namespace.each(mainObject.fields, function (field) {
         if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
             searchableFields.push(field.name);
         }
@@ -8449,8 +8460,9 @@ async function getTableApi(mainObject, fields, options){
                     // 所以会把localSearchableFilter中已经存过的页码覆盖
                     // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                     let formFactor = "${options.formFactor}";
-                    // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                    api.data.pageNo = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                    // api.data.pageNo = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                    // 移动端暂时去除加载更多，放开翻页
+                    api.data.pageNo = localListViewProps.page || 1;
                 }
             }
         }
@@ -8650,7 +8662,8 @@ async function getTableApi(mainObject, fields, options){
                 // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                 let formFactor = "${options.formFactor}";
                 // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                // selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                selfData.page = localListViewProps.page || 1;
             }
         }
         delete selfData.context;
@@ -8668,7 +8681,13 @@ async function getTableApi(mainObject, fields, options){
     const setDataToComponentId = "${setDataToComponentId}";
     if(setDataToComponentId){
         //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
-        SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
+        var scope = SteedosUI.getRef(api.body.$self.$scopeId);
+        var scopeParent = scope && scope.parent;
+        var setDataToComponent = scopeParent && scopeParent.getComponentById(setDataToComponentId);
+        if(setDataToComponent){
+            setDataToComponent.setData({$count: payload.data.count});
+        }
+        // SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
     ${options.adaptor || ''}
     return payload;
@@ -8954,7 +8973,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
                 var uiSchema = api.body.uiSchema;
                 var defaultData = api.body.defaultData;
                 var defaultValues = {};
-                _.each(uiSchema?.fields, function(field){
+                _.each(uiSchema && uiSchema.fields, function(field){
                     var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
                     if(value){
                         defaultValues[field.name] = value;
@@ -9173,7 +9192,12 @@ async function getCalendarApi(mainObject, fields, options) {
     window.postMessage(Object.assign({type: "listview.loaded"}), "*");
     const setDataToComponentId = "${setDataToComponentId}";
     if(setDataToComponentId){
-        SteedosUI.getRef(api.body.$self.scopeId)?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
+        var scope = SteedosUI.getRef(api.body.$self.scopeId);
+        var setDataToComponent = scope && scope.getComponentById(setDataToComponentId);
+        if(setDataToComponent){
+          setDataToComponent.setData({$count: payload.data.count});
+        }
+        // SteedosUI.getRef(api.body.$self.scopeId)?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     }
     const rows = payload.data.rows || [];
     const selfData = api.data.$self;
@@ -12281,7 +12305,7 @@ const getNextStepUsersInput = async (instance) => {
     id: "u:ffff15b76c89",
     className: "b-a b-1x p-xs m-b-none m-l-none m-r-none m-t-sm",
     subFormMode: "",
-    hiddenOn: "!!!this.new_next_step || this.new_next_step?.step_type === 'end'"
+    hiddenOn: "!!!this.new_next_step || (this.new_next_step && this.new_next_step.step_type === 'end')"
   };
 };
 
@@ -13201,7 +13225,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
       map[item.value] = item.label;
     });
     tpl.type = 'static';
-    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return options?.[data.${field.code}] || ''%>`;
+    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data.${field.code}]) || ''%>`;
   }else if(field.type === 'odata'){
     tpl.type = 'static';
     tpl.tpl = `<div>\${${field.code}['@label']}</div>`;
@@ -13231,7 +13255,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
     if(field.is_multiselect){
       tpl.tpl = `\${_.map(${field.code}, 'name')}`;
     }else {
-      tpl.tpl = `\${${field.code}?.name}`;
+      tpl.tpl = `\${${field.code} && ${field.code}.name}`;
     }
   }else if(field.type === 'group'){
     tpl.type = 'static';