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

package/dist/index.cjs.js

@@ -10386,7 +10386,10 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
-                _isRelated: true
+                _isRelated: true,
+                record: {
+                    recordPermissions: relatedObjectUiSchema.permissions
+                }
             },
             body:[
                 amisSchema
@@ -16820,6 +16823,7 @@ const getJudgeOptions = async (instance) => {
 
 const getJudgeInput = async (instance) => {
   const judgeOptions = await getJudgeOptions(instance);
+  // console.log('getJudgeInput', judgeOptions);
   if (judgeOptions.length > 0 && instance.approve.type != 'cc') {
     return {
       type: "radios",
@@ -16860,6 +16864,7 @@ const getJudgeInput = async (instance) => {
 
 //TODO 只有一个下一步时,默认选中,并且禁止修改.
 const getNextStepInput = async (instance) => {
+  // console.log('getNextStepInput', instance);
   if(instance.approve?.type == 'cc'){
     return ;
   }
@@ -16895,14 +16900,30 @@ const getNextStepInput = async (instance) => {
               "next_users": null
             },
             "source": {
-              "url": "${context.rootUrl}/api/workflow/v2/nextStep?judge=${new_judge}",
+              "url": "/api/workflow/v2/nextStep?judge=${new_judge}",
               "headers": {
                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
               },
               "method": "post",
               "messages": {
               },
-              "requestAdaptor": "let { context, judge } = api.data; if(!judge){judge='approved'}\nconst formValues = SteedosUI.getRef(api.data.$scopeId).getComponentById(\"instance_form\").getValues();\n\napi.data = {\nflowVersionId: context.flowVersion._id,\n  instanceId: context._id,\n  flowId: context.flow._id,\n  step: context.step,\n  judge: judge,\n  values: formValues\n}\n\n\n return api;",
+              "requestAdaptor": `
+                let { judge } = api.data; 
+                const ctx = api.data.context;
+                if(!judge){
+                  judge='approved'
+                };
+                const formValues = context._scoped.getComponentById("instance_form").getValues();
+                api.data = {
+                  flowVersionId: ctx.flowVersion._id,
+                  instanceId: ctx._id,
+                  flowId: ctx.flow._id,
+                  step: ctx.step,
+                  judge: judge,
+                  values: formValues
+                };
+                return api;
+              `,
               "adaptor": `
                 payload.data = {
                   value: payload.nextSteps.length === 1 ? payload.nextSteps[0]._id : null, 
@@ -17010,7 +17031,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": "\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
+                "adaptor": "debugger;\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
                 "data": {
                   "&": "$$",
                   "$scopeId": "$scopeId",
@@ -17035,8 +17056,8 @@ const getNextStepUsersInput = async (instance) => {
 
 const getCCSubmitRequestAdaptor = async (instance) => {
   return `  
-            const instanceForm = SteedosUI.getRef(api.data.$scopeId).getComponentById("instance_form");
-            const approveValues = SteedosUI.getRef(api.data.$scopeId).getComponentById("instance_approval").getValues();
+            const instanceForm = context._scoped.getComponentById("instance_form");
+            const approveValues = context._scoped.getComponentById("instance_approval").getValues();
             api.data = {
               instanceId: "${instance._id}", 
               traceId: "${instance.trace._id}", 
@@ -17048,9 +17069,9 @@ const getCCSubmitRequestAdaptor = async (instance) => {
 };
 
 const getPostSubmitRequestAdaptor = async (instance) => {
-  return `  const instanceForm = SteedosUI.getRef(api.data.$scopeId).getComponentById("instance_form");
+  return `  const instanceForm = context._scoped.getComponentById("instance_form");
             const formValues = instanceForm.getValues();
-            const approveValues = SteedosUI.getRef(api.data.$scopeId).getComponentById("instance_approval").getValues();
+            const approveValues = context._scoped.getComponentById("instance_approval").getValues();
             let nextUsers = approveValues.next_users;
             if(_.isString(nextUsers)){
               nextUsers = [approveValues.next_users];
@@ -17066,7 +17087,7 @@ const getPostSubmitRequestAdaptor = async (instance) => {
                     approves: [{
                         _id: "${instance.approve._id}",
                         next_steps: [{
-                            step: approveValues.next_step._id,
+                            step: approveValues.next_step,
                             users: nextUsers,
                         }],
                         description: approveValues.suggestion,
@@ -17074,6 +17095,7 @@ const getPostSubmitRequestAdaptor = async (instance) => {
                     }]
                 }]
             }]};
+            console.log('submit api', api);
             api.data = body;
             return api;
             `;
@@ -17081,8 +17103,8 @@ const getPostSubmitRequestAdaptor = async (instance) => {
 
 const getPostEngineRequestAdaptor = async (instance) => {
   return `  
-            const formValues = SteedosUI.getRef(api.data.$scopeId).getComponentById("instance_form").getValues();
-            const approveValues = SteedosUI.getRef(api.data.$scopeId).getComponentById("instance_approval").getValues();
+            const formValues = context._scoped.getComponentById("instance_form").getValues();
+            const approveValues = context._scoped.getComponentById("instance_approval").getValues();
             let nextUsers = approveValues.next_users;
             if(_.isString(nextUsers)){
               nextUsers = [approveValues.next_users];
@@ -17093,7 +17115,7 @@ const getPostEngineRequestAdaptor = async (instance) => {
               trace: "${instance.approve.trace}",
               _id: "${instance.approve._id}",
               next_steps: [{
-                  step: approveValues.next_step._id,
+                  step: approveValues.next_step,
                   users: nextUsers,
               }],
               description: approveValues.suggestion,
@@ -17112,7 +17134,7 @@ const getPostEngineRequestAdaptor = async (instance) => {
  * @returns
  */
 const getSubmitActions = async (instance) => {
-  // console.log(`getSubmitActions instance====`, instance)
+  console.log(`getSubmitActions instance====`, instance);
   let api = "";
   let requestAdaptor = "";
   if(instance.approve?.type == "cc"){
@@ -17129,7 +17151,9 @@ const getSubmitActions = async (instance) => {
       return null; //TODO 考虑异常情况?
     }
   }
-
+  console.log(`getSubmitActions api====`, api);
+  console.log(`getSubmitActions requestAdaptor====`, requestAdaptor);
+  console.log('getObjectListViewPath========>', amisLib.Router.getObjectListViewPath({appId: "${appId}", objectName: "${objectName}", listViewName: "${side_listview_id}"}));
   return [
     // 校验表单
     {
@@ -17137,7 +17161,7 @@ const getSubmitActions = async (instance) => {
       "args": {},
       "actionType": "custom",
       "script": `
-        // console.log("======getSubmitActions");
+        console.log("======getSubmitActions");
         const form = event.context.scoped.getComponentById("instance_form");
         return form.validate().then((instanceFormValidate)=>{
           event.setData({...event.data, instanceFormValidate})
@@ -17161,7 +17185,7 @@ const getSubmitActions = async (instance) => {
       componentId: "",
       args: {
         api: {
-          url: `\${context.rootUrl}${api}`,
+          url: `${api}`,
           method: "post",
           dataType: "json",
           data: {
@@ -17197,7 +17221,7 @@ const getSubmitActions = async (instance) => {
 };
 
 const getApprovalDrawerSchema = async (instance) => {
-  // console.log("=============getApprovalDrawerSchema=============")
+  console.log("=============getApprovalDrawerSchema=============", instance);
   return {
     type: "drawer",
     overlay: true,
@@ -17211,7 +17235,7 @@ const getApprovalDrawerSchema = async (instance) => {
     bodyClassName: 'p-2',
     footerClassName: 'p-2 pt-0',
     drawerContainer: ()=>{
-      return window.$(".antd-Page-content",window.$(".steedos-instance-wrapper"))[0];
+      return document.body;
     },
     body: [
       {
@@ -17360,15 +17384,11 @@ const getAttachments = async (instance)=>{
                         {
                             type: 'tpl',
                             inline: true,
-                            tpl: `<a href='\${context.rootUrl}/api/files/instances/\${_id}?download=true' target='_blank'>\${original.name}</a>`
+                            tpl: `<a href='/api/v6/files/download/cfs.instances.filerecord/\${_id}/\${original.name}?download=true' target='_blank'>\${original.name}</a>`
                         }
                       ],
                       "actions": [
-                        {
-                          "icon": "fa fa-eye",
-                          "type": "button",
-                          "id": "u:ef52fa8940a8"
-                        }
+                        
                       ],
                       "id": "u:550b3fdc8788"
                     },
@@ -17414,7 +17434,7 @@ const getAttachmentUploadInput = async (instance)=>{
             "extractValue": false,
             "valueField": "version_id",
             "receiver": {
-              "url": "${context.rootUrl}/api/v4/instances/s3",
+              "url": "/api/instance/${context._id}/file",
               headers: {
                 Authorization: "Bearer ${context.tenantId},${context.authToken}"
               },
@@ -17426,7 +17446,7 @@ const getAttachmentUploadInput = async (instance)=>{
                 api.data.append('instance', '${instance._id}');
                 api.data.append('approve', '${instance.approve?._id}');
                 api.data.append('owner', '${auth.userId}');
-                api.data.append('owner_name', '${auth.name}');
+                api.data.append('owner_name', '${auth.user.name}');
                 return api;
               `
             },
@@ -17505,11 +17525,6 @@ const getRelatedInstances = async (instance)=>{
             }
           ],
           "actions": [
-            {
-              "icon": "fa fa-eye",
-              "type": "button",
-              "id": "u:ef52fa8940a8"
-            }
           ],
           "id": "u:550b3fdc8788"
         },
@@ -18280,6 +18295,7 @@ const getFlowFormSchema = async (instance, box) => {
     name: "instancePage",
     className: "steedos-amis-instance-view",
     bodyClassName: "overflow-y-auto h-full",
+    headerClassName: "p-0",
     "title": {
       "type": "steedos-record-detail-header",
       "label": "标题面板",
@@ -18301,6 +18317,25 @@ const getFlowFormSchema = async (instance, box) => {
       ".antd-List-heading": {
         "font-size": "14px",
         "font-weight": "500"
+      },
+      ".steedos-object-record-detail-header .antd-Grid-col--mdAuto": {
+        "padding": "0px !important"
+      },
+      ".steedos-amis-instance-view .antd-Page-body": {
+        "width": "710px"
+      },
+      ".antd-List-placeholder": {
+        "display": "none"
+      },
+      ".steedos-amis-instance-view .antd-Table-fixedTop:after":{
+        "box-shadow": "none"
+      },
+      ".antd-List-items": {
+        "border": '0px'
+      },
+      ".antd-ListItem": {
+        "border-top": "0px  !important",
+        "background": "transparent !important"
       }
     },
     body: [
@@ -18645,7 +18680,9 @@ const isCurrentStepOpinionField = (field, currentStep)=>{
   return ___default["default"].includes(___default["default"].map(getOpinionFieldStepsName(field), 'stepName'), currentStep?.name);
 };
 
-const getInstanceInfo = async ({ instanceId, box }) => {
+const getInstanceInfo = async (props) => {
+  console.log(`getInstanceInfo props`, props);
+  const { instanceId, box } = props;
   const userId = amisLib.getSteedosAuth().userId;
   const query = `{
       instance: instances__findOne(id:"${instanceId}"){