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

package/dist/amis-object.esm.css

@@ -271,12 +271,12 @@ fieldset.antd-Collapse > legend{
     border: var(--Form-input-borderWidth) solid transparent;
     border-radius: var(--Form-input-borderRadius);
 }
-
+/* 
 .antd-Picker .antd-Picker-input .antd-Picker-values .antd-Picker-value{
-    /* lookup字段值选中项值字符很多超长时换行，包括单选和多选 */
+    // lookup字段值选中项值字符很多超长时换行，包括单选和多选
     white-space: break-spaces;
     word-break: break-all;
-}
+} */
 
 .steedos-crud-mode-cards .antd-Card-actions a[disabled]{
     box-shadow: none;
@@ -1841,8 +1841,17 @@ fieldset.antd-Collapse > legend{
 .steedos-object-button.antd-Button {
   margin-right: 0px;
 }
+.steedos-object-record-detail-header button[class~="steedos-object-button"] {
+  margin-left: 4px;
+}
+.steedos-object-listview-content-wrapper button[class~="steedos-object-button"] {
+  margin-left: 4px;
+}
+.steedos-record-related-header button[class~="steedos-object-button"] {
+  margin-left: 4px;
+}
 /* 魔方定义的按钮，连续的按钮左侧加间隔分开，第一个按钮不会识别此样式 */
-.steedos-object-button + .steedos-object-button {
+.steedos-object-button + .steedos-object-button button {
   margin-left: 4px;
 }
 /* 魔方定义的按钮，如果是显示在下拉菜单作为菜单按钮则不能加间隔 */

package/dist/amis-object.esm.js

@@ -13536,7 +13536,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
@@ -19970,6 +19973,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",
@@ -20010,6 +20014,7 @@ const getJudgeInput = async (instance) => {
 
 //TODO 只有一个下一步时,默认选中,并且禁止修改.
 const getNextStepInput = async (instance) => {
+  // console.log('getNextStepInput', instance);
   if(instance.approve?.type == 'cc'){
     return ;
   }
@@ -20045,14 +20050,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, 
@@ -20160,7 +20181,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",
@@ -20185,8 +20206,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}", 
@@ -20198,9 +20219,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];
@@ -20216,7 +20237,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,
@@ -20224,6 +20245,7 @@ const getPostSubmitRequestAdaptor = async (instance) => {
                     }]
                 }]
             }]};
+            console.log('submit api', api);
             api.data = body;
             return api;
             `;
@@ -20231,8 +20253,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];
@@ -20243,7 +20265,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,
@@ -20262,7 +20284,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"){
@@ -20279,7 +20301,9 @@ const getSubmitActions = async (instance) => {
       return null; //TODO 考虑异常情况?
     }
   }
-
+  console.log(`getSubmitActions api====`, api);
+  console.log(`getSubmitActions requestAdaptor====`, requestAdaptor);
+  console.log('getObjectListViewPath========>', Router$1.getObjectListViewPath({appId: "${appId}", objectName: "${objectName}", listViewName: "${side_listview_id}"}));
   return [
     // 校验表单
     {
@@ -20287,7 +20311,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})
@@ -20311,7 +20335,7 @@ const getSubmitActions = async (instance) => {
       componentId: "",
       args: {
         api: {
-          url: `\${context.rootUrl}${api}`,
+          url: `${api}`,
           method: "post",
           dataType: "json",
           data: {
@@ -20347,7 +20371,7 @@ const getSubmitActions = async (instance) => {
 };
 
 const getApprovalDrawerSchema = async (instance) => {
-  // console.log("=============getApprovalDrawerSchema=============")
+  console.log("=============getApprovalDrawerSchema=============", instance);
   return {
     type: "drawer",
     overlay: true,
@@ -20361,7 +20385,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: [
       {
@@ -20510,15 +20534,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"
                     },
@@ -20564,7 +20584,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}"
               },
@@ -20576,7 +20596,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;
               `
             },
@@ -20655,11 +20675,6 @@ const getRelatedInstances = async (instance)=>{
             }
           ],
           "actions": [
-            {
-              "icon": "fa fa-eye",
-              "type": "button",
-              "id": "u:ef52fa8940a8"
-            }
           ],
           "id": "u:550b3fdc8788"
         },
@@ -21430,6 +21445,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": "标题面板",
@@ -21451,6 +21467,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: [
@@ -21795,7 +21830,9 @@ const isCurrentStepOpinionField = (field, currentStep)=>{
   return _$1__default.includes(_$1__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 = getSteedosAuth().userId;
   const query = `{
       instance: instances__findOne(id:"${instanceId}"){
@@ -22316,9 +22353,9 @@ var AmisObjectButton = function (props) {
     if (button.type === "amis_button") {
         var amisSchema = button.amis_schema;
         var schema = isString(amisSchema) ? JSON.parse(amisSchema) : amisSchema;
-        if (schema && schema.body.length > 0) {
-            delete schema.body[0]['visibleOn'];
-        }
+        // if(schema && schema.body.length > 0){
+        //     delete schema.body[0]['visibleOn']
+        // }
         if (schema && schema.body.length > 0 && button.visibleOn) {
             schema.body[0]['visibleOn'] = button.visibleOn;
         }
@@ -22344,6 +22381,14 @@ var AmisObjectButton = function (props) {
             schema.data = createObject(data, defaultsDeep$1(renderData, schema.data, { context: data.context, global: data.global, }));
             delete schema.data.event;
         }
+        // if(!has(JSON.parse(JSON.stringify(data)), 'record')){
+        //     if(schema && schema.data){
+        //         schema.data.record = null;
+        //     }
+        //     renderData.record = null;
+        // }
+        // console.log(`steedos-button button--->`, button);
+        // console.log(`steedos-button schema--->`, schema);
         return (React__default.createElement(React__default.Fragment, null, button && amisSchema ? (React__default.createElement(React__default.Fragment, null, render('body', schema, {
             // 这里的信息会作为 props 传递给子组件，一般情况下都不需要这个,
             data: renderData,
@@ -25079,6 +25124,7 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
+                console.log("===AmisObjectForm=props==", props);
                 $schema = props.$schema, recordId = props.recordId, mode = props.mode, _a = props.layout, layout = _a === void 0 ? "horizontal" : _a, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _b = props.excludedFields, excludedFields = _b === void 0 ? null : _b, _c = props.fields, fields = _c === void 0 ? null : _c, _d = props.form, form = _d === void 0 ? {} : _d, _e = props.className, className = _e === void 0 ? "" : _e, enableInitApi = props.enableInitApi, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode, submitSuccActions = props.submitSuccActions, data = props.data, formDataFilter = props.formDataFilter, onFormDataFilter = props.onFormDataFilter, env = props.env;
                 defaultData = props.defaultData;
                 objectApiName = props.objectApiName || "space_users";
@@ -25168,11 +25214,11 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                     formData.recordId = props.recordId;
                 }
                 amisSchema.className = "steedos-object-form ".concat(className);
-                // console.log('AmisObjectForm amisSchema======>', amisSchema)
                 amisSchema.data = Object.assign({}, amisSchema.data || {}, formData, { global: globalData, uiSchema: uiSchema });
                 if (has(props, 'objectApiName')) {
                     amisSchema.data.objectName = objectApiName;
                 }
+                console.log('AmisObjectForm amisSchema======>', amisSchema);
                 return [2 /*return*/, amisSchema];
         }
     });
@@ -25574,9 +25620,9 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
                 e_1 = _d.sent();
                 console.warn(e_1);
                 return [3 /*break*/, 6];
-            case 6: 
-            // console.log(`AmisRecordDetailHeader==>`, config)
-            return [2 /*return*/, config];
+            case 6:
+                console.log("AmisRecordDetailHeader==>", config);
+                return [2 /*return*/, config];
         }
     });
 }); };
@@ -27504,7 +27550,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     label: false,
                     className: 'm-0',
                     tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
-                    popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
+                    popOver: window.showLookupPopOver && fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
                         "trigger": "hover",
                         "className": "steedos-record-detail-popover",
                         "position": "left-bottom",
@@ -27606,7 +27652,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     type: 'static',
                     className: 'm-0',
                     tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
-                    popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
+                    popOver: window.showLookupPopOver && fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
                         "trigger": "hover",
                         "className": "steedos-record-detail-popover",
                         "position": "left-bottom",
@@ -28210,6 +28256,7 @@ var AmisInstanceDetail = function (props) { return __awaiter(void 0, void 0, voi
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
+                console.log("AmisInstanceDetail", props);
                 instanceId = props.instanceId, boxName = props.boxName, data = props.data;
                 return [4 /*yield*/, getInstanceInfo({ instanceId: instanceId, box: boxName })];
             case 1:
@@ -28219,7 +28266,7 @@ var AmisInstanceDetail = function (props) { return __awaiter(void 0, void 0, voi
                 schema = _a.sent();
                 // console.log(`AmisInstanceDetail schema`, schema);
                 schema.data = __assign$2(__assign$2({ "&": "$$", recordLoaded: true, submit_date: instanceInfo.submit_date, applicant_name: instanceInfo.applicant_name, related_instances: instanceInfo.related_instances, historyApproves: instanceInfo.historyApproves, boxName: boxName }, instanceInfo.approveValues), { context: Object.assign({}, data.context, instanceInfo), record: instanceInfo, applicant: instanceInfo.applicant._id });
-                // console.log(`AmisInstanceDetail schema`, schema)
+                console.log("AmisInstanceDetail schema", schema);
                 return [2 /*return*/, schema];
         }
     });