@steedos-widgets/amis-lib 6.10.18 → 6.10.20

package/dist/index.esm.js

@@ -16903,7 +16903,9 @@ function getInputTableCell(field, showAsInlineEditMode) {
             //     })
             // },
             label: field.label,
-            name: field.name
+            name: field.name,
+            visibleOn: field.visibleOn,
+            requiredOn: field.requiredOn
         }
     }
     else {
@@ -16927,7 +16929,9 @@ function getInputTableCell(field, showAsInlineEditMode) {
             "static": true,
             "readonly": true,
             label: field.label,
-            name: field.name
+            name: field.name,
+            visibleOn: field.visibleOn,
+            requiredOn: field.requiredOn
         }
     }
 }
@@ -17766,7 +17770,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": {
@@ -17892,7 +17897,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 || {})
                     },
                 }
             }
@@ -19168,7 +19174,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 ;
@@ -19256,29 +19262,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",
@@ -19291,7 +19282,7 @@ const getNextStepInput = async (instance) => {
 };
 
 //TODO 只有一个处理人时,默认选中,禁止修改. 部分情况不需要显示下一步处理人
-const getNextStepUsersInput = async (instance) => {
+const getNextStepUsersInput = async (instance, nextStepUserChangeEvents) => {
   if(instance.approve?.type == 'cc'){
     return ;
   }
@@ -19319,7 +19310,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",
@@ -19327,7 +19326,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",
@@ -19372,6 +19379,14 @@ const getNextStepUsersInput = async (instance) => {
             value: '${new_next_step.approver_users}',
             "joinValues": false,
             "extractValue": true,
+            "onEvent": {
+              "change": {
+                "weight": 0,
+                "actions": [
+                  ...nextStepUserChangeEvents
+                ]
+              }
+            }
           },
           {
             type: "list-select",
@@ -19416,6 +19431,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",
@@ -19485,7 +19508,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}",
@@ -19670,10 +19693,11 @@ const getSubmitActions = async (instance, submitEvents) => {
   ];
 };
 
-const getApprovalDrawerSchema = async (instance, submitEvents) => {
+const getApprovalDrawerSchema = async (instance, events) => {
+  const { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents } = events;
   const userId = getSteedosAuth$1().userId;
   const userApprove = getUserApprove({ instance, userId });
-  return {
+  const schema = {
     type: "drawer",
     overlay: false,
     resizable: false,
@@ -19691,6 +19715,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,
@@ -19728,8 +19756,8 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
             //   }
             // }
           },
-          await getNextStepInput(instance),
-          await getNextStepUsersInput(instance),
+          await getNextStepInput(instance, nextStepChangeEvents),
+          await getNextStepUsersInput(instance, nextStepUserChangeEvents),
         ],
         onEvent: {
           "approve_judge_change": {
@@ -19742,6 +19770,11 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
               }
             ]
           },
+          "inited": {
+            "actions": [
+              ...nextStepInitedEvents
+            ]
+          }
           // "approve_next_step_change": {
           //   "actions": [
           //     {
@@ -19805,6 +19838,8 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
       },
     ]
   };
+  console.log(`getApprovalDrawerSchema: `, schema);
+  return schema;
 };
 
 /*
@@ -20089,15 +20124,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 = [
@@ -20399,7 +20441,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)};
@@ -20421,7 +20462,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) {
@@ -20451,6 +20492,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 = [];
@@ -20461,7 +20507,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);
@@ -20489,6 +20544,9 @@ const getFieldReadonlyTpl = async (field, label)=>{
     mode: "horizontal",
     className: "m-none p-none form-control",
   };
+  if(field.formula){
+    tpl.value = `$${field.formula}`;
+  }
   if(includes(['text'], field.type)){
     tpl.type = `static-${field.type}`;
   }else if(field.type === 'select'){
@@ -20609,6 +20667,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",
@@ -20618,7 +20678,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",
@@ -20645,6 +20706,7 @@ const getTds = async (tdFields) => {
 };
 
 const getFormTrs = async (instance) => {
+  // console.log('getFormTrs instance====>', instance);
   const trsSchema = [];
   const trs = [];
   let tdFields = [];
@@ -20799,9 +20861,9 @@ const getFormWizardView = async (instance) => {
 const getApplicantTableView = async (instance) => {
   let applicantInput = null;
   if(instance.state === 'draft'){
-    applicantInput = Object.assign({name: "applicant", value: instance.applicant || getSteedosAuth$1().userId, disabled: instance.box !== 'draft'}, await lookupToAmis$1(
+    applicantInput = Object.assign({name: "__applicant", value: instance.applicant || getSteedosAuth$1().userId, disabled: instance.box !== 'draft'}, await lookupToAmis$1(
       {
-        name: "applicant",
+        name: "__applicant",
         label: false,
         reference_to: "space_users",
         reference_to_field: 'user',
@@ -20809,7 +20871,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,
@@ -20898,7 +20984,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;
   }
@@ -20912,7 +20998,7 @@ const getApproveButton = async (instance, submitEvents)=>{
             componentId: "",
             args: {},
             actionType: "drawer",
-            drawer: await getApprovalDrawerSchema(instance, submitEvents),
+            drawer: await getApprovalDrawerSchema(instance, events),
           },
         ],
       },
@@ -20986,12 +21072,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 功能因为测试到性能问题
@@ -21003,7 +21095,7 @@ const getFlowFormSchema = async (instance, box) => {
       "args": {}
     });
   }
-
+  // console.log('formContentSchema....', formContentSchema)
   return {
     type: "page",
     name: "instancePage",
@@ -21079,7 +21171,6 @@ const getFlowFormSchema = async (instance, box) => {
           },
           formContentSchema,
           await getApplicantTableView(instance),
-          
         ],
         id: "instance_form",
         onEvent: {
@@ -21106,8 +21197,7 @@ const getFlowFormSchema = async (instance, box) => {
               {
                 "actionType": "reload",
                 "componentId": "u:next_step",
-                "args": {
-                }
+                "args": {}
               },
               ...changeEvents
             ]
@@ -21115,7 +21205,7 @@ const getFlowFormSchema = async (instance, box) => {
         }
       },
       await getInstanceApprovalHistory(),
-      await getApproveButton(instance, submitEvents)
+      await getApproveButton(instance, { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents})
     ],
     id: "u:instancePage",
     messages: {},
@@ -21630,6 +21720,15 @@ const getInstanceInfo = async (props) => {
   };
 };
 
+
+
+const getApplicant = async (userId) => {
+  const result = await fetchAPI$1(`/api/formula/user/${userId}`, {
+    method: "get"
+  });
+  return result;
+};
+
 var asc$1 = "Asc";
 var cancel$1 = "Cancel";
 var clear$1 = "Clear";
@@ -22417,5 +22516,5 @@ if (typeof window != 'undefined') {
   currentAmis && currentAmis.registerLocale(locale, getAmisLocaleResource());
 }
 
-export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getAmisLocaleResource, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getCreatedInfoTpl, getDateTimeTpl, getDateTpl, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFieldTpl, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLocationTpl, getLookupSapceUserTreeSchema, getLookupTpl, getModifiedInfoTpl, getNameTpl, getNameTplUrl, getNotifications, getNumberTpl, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getPasswordTpl, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRefObjectNameFieldName, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldTpl, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectMap, getSelectTpl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getSwitchTpl, getTableSchema, getTenantId, getTimeTpl, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUiFieldTpl, getUiFileSizeTpl, getUserId, getUserLanguage$1 as getUserLanguage, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo, uuidv4 };
+export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getAmisLocaleResource, getApp, getApplicant, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getCreatedInfoTpl, getDateTimeTpl, getDateTpl, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFieldTpl, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLocationTpl, getLookupSapceUserTreeSchema, getLookupTpl, getModifiedInfoTpl, getNameTpl, getNameTplUrl, getNotifications, getNumberTpl, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getPasswordTpl, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRefObjectNameFieldName, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldTpl, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectMap, getSelectTpl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getSwitchTpl, getTableSchema, getTenantId, getTimeTpl, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUiFieldTpl, getUiFileSizeTpl, getUserId, getUserLanguage$1 as getUserLanguage, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo, uuidv4 };
 //# sourceMappingURL=index.esm.js.map