@steedos-widgets/amis-lib 3.6.2-beta.15 → 3.6.2-beta.17

package/dist/index.esm.js

@@ -2128,7 +2128,7 @@ async function getTableColumns(fields, options){
                 var data = event.data;
                 var file_name = data.versions ? data.name : "${field.label}";
                 var file_id = data._id;
-                SteedosUI.previewFile && SteedosUI.previewFile({file_name, file_id});
+                window.previewFile && window.previewFile({file_name, file_id});
             `;
             columnItem = {
                 "type": "button",
@@ -2157,7 +2157,7 @@ async function getTableColumns(fields, options){
                           "actionType": "custom",
                           "script": previewFileScript,
                         //   "expression": "!!window?.nw?.require" //PC客户端预览附件
-                          "expression": "!!!(window && window.nw && window.nw.require)"//PC客户端预览附件
+                          "expression": "!!(window && window.nw && window.nw.require)"//PC客户端预览附件
                         }
                     ]
                   }
@@ -2940,6 +2940,18 @@ async function getTableApi(mainObject, fields, options){
         return api;
     `;
     api.adaptor = `
+    let fields = ${JSON.stringify(_$1.map(fields, 'name'))};
+    // 这里把行数据中所有为空的字段值配置为空字符串，是因为amis有bug：crud的columns中的列如果type为static-前缀的话，行数据中该字段为空的话会显示为父作用域中同名变量值，见：https://github.com/baidu/amis/issues/9556
+    (payload.data.rows || []).forEach((itemRow) => {
+        (fields || []).forEach((itemField) => {
+            if(itemField && (itemRow[itemField] === undefined || itemRow[itemField] === null)){
+                // 这里itemRow中不存在 itemField 属性，或者值为null时都会有“显示为父作用域中的同名变量值”的问题，所以null和undefined都要重置为空字符串
+                // 实测数字、下拉框、多选lookup等字段类型重置为空字符串都不会有问题，而且实测amis from组件的清空表单字段值功能就是把表单中的各种字段类型设置为空字符串，所以看起来也符合amis规范
+                itemRow[itemField] = "";
+            }
+        });
+    });
+    
     if(api.body.listName == "recent"){
         payload.data.rows = _.sortBy(payload.data.rows, function(item){
             return _.indexOf(api.body._ids, item._id)
@@ -5784,7 +5796,7 @@ async function getObjectFieldsFilterFormSchema(ctx) {
   const formSchema = {
     "type": "service",
     "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-4 p-2",
     "style":{
       "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
     },
@@ -6371,7 +6383,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
         "className": "slds-filters"
       },
       "size": "xs",
-      "className": `border-gray-300 border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
+      "className": `border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
       "visibleOn": "this.showFieldsFilter",
     },
     "className": "bg-white"
@@ -6559,7 +6571,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
             "icon": "fa fa-refresh",
             "actionType": "reload",
             "target": amisListViewId,
-            "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+            "className": "bg-white p-2 rounded text-gray-500"
           },
           fieldsFilterButtonSchema,
           // {
@@ -6567,7 +6579,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
           //   "label": "",
           //   "icon": "fa fa-filter",
           //   "actionType": "custom",
-          //   "className": "bg-transparent p-2 rounded border-gray-300 text-gray-500",
+          //   "className": "bg-transparent p-2 rounded text-gray-500",
           //   "id": "u:c20cb87d96c9",
           //   "onEvent": {
           //     "click": {
@@ -6615,7 +6627,7 @@ function getObjectListHeader$1(objectSchema, listViewName, ctx) {
   let headerSchema = [{
     "type": "wrapper",
     "body": body,
-    "className": `bg-gray-100 sm:rounded-tl sm:rounded-tr p-4 -mb-4`
+    "className": `sm:rounded-tl sm:rounded-tr p-4 -mb-4`
   }];
   return headerSchema;
 }
@@ -6750,7 +6762,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let body = [
     {
       "type": "wrapper",
-      "className": "p-4 bg-gray-100 border-b",
+      "className": "p-4 border-b",
       "body": [
         {
           "type": "grid",
@@ -7876,7 +7888,7 @@ const getSettingListviewToolbarButtonSchema = ()=>{
         "icon": "fa fa-cog",
         //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         // "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
-        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
         "align": "right",
         "visibleOn": "${!isLookup}",
         "buttons": [
@@ -7921,7 +7933,7 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "icon": "fa fa-table-columns",
     //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
     // "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
-    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
     "align": "right",
     "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
     "buttons": [ 
@@ -8114,7 +8126,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     //   //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
     //   // "tooltip": i18next.t('frontend_button_reload_tooltip'),
     //   "tooltipPlacement": "top",
-    //   "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+    //   "className": "bg-white p-2 rounded text-gray-500",
     //   "label": "",
     //   "icon": "fa fa-sync",
     //   "visibleOn": "${!showFieldsFilter}",
@@ -8138,7 +8150,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       // "tooltip": i18next.t('frontend_button_reload_tooltip'),
       "tooltip":"",
       "tooltipPlacement": "top",
-      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+      "className": "bg-white p-2 rounded text-gray-500"
     };
   }
   else {
@@ -8149,7 +8161,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       // "tooltip": i18next.t('frontend_button_reload_tooltip'),
       "tooltip":"",
       "tooltipPlacement": "top",
-      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+      "className": "bg-white p-2 rounded text-gray-500"
     };
   }
   let toolbarFilter;
@@ -8171,7 +8183,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
       },
       "align": "right",
-      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+      "className": "bg-white p-2 rounded text-gray-500",
       "onEvent": {
         "click": {
           "actions": [
@@ -8498,7 +8510,7 @@ async function getObjectCRUD(objectSchema, fields, options){
     const bodyProps = {
       // toolbar: getToolbar(),
       // headerToolbar: getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs}),
-      headerToolbarClassName: "px-4 py-2 border-gray-300 bg-gray-100 border-solid border-b",
+      headerToolbarClassName: "px-4 py-2 border-b",
       footerToolbar: getObjectFooterToolbar(objectSchema, options.formFactor, {
         ...options,
         disableStatistics: options.queryCount === false
@@ -8667,7 +8679,6 @@ async function getObjectCRUD(objectSchema, fields, options){
           payload.status = 2;
           payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
       }
-      debugger;
       var scope = SteedosUI.getRef(context.scopeId);
       var scopeParent = scope && scope.parent;
       var crudScoped = scopeParent.getComponentById('${body.id}');
@@ -9232,7 +9243,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list py-2 first:pt-0 border-b last:border-b-0 ${componentId} ${className}`,
+            className: `steedos-record-related-list py-2 first:pt-0 border-b-0 last:border-b-0 ${componentId} ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -9978,7 +9989,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 m-0 mt-2 border-y",
+        "className": "steedos-record-tabs bg-white p-4 m-0 border-b",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -10913,6 +10924,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
     });
 
+    let listviewFilter = getListViewFilter(listView);
+    let listviewFiltersFunction = listView && listView._filters;
+
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -10959,7 +10973,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
         }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var pageSize = api.data.pageSize || 10;
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
@@ -11021,6 +11035,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
         
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$self.__super);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -11333,6 +11357,9 @@ async function lookupToAmisSelect(field, readonly, ctx){
     const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     let listView = getLookupListView(refObjectConfig);
 
+    let listviewFilter = getListViewFilter(listView);
+    let listviewFiltersFunction = listView && listView._filters;
+
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -11362,7 +11389,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
     apiInfo.data['rfield'] = `\${object_name}`;
     // [["_id", "=", "$${field.name}._id"],"or",["name", "contains", "$term"]]
     apiInfo.requestAdaptor = `
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var top = 200;
         if(api.data.$term){
             filters = [["${referenceTo?.NAME_FIELD_KEY || 'name'}", "contains", api.data.$term]];
@@ -11385,6 +11412,16 @@ async function lookupToAmisSelect(field, readonly, ctx){
         }
 
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -12357,6 +12394,36 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 convertData = {
                     type: 'static-text'
                 };
+            }else if(field.autonumber_enable_modify){
+                convertData = {
+                    "type": "input-group",
+                    "body": [
+                        {
+                            "type": "input-text",
+                            "name": field.name
+                        },
+                        {
+                            "type": "button",
+                            "label": "自动获取",
+                            "actionType": "ajax",
+                            "api": {
+                                "url": `\${context.rootUrl}/api/autonumber/generator/\${objectName}/${field.name}`,
+                                "method": "post",
+                                "headers": {
+                                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                },
+                                "adaptor": `
+                                    payload.data["${field.name}"] = payload.data && payload.data.autonumber;
+                                    delete payload.data.autonumber;
+                                    return payload;
+                                `
+                            },
+                            "messages": {
+                                "success": "获取成功"
+                            }
+                        }
+                    ]
+                };
             }
             break;
         case 'url':