@steedos-widgets/amis-lib 6.10.18 → 6.10.20

package/dist/index.cjs.js

@@ -16930,7 +16930,9 @@ function getInputTableCell(field, showAsInlineEditMode) {
             //     })
             // },
             label: field.label,
-            name: field.name
+            name: field.name,
+            visibleOn: field.visibleOn,
+            requiredOn: field.requiredOn
         }
     }
     else {
@@ -16954,7 +16956,9 @@ function getInputTableCell(field, showAsInlineEditMode) {
             "static": true,
             "readonly": true,
             label: field.label,
-            name: field.name
+            name: field.name,
+            visibleOn: field.visibleOn,
+            requiredOn: field.requiredOn
         }
     }
 }
@@ -17793,7 +17797,8 @@ async function getButtonActions(props, mode) {
                     // "__tableItems": `\${${props.name}|json|toJson}`
                     // 在节点嵌套情况下，当前节点正好是带children属性的节点的话，这里弹出的dialog映射到的会是children数组，这是amis目前的规则，
                     // 所以这里加判断有children时，用__super.__super让映射到正确的作用域层，如果不加，则__tableItems取到的会是children数组，而不是整个子表组件的值
-                    "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
+                    "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`,
+                    ...(props.actionData || {})
                 },
                 "actions": dialogButtons,
                 "onEvent": {
@@ -17919,7 +17924,8 @@ async function getButtonActions(props, mode) {
                         // "__tableItems": `\${((__super.parent ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
                         // 在节点嵌套情况下，当前节点正好是带children属性的节点的话，这里弹出的dialog映射到的会是children数组，这是amis目前的规则，
                         // 所以这里加判断有children时，用__super.__super让映射到正确的作用域层，如果不加，则__tableItems取到的会是children数组，而不是整个子表组件的值
-                        "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`
+                        "__tableItems": `\${((children ? __super.__super.${props.name} : __super.${props.name}) || [])|json|toJson}`,
+                        ...(props.actionData || {})
                     },
                 }
             }
@@ -19195,7 +19201,7 @@ const getJudgeInput = async (instance) => {
 };
 
 //TODO 只有一个下一步时,默认选中,并且禁止修改.
-const getNextStepInput = async (instance) => {
+const getNextStepInput = async (instance, nextStepChangeEvents) => {
   // console.log('getNextStepInput', instance);
   if(instance.approve?.type == 'cc'){
     return ;
@@ -19283,29 +19289,14 @@ const getNextStepInput = async (instance) => {
                 "judge": "${new_judge}",
               }
             },
-            // "onEvent": {
-            //   "change": {
-            //     "weight": 0,
-            //     "actions": [
-            //       {
-            //         "componentId": "instance_approval",
-            //         "args": {
-            //           "value": {
-            //             new_next_step: "${event.data.value}",
-            //           }
-            //         },
-            //         "actionType": "setValue"
-            //       },
-            //       // {
-            //       //   "args": {
-            //       //     next_step: "${event.data.value}",
-            //       //   },
-            //       //   "actionType": "broadcast",
-            //       //   eventName: "approve_next_step_change"
-            //       // },
-            //     ]
-            //   }
-            // }
+            "onEvent": {
+              "change": {
+                "weight": 0,
+                "actions": [
+                  ...nextStepChangeEvents
+                ]
+              }
+            }
           },
         ],
         id: "u:4d3a884b437c",
@@ -19318,7 +19309,7 @@ const getNextStepInput = async (instance) => {
 };
 
 //TODO 只有一个处理人时,默认选中,禁止修改. 部分情况不需要显示下一步处理人
-const getNextStepUsersInput = async (instance) => {
+const getNextStepUsersInput = async (instance, nextStepUserChangeEvents) => {
   if(instance.approve?.type == 'cc'){
     return ;
   }
@@ -19346,7 +19337,15 @@ const getNextStepUsersInput = async (instance) => {
             label: "",
             name: "next_users", 
             hiddenOn: "this.new_next_step.deal_type != 'pickupAtRuntime' || this.new_next_step.step_type == 'counterSign'",
-            required: true
+            required: true,
+            "onEvent": {
+              "change": {
+                "weight": 0,
+                "actions": [
+                  ...nextStepUserChangeEvents
+                ]
+              }
+            }
           },
           {
             type: "steedos-select-user",
@@ -19354,7 +19353,15 @@ const getNextStepUsersInput = async (instance) => {
             name: "next_users", 
             hiddenOn: "this.new_next_step.deal_type != 'pickupAtRuntime' || this.new_next_step.step_type != 'counterSign'",
             required: true,
-            multiple: true
+            multiple: true,
+            "onEvent": {
+              "change": {
+                "weight": 0,
+                "actions": [
+                  ...nextStepUserChangeEvents
+                ]
+              }
+            }
           },
           {
             type: "list-select",
@@ -19399,6 +19406,14 @@ const getNextStepUsersInput = async (instance) => {
             value: '${new_next_step.approver_users}',
             "joinValues": false,
             "extractValue": true,
+            "onEvent": {
+              "change": {
+                "weight": 0,
+                "actions": [
+                  ...nextStepUserChangeEvents
+                ]
+              }
+            }
           },
           {
             type: "list-select",
@@ -19443,6 +19458,14 @@ const getNextStepUsersInput = async (instance) => {
             value: '${new_next_step.approver_users}',
             "joinValues": false,
             "extractValue": true,
+            "onEvent": {
+              "change": {
+                "weight": 0,
+                "actions": [
+                  ...nextStepUserChangeEvents
+                ]
+              }
+            }
           },
           // {
           //   type: "steedos-select-user",
@@ -19512,7 +19535,7 @@ const getPostSubmitRequestAdaptor = async (instance) => {
             const body = {Instances: [{
                 _id: "${instance._id}",
                 flow: "${instance.flow._id}",
-                applicant: formValues.applicant,
+                applicant: formValues.__applicant,
                 submitter: formValues.submitter,
                 traces: [{
                     _id: "${instance.trace._id}",
@@ -19697,10 +19720,11 @@ const getSubmitActions = async (instance, submitEvents) => {
   ];
 };
 
-const getApprovalDrawerSchema = async (instance, submitEvents) => {
+const getApprovalDrawerSchema = async (instance, events) => {
+  const { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents } = events;
   const userId = amisLib.getSteedosAuth().userId;
   const userApprove = getUserApprove({ instance, userId });
-  return {
+  const schema = {
     type: "drawer",
     overlay: false,
     resizable: false,
@@ -19718,6 +19742,10 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
     body: [
       {
         type: "form",
+        initApi: {
+          method: 'POST',
+          url: '/api/v6/amis/health_check'
+        },
         debug: false,
         id: "instance_approval",
         resetAfterSubmit: true,
@@ -19755,8 +19783,8 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
             //   }
             // }
           },
-          await getNextStepInput(instance),
-          await getNextStepUsersInput(instance),
+          await getNextStepInput(instance, nextStepChangeEvents),
+          await getNextStepUsersInput(instance, nextStepUserChangeEvents),
         ],
         onEvent: {
           "approve_judge_change": {
@@ -19769,6 +19797,11 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
               }
             ]
           },
+          "inited": {
+            "actions": [
+              ...nextStepInitedEvents
+            ]
+          }
           // "approve_next_step_change": {
           //   "actions": [
           //     {
@@ -19832,6 +19865,8 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
       },
     ]
   };
+  console.log(`getApprovalDrawerSchema: `, schema);
+  return schema;
 };
 
 /*
@@ -20116,15 +20151,22 @@ const getArgumentsList = (func)=>{
 };
 
 const getFieldEditTpl = async (field, label)=>{
-  console.log('field',field);
+  // console.log('field',field)
   const tpl = {
     label: label === true ? field.name : false,
     name: field.code,
     mode: "horizontal",
     className: "m-none p-none form-control",
     disabled: field.permission !== "editable",
-    required: field.is_required
+    required: field.is_required,
+    visibleOn: field.visibleOn,
+    requiredOn: field.requiredOn
   };
+
+  if(field.formula){
+    tpl.value = `$${field.formula}`;
+  }
+  
   if(isOpinionField(field)){
     tpl.type = 'input-group';
     tpl.body = [
@@ -20426,7 +20468,6 @@ const getFieldEditTpl = async (field, label)=>{
             const filters = \`${_.replace(field.filters, /_.pluck/g, '_.map')}\`;
             const url = \`${field.url}\`;
             if(filters){
-              console.log('filters', filters);
               const joinKey = url.indexOf('?') > 0 ? '&' : '?';
               if(filters.startsWith('function(') || filters.startsWith('function (')){
                 const argsName = ${JSON.stringify(argsName)};
@@ -20448,7 +20489,7 @@ const getFieldEditTpl = async (field, label)=>{
           trackExpression: _.join(_.map(argsName, (item)=>{return `\${${item}|json}`}), '-')
         };
         tpl.isAmis=true;
-        console.log(`odata`, tpl);
+        // console.log(`odata`, tpl)
         break;
       case "html":
         if (tpl.disabled) {
@@ -20478,6 +20519,11 @@ const getFieldEditTpl = async (field, label)=>{
         tpl.editable = tpl.addable;
         tpl.copyable = tpl.addable;
         tpl.removable = tpl.addable;
+        if(tpl.addable){
+          tpl.actionData = {
+            "&" : "$$"
+          };
+        }
         // tpl.fieldPrefix = field.name + "_";
         tpl.autoGeneratePrimaryKeyValue = true;
         tpl.fields = [];
@@ -20488,7 +20534,16 @@ const getFieldEditTpl = async (field, label)=>{
           if (sField.type != "hidden") {
             sField.permission = field.permission;
             const column = await getTdInputTpl(sField, true);
+          // console.log('table column', column, sField);
             if(column.type === 'steedos-field'){
+              if(sField.visibleOn){
+                column.config.visibleOn = sField.visibleOn;
+              }
+
+              if(sField.requiredOn){
+                column.config.requiredOn = sField.requiredOn;
+              }
+
               tpl.fields.push(column.config);
             }else {
               tpl.fields.push(column);
@@ -20516,6 +20571,9 @@ const getFieldReadonlyTpl = async (field, label)=>{
     mode: "horizontal",
     className: "m-none p-none form-control",
   };
+  if(field.formula){
+    tpl.value = `$${field.formula}`;
+  }
   if(_$1.includes(['text'], field.type)){
     tpl.type = `static-${field.type}`;
   }else if(field.type === 'select'){
@@ -20636,6 +20694,8 @@ const getTdField = async (field, fieldsCount) => {
 };
 
 const getTdTitle = (field) => {
+  const requiredOn = field.config?.amis.requiredOn;
+  // console.log('getTdTitle', field.is_required , requiredOn, field);
   return {
     className: `td-title td-title-${field.type}`,
     align: field.type != "section" ? "center" : "left",
@@ -20645,7 +20705,8 @@ const getTdTitle = (field) => {
     body: [
       {
         type: "tpl",
-        tpl: `<div class='${field.type == "section" ? "font-bold" : ""}'>${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} <span class="antd-Form-star">*</span></div>`,
+        className: field.is_required ? 'steedos-field-required' : (requiredOn ? {'steedos-field-required' : `${requiredOn}`} : '')
       },
     ],
     // "id": "u:9b001b7ff92d",
@@ -20672,6 +20733,7 @@ const getTds = async (tdFields) => {
 };
 
 const getFormTrs = async (instance) => {
+  // console.log('getFormTrs instance====>', instance);
   const trsSchema = [];
   const trs = [];
   let tdFields = [];
@@ -20826,9 +20888,9 @@ const getFormWizardView = async (instance) => {
 const getApplicantTableView = async (instance) => {
   let applicantInput = null;
   if(instance.state === 'draft'){
-    applicantInput = Object.assign({name: "applicant", value: instance.applicant || amisLib.getSteedosAuth().userId, disabled: instance.box !== 'draft'}, await amisLib.lookupToAmis(
+    applicantInput = Object.assign({name: "__applicant", value: instance.applicant || amisLib.getSteedosAuth().userId, disabled: instance.box !== 'draft'}, await amisLib.lookupToAmis(
       {
-        name: "applicant",
+        name: "__applicant",
         label: false,
         reference_to: "space_users",
         reference_to_field: 'user',
@@ -20836,7 +20898,31 @@ const getApplicantTableView = async (instance) => {
       },
       false,
       {}
-    ));
+    ), {
+        "onEvent": {
+          "change": {
+            "actions": [
+              {
+                "actionType": "ajax",
+                "api": {
+                  "url": "/api/formula/user/${__applicant}",
+                  "method": "get",
+                  "messages": {
+                    "success": "",
+                    "failed": ""
+                  },
+                  "silent": true,
+                  "adaptor": "return {applicantInfo: payload}"
+                }
+              },
+              {
+                "actionType": "custom",
+                "script": "doAction({'componentId': 'u:instancePage',  'actionType': 'setValue',  'args': {    'value': {      'applicant': event.data.applicantInfo   }  }}) "
+              }
+            ]
+          }
+        } 
+    });
   }else {
     applicantInput = {
       label: false,
@@ -20925,7 +21011,7 @@ const getApplicantTableView = async (instance) => {
   };
 };
 
-const getApproveButton = async (instance, submitEvents)=>{
+const getApproveButton = async (instance, events)=>{
   if(!instance.approve || ( instance.box != 'inbox' && instance.box != 'draft')){
     return null;
   }
@@ -20939,7 +21025,7 @@ const getApproveButton = async (instance, submitEvents)=>{
             componentId: "",
             args: {},
             actionType: "drawer",
-            drawer: await getApprovalDrawerSchema(instance, submitEvents),
+            drawer: await getApprovalDrawerSchema(instance, events),
           },
         ],
       },
@@ -21013,12 +21099,18 @@ const getFlowFormSchema = async (instance, box) => {
   let initedEvents = [];
   let changeEvents = [];
   let submitEvents = [];
+  let nextStepInitedEvents = [];
+  let nextStepChangeEvents = [];
+  let nextStepUserChangeEvents = [];
 
   if(amisSchemaStr){
     const onEvent = JSON.parse(instance.formVersion.amis_schema).onEvent;
-    initedEvents = onEvent?.inited.actions || [];
-    changeEvents = onEvent?.change.actions || [];
-    submitEvents = onEvent?.submit.actions || [];
+    initedEvents = onEvent?.inited?.actions || [];
+    changeEvents = onEvent?.change?.actions || [];
+    submitEvents = onEvent?.submit?.actions || [];
+    nextStepInitedEvents = onEvent?.nextStepInited?.actions || [];
+    nextStepChangeEvents = onEvent?.nextStepChange?.actions || [];
+    nextStepUserChangeEvents = onEvent?.nextStepUserChange.actions || [];
   }
   // if (box == 'inbox' || box == 'draft') {
   // TODO: 临时去掉 AutoOpenApproveDrawer 功能因为测试到性能问题
@@ -21030,7 +21122,7 @@ const getFlowFormSchema = async (instance, box) => {
       "args": {}
     });
   }
-
+  // console.log('formContentSchema....', formContentSchema)
   return {
     type: "page",
     name: "instancePage",
@@ -21106,7 +21198,6 @@ const getFlowFormSchema = async (instance, box) => {
           },
           formContentSchema,
           await getApplicantTableView(instance),
-          
         ],
         id: "instance_form",
         onEvent: {
@@ -21133,8 +21224,7 @@ const getFlowFormSchema = async (instance, box) => {
               {
                 "actionType": "reload",
                 "componentId": "u:next_step",
-                "args": {
-                }
+                "args": {}
               },
               ...changeEvents
             ]
@@ -21142,7 +21232,7 @@ const getFlowFormSchema = async (instance, box) => {
         }
       },
       await getInstanceApprovalHistory(),
-      await getApproveButton(instance, submitEvents)
+      await getApproveButton(instance, { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents})
     ],
     id: "u:instancePage",
     messages: {},
@@ -21657,6 +21747,15 @@ const getInstanceInfo = async (props) => {
   };
 };
 
+
+
+const getApplicant = async (userId) => {
+  const result = await amisLib.fetchAPI(`/api/formula/user/${userId}`, {
+    method: "get"
+  });
+  return result;
+};
+
 var asc$1 = "Asc";
 var cancel$1 = "Cancel";
 var clear$1 = "Clear";
@@ -22466,6 +22565,7 @@ exports.filtersToConditions = filtersToConditions;
 exports.getAmisInputTableSchema = getAmisInputTableSchema;
 exports.getAmisLocaleResource = getAmisLocaleResource;
 exports.getApp = getApp;
+exports.getApplicant = getApplicant;
 exports.getApps = getApps;
 exports.getAuthToken = getAuthToken;
 exports.getAuthorization = getAuthorization;