@steedos-widgets/amis-lib 6.10.1-beta.34 → 6.10.1-beta.36

package/dist/index.esm.js

@@ -1114,7 +1114,7 @@ function getRecordPermissionsQuery(object, recordId, options){
 function getApi$2 (isMobile){
     if(isMobile);else {
         // return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/graphql"
-        return `\${context.rootUrl}/graphql?reload=\${additionalFilters|join}`
+        return `\${context.rootUrl}/graphql?reload=\${additionalFilters|join}&listName=\${listName}`
     }
 }
 
@@ -2354,7 +2354,7 @@ async function getColumnItemOnClick(field, options){
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
             "recordId": `\${${options.idFieldName}}`,//审批微页面依赖了作用域中的recordId
-            "_tableObjectName": options.objectName
+            "_lookupObjectName": options.objectName
         }
     }) : {
         "type": "steedos-record-detail",
@@ -2365,7 +2365,7 @@ async function getColumnItemOnClick(field, options){
         "data": {
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
-            "_tableObjectName": options.objectName
+            "_lookupObjectName": options.objectName
         }
     };
 
@@ -2538,7 +2538,7 @@ async function getTableColumns(object, fields, options){
                 body: {
                     type: "steedos-field",
                     static: true,
-                    tableObjectName: options.objectName,
+                    isLookupInTable: true,
                     config: {
                         type: "lookup",
                         reference_to: field.reference_to,
@@ -3133,7 +3133,7 @@ async function getTableApi(mainObject, fields, options){
     let valueField = mainObject.key_field || '_id';
     const api = await getApi$1(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
-    api.url;//设计器上对象表格组件需要切换对象重新请求列表数据
+    // api.url;//设计器上对象表格组件需要切换对象重新请求列表数据
     // if(options.isRelated){
     //     api.url += "&recordId=${_master.recordId}";
     // }
@@ -3360,10 +3360,13 @@ async function getTableApi(mainObject, fields, options){
                     // item[key] = value
                     // PC客户端附件子表列表点击标题预览附件功能依赖了_id，所以这里拼出来
                     let itemKeyValue = item[key];
-                    item[key] = value.map(function(item, index){
-                        item._id = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
-                        item.value = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
-                        return item;
+                    item[key] = value.map(function(curValue, index){
+                        let fileId = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
+                        // 克隆一份对象，避免下方value递归污染curValue
+                        let result = _.clone(curValue);
+                        result._id = fileId;
+                        result.value = fileId;
+                        return result;
                     });
                 }else{
                     item[key] = _.map(value, (item)=>{
@@ -3479,6 +3482,7 @@ async function getTableApi(mainObject, fields, options){
     ${options.adaptor || ''}
     return payload;
     `;
+    // api.trackExpression='${additionalFilters|json}'
     return api;
 }
 
@@ -3607,6 +3611,11 @@ function getReadonlyFormAdaptor(object, fields, options){
             objectName: "\${objectName}",
             recordId: "\${recordId}"
         }
+        if(window.location.pathname.endsWith("/"+record._id)){
+            payload.data.mainRecord= {
+                record
+            };
+        }
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
     if(payload.errors){
@@ -4880,8 +4889,8 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-12-26 20:28:43
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-07-22 14:29:15
  * @Description: 
  */
 
@@ -4955,7 +4964,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
         }
         const uiSchema = event.data.uiSchema;
         const objectName = event.data.objectName;
-        const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
+        const crudId = event.data.crudId || "listview_" + objectName;
+        const listViewRef = event.context.scoped.getComponentById(crudId);
         const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
         event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
     `;
@@ -5005,6 +5015,7 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                         "isLookup": "${isLookup}",
                                         "listName": "${listName}",
                                         "selectedRowResponseResult": "${selectedRowResponseResult}",
+                                        "_lookupObjectName": "${_lookupObjectName}"
                                     },
                                     "title":i18next.t('frontend_form_new') + " ${uiSchema.label | raw}",
                                     "body": [
@@ -5077,8 +5088,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:49:58
- * @LastEditors: yinlianghui@hotoa.com yinlianghui@hotoa.com
- * @LastEditTime: 2024-05-19 10:01:07
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-07-14 11:55:43
  * @Description:
  */
 
@@ -5108,6 +5119,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
       : page.schema;
   }
   
+  // console.log('formSchema====>', formSchema);
 
   return {
     type: "service",
@@ -5132,9 +5144,10 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   showCloseButton: true,
                   "data": {
                     "&": "$$",
-                    "_master": "${_master}",
+                    "_master": "${mainRecord}",
                     "_master._isRelated": "${_isRelated}",
-                    "_master.relatedKey": "${relatedKey}"
+                    "_master.relatedKey": "${relatedKey}",
+                    "_lookupObjectName": "${_lookupObjectName}"
                   },
                   size: "lg",
                   "actions": [
@@ -5233,12 +5246,12 @@ const getSchema$3 = (uiSchema)=>{
                             {
                                 "actionType": "broadcast",
                                 "args": {
-                                  "eventName": "@data.changed.${_tableObjectName}"
+                                  "eventName": "@data.changed.${_lookupObjectName}"
                                 },
                                 "data": {
-                                  "objectName": "${_tableObjectName}"
+                                  "objectName": "${_lookupObjectName}"
                                 },
-                                "expression": `\${_tableObjectName != '${uiSchema.name}' && _tableObjectName}`
+                                "expression": `\${_lookupObjectName != '${uiSchema.name}' && _lookupObjectName}`
                             }
                           ]
                     }
@@ -5497,8 +5510,8 @@ const getSchema = async (uiSchema, ctx) => {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:53:07
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-28 17:06:22
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-07-22 14:12:01
  * @Description: 
  */
 
@@ -5528,10 +5541,12 @@ const StandardButtons = {
                 const {
                     appId,
                     objectName,
-                    uiSchema
+                    uiSchema,
+                    record
                 } = this;
+                const crudId = record?.crudId || `listview_${uiSchema.name}`;
                 const scope = this.scope;
-                const listViewRef = scope.parent?.getComponentById(`listview_${uiSchema.name}`);
+                const listViewRef = scope.parent?.getComponentById(crudId);
                 if(_.isEmpty(listViewRef.props.store.toJSON().selectedItems)){
                     listViewRef.handleAction({}, {
                         "actionType": "toast",
@@ -6159,19 +6174,11 @@ async function getObjectFieldsFilterFormSchema(ctx) {
     },
     "schemaApi": {
       method: 'post',
-      url: `\${context.rootUrl}/graphql?reload=\${filterFormSearchableFields|join}`,
       data: {
         $self: "$$",
-        query: "{\n data: objects(filters: [[\"_id\",\"=\",null]],top: 1, skip: 0){_id}\n    }"
+        query: ""
       },
-      requestAdaptor: `
-        return {
-          ...api,
-          data: {
-            query: api.data.query
-          }
-        };
-      `,
+      url: `/api/amis/health_check?reload=\${filterFormSearchableFields|join}`,
       adaptor: `
           if(payload.errors){
               payload.status = 2;
@@ -6471,7 +6478,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
           });
           // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            let crudService = SteedosUI.getRef(data.$scopeId).parent.getComponentById("service_listview_" + data.objectName)
+            let scopeRef = SteedosUI.getRef(data.$scopeId);
+            let crudService = scopeRef && scopeRef.parent.getComponentById("service_listview_" + data.objectName)
             crudService && crudService.setData({isFieldsFilterEmpty: false});
             // setData({ showFieldsFilter: true });//自动展开搜索栏
           }
@@ -7570,6 +7578,7 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                     "size": "sm",
                     "hideCaret": true,
                     "closeOnClick": true,
+                    "visibleOn": "\${listName && uiSchema.list_views[listName].disableSwitch != true}",
                     "btnClassName": "!bg-transparent !border-none !hover:border-none text-lg h-5 font-bold p-0 text-black leading-none",
                     "buttons": [
                       ...listViewButtonOptions,
@@ -7582,6 +7591,12 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                       },
                       listviewNewButton
                     ]
+                  },
+                  {
+                    "type": "tpl",
+                    "className": "steedos-listview-change-button text-lg font-bold", 
+                    "tpl": "\${listName ? uiSchema.list_views[listName].label : uiSchema.list_views[defaultListName].label}",
+                    "visibleOn": "\${listName && uiSchema.list_views[listName].disableSwitch}",
                   }
                 ],
                 "md": "",
@@ -9979,16 +9994,16 @@ async function getObjectForm(objectSchema, ctx){
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
               },
-              // 列表视图、对象表格组件上的lookup字段，点开右侧弹出drawer窗口，修改记录后刷新列表
+              // 列表视图、对象表格、对象表单组件上的lookup字段，点开右侧弹出drawer窗口，修改记录后刷新列表
               {
                 "actionType": "broadcast",
                 "args": {
-                  "eventName": "@data.changed.${_tableObjectName}"
+                  "eventName": "@data.changed.${_lookupObjectName}"
                 },
                 "data": {
-                  "objectName": "${_tableObjectName}"
+                  "objectName": "${_lookupObjectName}"
                 },
-                "expression": `\${_tableObjectName != '${objectSchema.name}' && _tableObjectName}`
+                "expression": `\${_lookupObjectName != '${objectSchema.name}' && _lookupObjectName}`
               },
               ...submitSuccActions,
               // {
@@ -12722,11 +12737,8 @@ async function lookupToAmisSelect(field, readonly, ctx){
     }else {
         apiInfo = {
             method: "post",
-            url: getApi$2(),
-            data: {query: '{objects(filters: ["_id", "=", "-1"]){_id}}', $: "$$"},
-            "headers": {
-                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-            }
+            data: {$: "$$", query: ""},
+            url: "/api/amis/health_check?reload=\${additionalFilters|join}&listName=\${listName}"
         };
     }
 
@@ -14172,9 +14184,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         // if(ctx.mode === 'edit'){
         let convertDataResult;
         if(convertData.type == "steedos-field"){
-            // 如果是steedos-field，不能把amis属性合并到steedos-field根属性中，要合并也是合并到steedos-field的config.amis中
-            // 而steedos-field字段的amis属性本身就在config.amis中了，所以这里不需要再合并field.amis
-            // 目前测试到受影响的是，把字段的amis属性配置为{"type": "checkboxes"}时，ObjectForm只读模式下，lookup字段返回的是type为steedos-field的组件，此时field.amis中的type不应该合并到steedos-field根属性中
+            // 如果是steedos-field，不能把field.amis属性合并到steedos-field根属性中，要合并也是合并到steedos-field的config.amis中
+            // 而steedos-field字段的config属性中的amis属性已经有了这里的field.amis，所以这里不需要再合并field.amis
+            // 目前测试到受影响的是，把字段的amis属性配置为{"type": "checkboxes"}时，ObjectForm只读模式下，lookup字段返回的是type为steedos-field的组件，此时如果在这里合并field.amis，那么其type就变成了checkboxes，导致lookup字段显示为复选框
             convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, {name: baseData.name});
         }
         else {
@@ -14227,7 +14239,8 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             _field.removable = false;
             _field.value = [null,null];
             _field.items = {
-                type: "input-number"
+                type: "input-number",
+                clearValueOnEmpty: true
             };
             _field.is_wide = true;
             fieldNamePrefix = `${fieldNamePrefix}between__`;
@@ -14275,6 +14288,10 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             delete _field.amis.hidden;
             delete _field.amis.hiddenOn;
             delete _field.amis.autoFill;
+            if(_field.type.indexOf("-range") > -1 || _field.type === 'input-array'){
+                // 范围类型不允许变更type，否则会因为某些属性兼容性问题报错页面奔溃，比如input-date-range类型有shortcuts属性，改为input-date后其shortcuts属性有兼容性问题
+                delete _field.amis.type;
+            }
         }
 
         const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
@@ -17004,7 +17021,7 @@ const getNextStepUsersInput = async (instance) => {
                 "messages": {
                 },
                 "requestAdaptor": "\nconst { context, next_step, $scopeId } = api.data;\nconst formValues = SteedosUI.getRef($scopeId).getComponentById(\"instance_form\").getValues();\n\napi.data = {\n  instanceId: context._id,\n nextStepId: next_step._id,\n  values: formValues\n}\n\n\n return api;",
-                "adaptor": "debugger;\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
+                "adaptor": "\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
                 "data": {
                   "&": "$$",
                   "$scopeId": "$scopeId",
@@ -17197,10 +17214,10 @@ const getApprovalDrawerSchema = async (instance) => {
   console.log("=============getApprovalDrawerSchema=============", instance);
   return {
     type: "drawer",
-    overlay: true,
+    overlay: false,
     resizable: false,
     closeOnEsc: true,
-    closeOnOutside: true,
+    closeOnOutside: false,
     size: "sm",
     title: `${instance.step.name}`,
     className: "approval-drawer absolute",
@@ -17914,6 +17931,10 @@ const getFieldEditTpl = async (field, label)=>{
       case "section":
         tpl.type = "input-text";
         break;
+      default:
+        tpl.type = 'steedos-field';
+        tpl.config = field.steedos_field;
+        break;
     }
   }
   // console.log('getFieldEditTpl ', label, tpl)
@@ -18038,15 +18059,15 @@ const getTdField = async (field, fieldsCount) => {
 
 const getTdTitle = (field) => {
   return {
-    className: "td-title",
+    className: `td-title td-title-${field.type}`,
     align: field.type != "section" ? "center" : "left",
     width: field.type != "section" ? "16%" : "",
     colspan: field.type == "section" ? 4 : "",
-    background: "#FFFFFF",
+    background: field.type == "section" ? "#f1f1f1" : "#FFFFFF",
     body: [
       {
         type: "tpl",
-        tpl: `<div>${field.name || field.code} ${field.is_required ? '<span class="antd-Form-star">*</span>' : ''}</div>`,
+        tpl: `<div class='${field.type == "section" ? "font-bold" : ""}'>${field.name || field.code} ${field.is_required ? '<span class="antd-Form-star">*</span>' : ''}</div>`,
       },
     ],
     // "id": "u:9b001b7ff92d",
@@ -18119,6 +18140,7 @@ const getFormTableView = async (instance) => {
     trs: await getFormTrs(instance),
     id: "u:047f3669468b",
   };
+  console.log('getFormTableView===>', instance, formSchema);
   return formSchema;
 };
 
@@ -18148,6 +18170,14 @@ const getApplicantTableView = async (instance) => {
     };
   }
 
+  if(applicantInput){
+    if(applicantInput.className){
+      applicantInput.className = `${applicantInput.className} inline-left`;
+    }else {
+      applicantInput.className = `inline-left`;
+    }
+  }
+
   return {
     type: "table-view",
     className: "instance-applicant-view",
@@ -18159,70 +18189,50 @@ const getApplicantTableView = async (instance) => {
             className: "td-title",
             background: "#FFFFFF",
             align: "left",
-            width: "16%",
+            width: "50%",
             colspan: "",
             body: [
               {
                 type: "tpl",
-                tpl: "<div>提交人</div>",
+                tpl: "<div class='inline-left'>提交人:</div>",
                 id: "u:ee62634201bf",
               },
+              applicantInput
             ],
             id: "u:6c24c1bb99c9",
             style: {
               padding: "none",
             },
           },
-          {
-            background: "#FFFFFF",
-            colspan: 1,
-            align: "left",
-            className: "td-field",
-            width: "32%",
-            body: [
-              applicantInput
-            ],
-            id: "u:45d65d91905c",
-          },
           {
             className: "td-title",
             background: "#FFFFFF",
             align: "left",
-            width: "16%",
+            width: "50%",
             colspan: "",
             body: [
               {
                 type: "tpl",
-                tpl: "<div>提交日期</div>",
+                tpl: "<div class='inline-left'>提交日期:</div>",
                 id: "u:6d0a7763d527",
               },
-            ],
-            id: "u:c8b8214ac931",
-            style: {
-              padding: "none",
-            },
-          },
-          {
-            background: "#FFFFFF",
-            colspan: 1,
-            align: "left",
-            className: "td-field",
-            width: "32%",
-            body: [
               {
                 label: false,
                 mode: "horizontal",
-                className: "m-none p-none",
+                className: "m-none p-none inline-left",
                 disabled: true,
                 type: "tpl",
                 inputFormat: "YYYY-MM-DD",
                 valueFormat: "YYYY-MM-DDT00:00:00.000[Z]",
                 tpl: '<div>${submit_date}</div>',
                 id: "u:2016b04355f4",
-              },
+              }
             ],
-            id: "u:81b07d82a5e4",
-          },
+            id: "u:c8b8214ac931",
+            style: {
+              padding: "none",
+            },
+          }
         ],
       },
     ],
@@ -18267,7 +18277,7 @@ const getFlowFormSchema = async (instance, box) => {
     type: "page",
     name: "instancePage",
     className: "steedos-amis-instance-view",
-    bodyClassName: "overflow-y-auto h-full",
+    bodyClassName: "overflow-y-auto h-full steedos-amis-instance-view-body",
     headerClassName: "p-0",
     "title": {
       "type": "steedos-record-detail-header",
@@ -18276,9 +18286,12 @@ const getFlowFormSchema = async (instance, box) => {
       "recordId": instance._id,
       "id": "u:e6b2adbe0e21",
       "showRecordTitle": false,
-      "className": "p-0 m-0 p0 m0"
+      "className": "p-0 m-0 p0 m0 bg-gray-50"
     },
     "css": {
+      ".steedos-amis-instance-view-body": {
+        "height": "calc(100% - 65px)"
+      },
       ".instance-approve-history .antd-Table-table thead": {
         "display": "none"
       },
@@ -18295,11 +18308,14 @@ const getFlowFormSchema = async (instance, box) => {
         "padding": "0px !important"
       },
       ".steedos-amis-instance-view .antd-Page-body": {
-        "width": "710px"
+        "width": "1024px"
       },
       ".antd-List-placeholder": {
         "display": "none"
       },
+      ".steedos-amis-instance-view .antd-Table-fixedTop":{
+        "top": "-13px"
+      },
       ".steedos-amis-instance-view .antd-Table-fixedTop:after":{
         "box-shadow": "none"
       },
@@ -18653,6 +18669,7 @@ const isCurrentStepOpinionField = (field, currentStep)=>{
   return ___default.includes(___default.map(getOpinionFieldStepsName(field), 'stepName'), currentStep?.name);
 };
 
+
 const getInstanceInfo = async (props) => {
   console.log(`getInstanceInfo props`, props);
   const { instanceId, box } = props;
@@ -18738,7 +18755,7 @@ const getInstanceInfo = async (props) => {
   });
 
   const moment = getMoment();
-
+  console.log('getInstanceInfo====>', step, formVersion.fields);
   return {
     box: box,
     _id: instanceId,
@@ -18756,9 +18773,17 @@ const getInstanceInfo = async (props) => {
     title: instance.name || instance.form.name,
     name: instance.name || instance.form.name,
     fields: ___default.map(formVersion.fields, (field) => {
-      return Object.assign({}, field, {
+      const newField = Object.assign({}, field, {
         permission:  userApprove?.type != 'cc' && (step?.permissions[field.code] || ( isCurrentStepOpinionField(field, step) ? 'editable' : '')),
       }) ;
+      if(field.type === 'section'){
+        newField.fields = ___default.map(field.fields, (sfield) => {
+          return Object.assign({}, sfield, {
+            permission:  userApprove?.type != 'cc' && (step?.permissions[sfield.code] || ( isCurrentStepOpinionField(sfield, step) ? 'editable' : '')),
+          });
+        });
+      }
+      return newField;
     }),
     flowVersion: flowVersion,
     formVersion: formVersion,