@steedos-widgets/amis-lib 3.6.2-beta.5 → 3.6.2-beta.6

package/dist/index.cjs.js

@@ -1430,9 +1430,9 @@ 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_fields_filter_button_settings = "选择搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
 var frontend_button_listview_control_label = "列表视图控制";
 var frontend_listview_control_columns = "显示的列";
@@ -2086,12 +2086,11 @@ async function getTableColumns(fields, options){
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
-        //crud内默认换行
-        // if(field.wrap != true){
-        //     className += " whitespace-nowrap "
-        // }else{
-        //     className += " break-words "
-        // }
+        if(field.wrap != true){
+            className += " whitespace-nowrap ";
+        }else {
+            className += " break-words ";
+        }
         let columnItem;
         if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
             const previewFileScript = `
@@ -2623,7 +2622,7 @@ async function getTableSchema$1(fields, options){
             }
             return {
                 mode: "cards",
-                perPageAvailable: [5, 10, 20, 50, 100, 500],
+                perPageAvailable: [20, 50, 100, 500],
                 name: "thelist",
                 headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
                 className: "",
@@ -2656,7 +2655,7 @@ async function getTableSchema$1(fields, options){
 
     return {
         mode: "table",
-        perPageAvailable: [5, 10, 20, 50, 100, 500],
+        perPageAvailable: [20, 50, 100, 500],
         name: "thelist",
         headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
@@ -3162,7 +3161,7 @@ function getReadonlyFormAdaptor(object, fields, options){
         payload.data.__objectName = "${object.name}";
         payload.data.record = record;
 
-        payload.data.name = record.${object.NAME_FIELD_KEY || 'name'};
+        payload.data.NAME_FIELD_VALUE = record.${object.NAME_FIELD_KEY || 'name'};
         payload.data._master = {
             record: record,
             objectName: "${object.name}",
@@ -3317,7 +3316,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
         cache: API_CACHE,
         requestAdaptor: `
             // 所有不想在network请求中发送的数据都应该从data中分离出来，data变量只需要留下query才需要发送出去
-            var { recordId, objectName, uiSchema, global, context, ...data} = api.data;
+            var { recordId, objectName, uiSchema, global, context, _master, ...data} = api.data;
             if(!recordId){
                 // 新建则不请求任何数据
                 data.query = "{data:" + objectName + "(filters: " + JSON.stringify(["_id", "=", null]) + ", top: 1){_id}}";
@@ -3392,15 +3391,17 @@ async function getEditFormInitApi(object, recordId, fields, options){
             }
             // data下的变量需要在保存接口（getSaveApi）中被删除。
             payload.data = {
-                ...initialValues
+                ...initialValues,
+                editFormInited: true
             }
             ${options.initApiAdaptor || ''}
+            // console.log('getEditFormInitApi======>', payload);
             return payload;
         `,
-        responseData: {
-            initialValues: "$$",
-            editFormInited: true
-        },
+        // responseData: {
+        //     initialValues: "$$",
+        //     editFormInited: true
+        // },
         data: data,
         headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -6690,8 +6691,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                 },
                 {
                   "type": "tpl",
-                  "tpl": "${name}",
-                  // "tpl": "${(record && uiSchema && record[uiSchema.NAME_FIELD_KEY]) || name}",
+                  "tpl": "${NAME_FIELD_VALUE}",
                   "inline": false,
                   "wrapperComponent": "",
                   "className": "record-detail-header-name leading-5 text-xl font-bold"
@@ -6778,7 +6778,6 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     type: 'service',
     id: `page_readonly_${name}_header`,
     name: `page`,
-    data: { objectName: name, _id: recordId, recordPermissions: objectSchema.permissions, uiSchema: objectSchema, record: "${record}" },
     body: body, 
     className: ''
   }
@@ -7985,7 +7984,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
       {
         "type": "search-box",
         "name": keywordsSearchBoxName,
-        "placeholder": "搜索此列表",
+        "placeholder": "快捷搜索",
         "value": crudKeywords,
         // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
         "clearAndSubmit": true,
@@ -8586,7 +8585,9 @@ async function getObjectCRUD(objectSchema, fields, options){
               return payload;
           `
         },
-        rowClassNameExpr: options.rowClassNameExpr
+        // 外层data发生变化的时候, 不会重新渲染rowClassNameExpr, 所以先用css标记tr唯一标识
+        // 使用表达式给tr添加初始选中状态
+        rowClassNameExpr: options.rowClassNameExpr || "<%= data._id === data.recordId ? 'steedos-record-tr steedos-record-tr-' + data._id + ' steedos-record-selected' : 'steedos-record-tr steedos-record-tr-' + data._id %>" 
       }, bodyProps);
 
     }
@@ -8601,7 +8602,7 @@ async function getObjectCRUD(objectSchema, fields, options){
 
     if(body.columns && options.formFactor != 'SMALL'){
       //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
-      body.columns.splice(body.columns.length -1 , 0, {name: '_display',type: 'static', width: 1, placeholder: "",id: objectSchema.name + "_display_${_index}", tpl: "${}"});
+      body.columns.splice(body.columns.length -1 , 0, {name: '_display',type: 'static', width: 1, placeholder: "",id: objectSchema.name + "_display_${_index}", tpl: "${''}"});
     }
 
     if (defaults) {
@@ -8736,9 +8737,7 @@ async function getObjectForm(objectSchema, ctx){
       id: `service_${formSchema.id}`,
       className: 'p-0',
       name: `page_edit_${recordId}`,
-      api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
       data:{
-        editFormInited: false,
         ...amisData
       },
       // data: {global: getGlobalData('edit'), recordId: recordId, objectName: objectSchema.name, context: {rootUrl: getRootUrl(), tenantId: getTenantId(), authToken: getAuthToken()}},
@@ -8747,8 +8746,9 @@ async function getObjectForm(objectSchema, ctx){
       body: [defaultsDeep({}, formSchema, {
         type: "form",
         mode: layout,
+        initApi: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
         data: {
-          "&": "${initialValues}"
+          editFormInited: false,
         },
         labelAlign,
         persistData: false,
@@ -8762,11 +8762,15 @@ async function getObjectForm(objectSchema, ctx){
         submitText: "", // amis 表单不显示提交按钮, 表单提交由项目代码接管
         api: await getSaveApi(objectSchema, recordId, fields, ctx),
         initFetch: recordId != 'new',
-        body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups})),
+        body: {
+          type: 'wrapper',
+          className: 'p-0 m-0',
+          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups})),
+          hiddenOn: "${editFormInited != true}",
+        },
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
         bodyClassName: 'p-0',
         className: 'steedos-amis-form',
-        hiddenOn: "${editFormInited != true}",
         onEvent: {
           "submitSucc": {
             "weight": 0,
@@ -9378,7 +9382,7 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-15 15:50:40
+ * @LastEditTime: 2024-01-16 11:14:34
  * @Description:
  */
 
@@ -9932,88 +9936,73 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     }
 }
 
-async function getRecordServiceSchema(objectName, appId, props = {}) {
+async function getRecordServiceSchema(objectName, appId, props = {}, body) {
     const uiSchema = await getUISchema(objectName);
     const fields = ___default["default"].values(uiSchema.fields);
+    const serviceId = `u:steedos-record-service-${objectName}`;
     return {
         uiSchema,
         amisSchema: {
-            "type": "service",
-            className: 'steedos-record-service p-0 md:p-2',
-            api: await getReadonlyFormInitApi(uiSchema, props.recordId, fields, props),
-            "body":  {
-                "type": "wrapper",
-                "className": "p-0 m-0",
-                "body": [],
-                "hiddenOn": "${recordLoaded != true}"
-              },
-            data: {
-                "_master.objectName": "${objectName}",
-                "_master.recordId": "${recordId}",
-                ...(props.data || {})
-            },
-            "style": {
-                // "padding": "var(--Page-body-padding)",
-                ...props.style
-            },
+            type: 'service',
+            className: "p-0 m-0",
             onEvent: {
                 [`@data.changed.${objectName}`]: {
-                    "actions": [
-                      {
-                        "actionType": "reload",
-                        "expression": "this.__deletedRecord != true"
-                      },
-                      {
-                        "actionType": "custom",
-                        "script": "window.goBack()",
-                        "expression": "this.__deletedRecord === true"
-                      }
-                    ]
-                },
-                // 如果定义了fetchInited,则无法接收到广播事件@data.changed
-                // "fetchInited": {  
-                //     "weight": 0,
-                //     "actions": [
-                //     //   {
-                //     //     actionType: 'broadcast',
-                //     //     eventName: "recordLoaded",
-                //     //     args: {
-                //     //       eventName: "recordLoaded"
-                //     //     },
-                //     //     data: {
-                //     //       objectName: "${event.data.__objectName}",
-                //     //       record: "${event.data.__record}"
-                //     //     },
-                //     //     expression: "${event.data.__response.error != true}"
-                //     //   },
-                //       {
-                //         "actionType": "setValue",
-                //         "args": {
-                //            value: {
-                //             "recordLoaded": true,
-                //            }
-                //         },
-                //         expression: "${event.data.__response.error != true}"
-                //     }
-                //     ]
-                // },
-                "recordLoaded": {
                     "actions": [
                         {
                             "actionType": "reload",
-                            "data": {
-                                "name": `\${record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
-                                "_master.record": `\${record}`,
-                                // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
-                                "_master.objectName": "${objectName}",
-                                "_master.recordId": "${recordId}"
-                            }
+                            "componentId": serviceId,
+                            "expression": "this.__deletedRecord != true"
+                        },
+                        {
+                            "actionType": "custom",
+                            "script": "window.goBack()",
+                            "expression": "this.__deletedRecord === true"
                         }
                     ]
                 },
-                ...props.onEvent
+            },
+            body: {
+                "type": "service",
+                id: serviceId,
+                className: 'steedos-record-service p-0 md:p-2',
+                api: await getReadonlyFormInitApi(uiSchema, props.recordId, fields, props),
+                body:  {
+                    "type": "wrapper",
+                    "className": "p-0 m-0",
+                    "body": body || [],
+                    "hiddenOn": "${recordLoaded != true}"
+                  },
+                data: {
+                    "_master.objectName": "${objectName}",
+                    "_master.recordId": "${recordId}",
+                    ...(props.data || {})
+                },
+                "style": {
+                    // "padding": "var(--Page-body-padding)",
+                    ...props.style
+                },
+                onEvent: {
+                    // 如果定义了fetchInited,则无法接收到广播事件@data.changed
+                    "fetchInited": {  
+                        "weight": 0,
+                        "actions": [
+                            {
+                                actionType: 'broadcast',
+                                eventName: "recordLoaded",
+                                data: {
+                                    objectName: "${event.data.__objectName}",
+                                    record: "${event.data.record}"
+                                },
+                                expression: "${event.data.__response.error != true}"
+                            },
+                        ]
+                    },
+                    ...props.onEvent
+                }
             }
         }
+        
+        
     }
 }
 
@@ -12909,7 +12898,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-15 17:50:02
+ * @LastEditTime: 2024-01-16 14:58:51
  */
 
 /**
@@ -13846,38 +13835,44 @@ const getAmisInputTableSchema = async (props) => {
     if (!props.primaryKey) {
         props.primaryKey = "_id";
     }
+    let showOperation = props.showOperation;
+    if(showOperation !== false){
+        showOperation = true;
+    }
     let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
-    if (props.editable) {
-        let showEditButton = true;
-        if (showAsInlineEditMode) {
-            // 始终显示弹出子表表单按钮，如果需要判断只在有列被隐藏时才需要显示弹出表单按钮放开下面的if逻辑就好
-            showEditButton = true;
-            // // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
-            // if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length) {
-            //     showEditButton = true;
-            // }
-            // else {
-            //     showEditButton = false;
-            // }
+    if(showOperation){
+        if (props.editable) {
+            let showEditButton = true;
+            if (showAsInlineEditMode) {
+                // 始终显示弹出子表表单按钮，如果需要判断只在有列被隐藏时才需要显示弹出表单按钮放开下面的if逻辑就好
+                showEditButton = true;
+                // // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
+                // if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length) {
+                //     showEditButton = true;
+                // }
+                // else {
+                //     showEditButton = false;
+                // }
+            }
+            // 编辑时显示编辑按钮
+            if (showEditButton) {
+                let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
+                buttonsForColumnOperations.push(buttonEditSchema);
+            }
         }
-        // 编辑时显示编辑按钮
-        if (showEditButton) {
-            let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
-            buttonsForColumnOperations.push(buttonEditSchema);
+        else {
+            // 只读时显示查看按钮
+            // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length)
+            let buttonViewSchema = await getButtonView(props);
+            buttonsForColumnOperations.push(buttonViewSchema);
+        }
+        if (props.removable) {
+            let buttonDeleteSchema = await getButtonDelete(props);
+            buttonsForColumnOperations.push(buttonDeleteSchema);
         }
-    }
-    else {
-        // 只读时显示查看按钮
-        // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < props.fields.length)
-        let buttonViewSchema = await getButtonView(props);
-        buttonsForColumnOperations.push(buttonViewSchema);
-    }
-    if (props.removable) {
-        let buttonDeleteSchema = await getButtonDelete(props);
-        buttonsForColumnOperations.push(buttonDeleteSchema);
     }
     let inputTableSchema = {
         "type": "input-table",
@@ -13925,7 +13920,7 @@ const getAmisInputTableSchema = async (props) => {
         return item.depend_on;
     });
     if (isAnyFieldHasDependOn) {
-        // 有任意一个子字段有depend_on属性时，强制设置禁用静态模式
+        // 有任意一个子字段有depend_on属性时，强制设置禁用静态模式，因为strictMode模式下，dependOn的字段值变更后，不会rerender整个子表
         Object.assign(inputTableSchema, {
             strictMode: false
         });
@@ -14030,7 +14025,7 @@ async function getListPageInitSchema(objectApiName, formFactor, userSession) {
 // 获取
 async function getRecordPageInitSchema(objectApiName){
     const relatedList = await getObjectRelatedList(objectApiName);
-    const uiSchema = await getUISchema(objectApiName);
+    await getUISchema(objectApiName);
     let body = [
         // detailHeaderAmisSchema,
         {
@@ -14038,28 +14033,7 @@ async function getRecordPageInitSchema(objectApiName){
             "label": "标题面板",
             "objectApiName": "${objectName}",
             "recordId": "${recordId}",
-            "onEvent": {
-                "recordLoaded": {
-                    "actions": [
-                        {
-                            "actionType": "setValue",
-                            "args": {
-                              "value": {
-                                "recordLoaded": true,
-                              }
-                            }
-                        },
-                        {
-                            "actionType": "reload",
-                            "data": {
-                                "name": `\${record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
-                                "record": `\${record}`,
-                                "recordLoaded": true,
-                            }
-                        }
-                    ]
-                }
-            }
+            "onEvent": {}
         }
     ];
     let contentBody = {