@steedos-widgets/amis-lib 6.10.11 → 6.10.12

package/dist/index.cjs.js

@@ -18978,6 +18978,7 @@ const showApproveSignImage = (judge) => {
 };
 
 const getUserApprove = ({ instance, userId }) => {
+  console.log(`getUserApprove===>`, instance, userId);
   const currentTrace = _$1.find(instance.traces, (trace) => {
     return trace.is_finished != true;
   });
@@ -19617,21 +19618,21 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
             placeholder: amisLib.i18next.t('frontend_workflow_suggestion_placeholder'),//"请填写意见",
             requiredOn: "${judge === 'rejected'}",
             value: userApprove?.description,
-            "onEvent": {
-              "change": {
-                "actions": [
-                  {
-                    "componentId": "u:instancePage",
-                    "actionType": "setValue",
-                    "args": {
-                      "value": {
-                        "instance_my_approve_description": "${value}"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
+            // "onEvent": {
+            //   "blur": {
+            //     "actions": [
+            //       {
+            //         "componentId": "u:instancePage",
+            //         "actionType": "setValue",
+            //         "args": {
+            //           "value": {
+            //             "instance_my_approve_description": "${value}"
+            //           }
+            //         }
+            //       }
+            //     ]
+            //   }
+            // }
           },
           await getNextStepInput(instance),
           await getNextStepUsersInput(instance),
@@ -19954,7 +19955,7 @@ const getInstanceApprovalHistory = async ()=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-07 16:20:45
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-11-19 17:21:28
+ * @LastEditTime: 2025-11-20 20:13:03
  * @Description:
  */
 
@@ -19977,6 +19978,22 @@ const isOpinionField = (field)=>{
   return (field_formula?.indexOf("{traces.") > -1 || field_formula?.indexOf("{signature.traces.") > -1 || field_formula?.indexOf("{yijianlan:") > -1 || field_formula?.indexOf("{\"yijianlan\":") > -1 || field_formula?.indexOf("{'yijianlan':") > -1)
 };
 
+const getArgumentsList = (func)=>{
+  let funcString;
+  if (typeof func === 'function') {
+    funcString = func.toString();
+  } else {
+    funcString = func;
+  }
+  const regExp = /function\s*\w*\(([\s\S]*?)\)/;
+  if (regExp.test(funcString)) {
+    const argList = RegExp.$1.split(',');
+    return argList.map(arg => arg.replace(/\s/g, ''));
+  } else {
+    return [];
+  }
+};
+
 const getFieldEditTpl = async (field, label)=>{
   const tpl = {
     label: label === true ? field.name : false,
@@ -20255,6 +20272,8 @@ const getFieldEditTpl = async (field, label)=>{
         tpl.options = getSelectOptions(field);
         break;
       case "odata":
+        console.log('odata field', field);
+        const argsName = getArgumentsList(field.filters);
         var labelField = field.formula.substr(1, field.formula.length - 2);
         labelField = labelField.substr(labelField.indexOf(".") + 1);
         tpl.type = "select";
@@ -20267,9 +20286,6 @@ const getFieldEditTpl = async (field, label)=>{
             : `\${context.rootUrl}${field.url}`,
           method: "get",
           dataType: "json",
-          headers: {
-            Authorization: "Bearer ${context.tenantId},${context.authToken}",
-          },
           adaptor:`
             payload.data = {
               options: _.map(payload.value, (item)=>{
@@ -20285,8 +20301,30 @@ const getFieldEditTpl = async (field, label)=>{
               })
             }
             return payload;
+          `,
+          requestAdaptor: `
+            const field = ${JSON.stringify(field)};
+            if(field.filters){
+              const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
+              if(field.filters.startsWith('function(') || field.filters.startsWith('function (')){
+                const argsName = ${JSON.stringify(argsName)};
+                const fun = eval('_fun='+field.filters);
+                const funArgs = [];
+                for(const item of argsName){
+                  funArgs.push(context[item])
+                }
+                api.url = field.url + joinKey + "$filter=" + fun.apply({}, funArgs)
+              }else{
+                api.url = field.url + joinKey + "$filter=" + field.filters
+              }
+            }
+            api.query = {};
+            console.log('api', api);
+            return api;
           `
         };
+        // delete tpl.source;
+        console.log('odata tpl', tpl);
         break;
       case "html":
         if (tpl.disabled) {
@@ -20514,6 +20552,7 @@ const getFormTrs = async (instance) => {
   const trs = [];
   let tdFields = [];
   let fields = [];
+  console.log('getFormTrs===>', instance.fields);
   _$1.each(instance.fields, (field) => {
     fields.push(field);
     if (field.type === "section" && field.fields) {
@@ -20560,7 +20599,7 @@ const getFormTableView = async (instance) => {
 };
 
 const getFormSteps = async (instance) => {
-  const formMode = instance.form.current.mode || "normal";//normal,horizontal,inline
+  const formMode = instance.formVersion.mode || "normal";//normal,horizontal,inline
   const stepsSchema = [];
   let stepFields = [];
   let fields = [];
@@ -20627,7 +20666,7 @@ const getFormSteps = async (instance) => {
 };
 
 const getFormWizardView = async (instance) => {
-  const wizardMode = instance.form.current.wizard_mode || "vertical";//vertical,horizontal
+  const wizardMode = instance.formVersion.wizard_mode || "vertical";//vertical,horizontal
   const formSchema = {
     type: "wizard",
     className: `instance-form-view-wizard ${wizardMode === "horizontal" ? "pt-4" : "pt-1"} mt-3`,
@@ -20838,7 +20877,7 @@ const getScrollToBottomAutoOpenApproveDrawerScript = () => {
 };
 
 const getFlowFormSchema = async (instance, box) => {
-  const formStyle = instance.form.current.style || "table";
+  const formStyle = instance.formVersion.style || "table";
   let formContentSchema;
   if (formStyle === "wizard") {
     formContentSchema = await getFormWizardView(instance);
@@ -20846,7 +20885,7 @@ const getFlowFormSchema = async (instance, box) => {
   else {
     formContentSchema = await getFormTableView(instance);
   }
-
+  console.log(`formContentSchema`, formContentSchema);
   const amisSchemaStr = instance.formVersion?.amis_schema;
   
   let initedEvents = [];
@@ -20861,7 +20900,7 @@ const getFlowFormSchema = async (instance, box) => {
   }
   // if (box == 'inbox' || box == 'draft') {
   // TODO: 临时去掉 AutoOpenApproveDrawer 功能因为测试到性能问题
-  if ((box == 'inbox' || box == 'draft') && window.disableAutoOpenApproveDrawer !== true) {
+  if ((box == 'inbox' || box == 'draft') && window.enableAutoOpenApproveDrawer) {
     // 滚动条滚动到底部弹出底部签批drawer窗口
     initedEvents.push({
       "actionType": "custom",
@@ -21012,7 +21051,7 @@ const getFlowFormSchema = async (instance, box) => {
             "args": {
               "value": "${event.data.context.approveValues}"
             },
-            "expression": "${event.data.context.form.current.style === 'wizard'}"// 表单为 wizard 样式时需要初始同步表单数据，否则直接点击暂存按钮会清空数据
+            "expression": "${event.data.context.flowVersion.style === 'wizard'}"// 表单为 wizard 样式时需要初始同步表单数据，否则直接点击暂存按钮会清空数据
           },
           ...initedEvents
         ]
@@ -21104,24 +21143,20 @@ const getApproveValues = ({ instance, trace, step, approve, box }) => {
   return instanceValues;
 };
 
-const getFlowVersion = (instance) => {
-  if (instance.flow.current._id === instance.flow_version) {
-    return instance.flow.current;
-  } else {
-    return _$1.find(instance.flow.historys, (history) => {
-      return history._id === instance.flow_version;
-    });
-  }
+const getFlowVersion = async (instance) => {
+  const result = await amisLib.fetchAPI(`/api/workflow/flow/${instance.flow._id}/version/${instance.flow_version}`, {
+    method: "get"
+  });
+  console.log(`getFlowVersion: `, result);
+  return result;
 };
 
-const getFormVersion = (instance) => {
-  if (instance.form.current._id === instance.form_version) {
-    return instance.form.current;
-  } else {
-    return _$1.find(instance.form.historys, (history) => {
-      return history._id === instance.form_version;
-    });
-  }
+const getFormVersion = async (instance) => {
+  const result = await amisLib.fetchAPI(`/api/workflow/form/${instance.form._id}/version/${instance.form_version}`, {
+    method: "get"
+  });
+  console.log(`getFormVersion: `, result);
+  return result;
 };
 
 const getStep = ({ flowVersion, stepId }) => {
@@ -21214,17 +21249,13 @@ const getInstanceInfo = async (props) => {
           name,
           style,
           mode,
-          wizard_mode,
-          current,
-          historys
+          wizard_mode
         },
         flow_version,
         flow:flow__expand{
           _id,
           name,
-          perms,
-          current,
-          historys
+          perms
         }
       }
     }
@@ -21245,17 +21276,24 @@ const getInstanceInfo = async (props) => {
   if (!instance) {
     return undefined;
   }
+  console.log(`box====>`, box);
   if (box === "inbox" || box === "draft") {
     userApprove = getUserApprove({ instance, userId });
   }
-  const flowVersion = getFlowVersion(instance);
-  const formVersion = getFormVersion(instance);
+  const flowVersion = await getFlowVersion(instance);
+  const formVersion = await getFormVersion(instance);
+
+  instance.flowVersion = flowVersion;
+  instance.formVersion = formVersion;
 
   if (userApprove) {
     trace = getTrace({ instance, traceId: userApprove.trace });
     step = getStep({ flowVersion, stepId: trace.step });
   }
 
+  console.log(`userApprove===>`, userApprove);
+  console.log(`step===>`, step);
+
   let currentStep = getStep({ flowVersion, stepId: ___default["default"].last(instance.traces).step });
 
   const lastCCStep = getLastCCStep(instance, userId);