@steedos-widgets/amis-lib 1.3.4-beta.1 → 1.3.4-beta.10

package/dist/index.esm.js

@@ -452,39 +452,39 @@ function getCreatedInfoTpl(formFactor){
     const href = Router.getObjectDetailPath({
         formFactor, appId: "admin", objectName: 'users', recordId: '${created_by._id}'
     });
-    return `<div><a href='${href}'>\${_display.created_by.label}</a>\${_display.created}</div>`
+    return `<span><a href='${href}'>\${_display.created_by.label}</a>\${_display.created}</span>`
 }
 
 function getModifiedInfoTpl(formFactor){
     const href = Router.getObjectDetailPath({
         formFactor, appId: "admin", objectName: 'users', recordId: '${modified_by._id}'
     });
-    return `<div><a href='${href}'>\${_display.modified_by.label}</a>\${_display.modified}</div>`
+    return `<span><a href='${href}'>\${_display.modified_by.label}</a>\${_display.modified}</span>`
 }
 
 function getNumberTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getTimeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getDateTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 
 function getDateTimeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getUiFieldTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getUiFileSizeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 //TODO 处理name字段
@@ -495,7 +495,7 @@ async function getRefObjectNameFieldName(field){
 }
 
 function getSelectTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 function getSelectMap(selectOptions){
     let map = {};
@@ -1208,7 +1208,7 @@ var frontend_display_type_is_split = "分栏视图";
 var frontend_display_as = "显示为";
 var frontend_record_sum = "个项目";
 var frontend_button_reload_tooltip = "刷新";
-var frontend_button_search_tooltip = "查询";
+var frontend_button_search_tooltip = "筛选";
 var frontend_fields_filter_button_search = "搜索";
 var frontend_fields_filter_button_settings = "设置搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
@@ -1830,7 +1830,7 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-06-28 23:19:41
+ * @LastEditTime: 2023-09-25 14:53:05
  * @Description: 
  */
 
@@ -1849,18 +1849,31 @@ const getSchema$5 = async (uiSchema, ctx) => {
             formSchema = _.isString(payload.schema) ? JSON.parse(payload.schema) : payload.schema;
         }
 
+        const fields = ${JSON.stringify(uiSchema.fields)};
+        const selectedRowResponseResult = api.body.selectedRowResponseResult;
+        let defaultData = {}; 
+
+        if(!_.isEmpty(selectedRowResponseResult)){
+            const fieldsKeys = _.keys(fields);
+            // 如果新建记录时复制的数据中有omit或其他不相关字段数据时不应该一起保存到数据库，
+            // 原规则见：https://github.com/steedos/steedos-frontend/issues/297
+            _.forEach(selectedRowResponseResult, (val, key) => {
+              if (fieldsKeys.indexOf(key) > -1 && fields[key].omit !== true) {
+                defaultData[key] = val;
+              }
+            })
+        }
+
         const _master = api.body._master;
         if(_master && _master._isRelated){
             const relatedKey = _master.relatedKey;
             const masterObjectName = _master.objectName;
             const recordId = _master.recordId;
             let relatedKeySaveValue = recordId;
-            const fields = ${JSON.stringify(uiSchema.fields)};
             const relatedField = fields[relatedKey];
             if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
                 relatedKeySaveValue = _master.record[relatedField.reference_to_field];
             }
-            let defaultData = {}; 
             let relatedKeyValue; 
             if(!_.isString(relatedField.reference_to)){
                 relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
@@ -1870,6 +1883,9 @@ const getSchema$5 = async (uiSchema, ctx) => {
                 relatedKeyValue = relatedKeySaveValue;
             }
             defaultData[relatedKey]=relatedKeyValue;
+        }
+
+        if(!_.isEmpty(defaultData)){
             if(payload.schema){
                 // 表单微页面第一层要求是page
                 formSchema.data.defaultData = defaultData;
@@ -1892,6 +1908,18 @@ const getSchema$5 = async (uiSchema, ctx) => {
             });
         }, 200);
     `;
+    const getSelectedRowsScript = `
+        const isLookup = event.data.isLookup;
+        if(isLookup){
+            // lookup弹出窗口的新建功能不需要支持复制新建
+            return;
+        }
+        const uiSchema = event.data.uiSchema;
+        const objectName = event.data.objectName;
+        const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
+        const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
+        event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
+    `;
     return {
         "type": "service",
         "body": [
@@ -1904,6 +1932,21 @@ const getSchema$5 = async (uiSchema, ctx) => {
                     "click": {
                         "weight": 0,
                         "actions": [
+                            {
+                                "actionType": "custom",
+                                "script": getSelectedRowsScript
+                            },
+                            {
+                                "actionType": "ajax",
+                                "outputVar": "selectedRowResponseResult",
+                                "args": {
+                                    "api": {
+                                        "url": "${context.rootUrl}/api/v1/${uiSchema.name}/${selectedIds|first}",
+                                        "method": "get"
+                                    }
+                                },
+                                "expression": "${selectedIds.length > 0}"
+                            },
                             {
                                 "actionType": "dialog",
                                 "dialog": {
@@ -1921,7 +1964,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                         "displayAs": "${displayAs}",
                                         "uiSchema": "${uiSchema}",
                                         "isLookup": "${isLookup}",
-                                        "listName": "${listName}"
+                                        "listName": "${listName}",
+                                        "selectedRowResponseResult": "${selectedRowResponseResult}",
                                     },
                                     "title":i18next.t('frontend_form_new') + " ${uiSchema.label | raw}",
                                     "body": [
@@ -1933,7 +1977,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                                 "data": {
                                                     "isLookup": "${isLookup}",
                                                     "_master": "${_master}",
-                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}"
+                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
+                                                    "selectedRowResponseResult": "${selectedRowResponseResult}"
                                                 },
                                                 "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
                                                 "method": "get",
@@ -2864,9 +2909,30 @@ const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
 const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
     const { buttons, moreButtons, moreButtonsVisibleOn } = getObjectDetailHeaderButtons(objectSchema, recordId);
     if(ctx.formFactor === 'SMALL'){
+        const dropdownButtons = [
+            ..._$1.map(buttons, (button) => {
+                button.className += ' w-full';
+                return button;
+            }),
+            ..._$1.map(moreButtons, (button) => {
+                button.className += ' w-full';
+                return button;
+            })
+        ];
+
+        let phoneMoreButtonsVisibleOn = '';
+        _$1.forEach(dropdownButtons, (button, index) => {
+            if(index === 0){
+                phoneMoreButtonsVisibleOn = button.visibleOn;
+            }else {
+                phoneMoreButtonsVisibleOn = phoneMoreButtonsVisibleOn + ' || ' + button.visibleOn;
+            }
+        });
+
         return {
             "type": "button",
             "icon": "fa fa-angle-down",
+            "visibleOn": phoneMoreButtonsVisibleOn,
             "onEvent": {
               "click": {
                 "actions": [
@@ -2882,16 +2948,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                           "id": "u:fd837823be5b",
                           "vertical": true,
                           "tiled": true,
-                          "buttons": [
-                            ..._$1.map(buttons, (button)=>{
-                                button.className += ' w-full';
-                                return button;
-                            }),
-                            ..._$1.map(moreButtons, (button)=>{
-                                button.className += ' w-full';
-                                return button;
-                            })
-                          ],
+                          "buttons": dropdownButtons,
                           "btnLevel": "enhance",
                           "className": "w-full",
                           "btnClassName": "w-full",
@@ -2916,7 +2973,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                 type: "steedos-dropdown-button",
                 label: "",
                 buttons: moreButtons,
-                className: 'slds-icon',
+                className: 'slds-icon ml-1',
                 visibleOn: moreButtonsVisibleOn
             };
             buttons.push(dropdownButtonsSchema);
@@ -3659,13 +3716,15 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
     "visibleOn": "${display == 'split'?false:true}"
   }];
   if(ctx.formFactor !== 'SMALL'){
+    const restButtons = Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):[];
     buttonSchema.push({
       "type": "flex",
       "items":[
         standardNewButton,
-        {
+        (restButtons.length > 0) && {
           "type": "dropdown-button",
-          "buttons": Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):{},
+          "buttons": restButtons,
+          "className": " ml-1",
           "menuClassName": "p-none split-dropdown-buttons",
           "align": "right",
           "size": "sm"
@@ -3797,7 +3856,6 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
       },
       {
         "body": [
-          fieldsFilterButtonSchema,
           {
             "type": "button",
             "label": "",
@@ -3806,6 +3864,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
             "target": amisListViewId,
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
           },
+          fieldsFilterButtonSchema,
           // {
           //   "type": "button",
           //   "label": "",
@@ -4053,7 +4112,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
                     "body": [
                       {
                         "type": "tpl",
-                        "tpl": `<a class="text-black text-base font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.recordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
+                        "tpl": `<a class="text-black text-base font-bold hover:font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.recordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
                         "inline": false,
                         "wrapperComponent": "",
                         "className": "",
@@ -5142,7 +5201,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
       {
         "type": "search-box",
         "name": keywordsSearchBoxName,
-        "placeholder": "快速搜索",
+        "placeholder": "搜索此列表",
         "value": crudKeywords,
         "clearable": true,
         "clearAndSubmit": true
@@ -5265,10 +5324,10 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     if(toolbarCount){
       toolbars.push(toolbarCount);
     }
-    toolbars.push(toolbarReloadButton);
     if(toolbarFilter){
       toolbars.push(toolbarFilter);
     }
+    toolbars.push(toolbarReloadButton);
     toolbars.push(toolbarDisplayAsButton);
     toolbars.push(toolbarDQuickSearchBox);
     return [
@@ -5284,19 +5343,20 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       toolbars.push(toolbarFilter);
     }
     toolbars.push(toolbarReloadButton);
+    toolbars.push(toolbarDisplayAsButton);
     if(mainObject?.permissions?.allowCreateListViews){
       toolbars.push(getSettingListviewToolbarButtonSchema());
     }
-    toolbars.push(toolbarDisplayAsButton);
     toolbars.push(toolbarDQuickSearchBox);
     return [
       // "filter-toggler",
       ...(headerToolbarItems || []),
       "bulkActions",
-      {
-        "type": "columns-toggler",
-        "className": "hidden"
-      },
+      // 不能放开crud columns-toggler否则crud card模式会报错
+      // {
+      //   "type": "columns-toggler",
+      //   "className": "hidden"
+      // },
       ...toolbars,
       // {
       //     "type": "columns-toggler",
@@ -5903,10 +5963,13 @@ async function lookupToAmisPicker(field, readonly, ctx){
     const op = api.data.$self.op;
     if(!_.isEmpty(op)){
         // op不为空，表示处于字段初始编辑状态，不是点击后出现弹窗状态。
+        // 这里不可以用_.pick函数让payload只返回labelField和valueField，因为字段上配置的amis autoFill功能可能依赖了其他字段
+        /*
         const rows = _.map(payload.data.rows, (item)=>{
             return _.pick(item, ["${referenceTo.labelField.name}", "${referenceTo.valueField.name}"]);
         })
         payload.data.rows = rows;
+        */
         return payload;
     }
     if(enable_tree){
@@ -8267,7 +8330,7 @@ async function getTableOperation(ctx){
         label: i18next.t('frontend_operation'),
         fixed: 'right',
         labelClassName: 'text-center',
-        className: 'text-center steedos-listview-operation w-20',
+        className: 'text-center steedos-listview-operation w-10',
         buttons: [
               {
                 "type": "steedos-dropdown-button",
@@ -8323,7 +8386,7 @@ async function getTableSchema$1(fields, options){
     return {
         mode: "table",
         name: "thelist",
-        headerToolbarClassName: "py-2 px-2 border-gray-300 bg-gray-100 border-solid border-b",
+        headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
         draggable: false,
         defaultParams: getDefaultParams(options),
@@ -10115,7 +10178,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         idFieldName: objectSchema.idFieldName, labelFieldName: labelFieldName, 
         permissions:objectSchema.permissions,enable_inline_edit:objectSchema.enable_inline_edit
       }, options);
-      tableOptions.amisData = createObject(options.amisData || {}, {}).__super;
+      tableOptions.amisData = createObject(options.amisData || {}, {});
       const table = await getTableSchema$1(fields, tableOptions);
       delete table.mode;
       //image与avatar需要在提交修改时特别处理
@@ -10174,17 +10237,26 @@ async function getObjectCRUD(objectSchema, fields, options){
             Authorization: "Bearer ${context.tenantId},${context.authToken}",
           },
           requestAdaptor: quickSaveApiRequestAdaptor,
+          adaptor: `
+              if(payload.errors){
+                  payload.status = 2;
+                  payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+              }
+              return payload;
+          `
         },
         rowClassNameExpr: options.rowClassNameExpr
       }, bodyProps);
 
-      body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
     }
 
     const defaults = options.defaults;
+    
+    const listSchema = (defaults && defaults.listSchema) || {};
+    body = defaultsDeep({}, listSchema, body);
+    body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
+
     if (defaults) {
-      const listSchema = defaults.listSchema || {};
-      body = defaultsDeep({}, listSchema, body);
       const headerSchema = defaults.headerSchema;
       const footerSchema = defaults.footerSchema;
       if (headerSchema || footerSchema) {
@@ -10516,7 +10588,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-28 14:55:23
+ * @LastEditTime: 2023-09-25 17:18:08
  * @Description:
  */
 
@@ -10691,7 +10763,8 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         setDataToComponentId: componentId,
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
-        crudClassName: 'border-t border-slate-300 hidden',
+        crudClassName: 'border-t border-gray-300 hidden',
+        refField,
         ...ctx
     };
     const amisSchema= (await getRelatedListSchema(relatedObjectName, 'all', options)).amisSchema;
@@ -10703,7 +10776,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list ${componentId} rounded border border-slate-300 bg-gray-100 mb-4 ${className}`,
+            className: `steedos-record-related-list ${componentId} rounded border border-gray-300 bg-gray-100 mb-4 ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -10806,10 +10879,33 @@ async function getRelatedListSchema(
     ctx
   ) {
     const uiSchema = await getUISchema(objectName);
-    const listView = uiSchema.list_views;
+    const listView =  find(
+        uiSchema.list_views,
+        (listView, name) => {
+            // 传入listViewName空值则取第一个
+            if(!listViewName){
+                listViewName = name;
+            }
+            return name === listViewName || listView._id === listViewName;
+        }
+    );
     const listViewProps = getRelatedListProps(uiSchema,listViewName, ctx);
     // console.log('listViewProps==>', listViewProps)
     const {columns: listViewColumns, sort: listViewSort, filter: listviewFilter, filtersFunction } = listViewProps;
+
+    const refFieldName = ctx.refField && ctx.refField.name;
+
+    let relatedListColumns = listViewColumns;
+    if(refFieldName){
+        relatedListColumns = listViewColumns.filter(function(columnItem){
+            if(typeof columnItem === "string"){
+                return columnItem !== refFieldName;
+            }
+            else {
+                return columnItem.field !== refFieldName;
+            }
+        });
+    }
   
     const defaults = ctx.defaults || {};
   
@@ -10847,7 +10943,7 @@ async function getRelatedListSchema(
     const amisSchema = {
         "type": "steedos-object-table",
         "objectApiName": objectName,
-        "columns": listViewColumns,
+        "columns": relatedListColumns,
         "extraColumns": listView.extra_columns,
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
@@ -10868,7 +10964,7 @@ async function getRelatedListSchema(
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-15 09:04:49
+ * @LastEditTime: 2023-09-21 17:35:06
  * @Description:
  */
 
@@ -11316,7 +11412,7 @@ async function getTableSchema(
         headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
     };
-    crudOptions.amisData = createObject(ctx.amisData || {}, {}).__super;
+    crudOptions.amisData = createObject(ctx.amisData || {}, {});
     const amisSchema = await getObjectCRUD(uiSchema, fields, crudOptions);
     // console.timeEnd('getTableSchema');
     return {
@@ -11389,7 +11485,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "sm:mt-3 bg-white sm:shadow sm:rounded sm:border border-slate-300 p-4",
+        "className": "sm:mt-3 bg-white sm:rounded sm:border border-gray-300 p-4",
         "tabs": [
             detailed
         ],
@@ -11576,7 +11672,7 @@ async function getListPageInitSchema(objectApiName, formFactor, userSession) {
             "columnsTogglable": false,
             "showHeader": true,
             // "headerSchema": headerSchema
-            className: "sm:border bg-white sm:shadow sm:rounded border-slate-300 border-solid"
+            className: "sm:border bg-white sm:rounded border-gray-300 border-solid"
         }]
     }
 }
@@ -11634,7 +11730,7 @@ async function getRecordPageInitSchema(objectApiName){
                 ]
             }
         ],
-        "className": "sm:mt-3 flex flex-col region-main bg-white sm:shadow sm:rounded sm:border border-slate-300",
+        "className": "sm:mt-3 flex flex-col region-main bg-white sm:rounded sm:border border-gray-300",
         "linksClassName": "pl-4 pt-2"
     };
     if(relatedList.length){