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

package/dist/index.esm.js

@@ -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}";
     // }
@@ -4890,7 +4890,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: 2025-07-14 11:56:42
+ * @LastEditTime: 2025-07-22 14:29:15
  * @Description: 
  */
 
@@ -4964,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');
     `;
@@ -5509,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: 
  */
 
@@ -5540,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",
@@ -6171,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;
@@ -12742,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}"
         };
     }
 
@@ -14192,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 {
@@ -17029,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",
@@ -17222,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",
@@ -18285,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",
@@ -18297,6 +18289,9 @@ const getFlowFormSchema = async (instance, box) => {
       "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"
       },
@@ -18318,6 +18313,9 @@ const getFlowFormSchema = async (instance, box) => {
       ".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"
       },