@steedos-widgets/amis-lib 6.10.11 → 6.10.13

package/dist/index.cjs.js

@@ -15566,6 +15566,13 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     labelField: 'label',
                     valueField: 'value'
                 };
+                if(field.isAmis){
+                    delete field.mode;
+                    convertData = {
+                        ...convertData,
+                        ...field
+                    };
+                }
                 const select_menuTpl = `<span class='flex items-center mt-0.5'>
                     <span role='img' aria-label='smile' class='anticon anticon-smile'>
                         <span class='slds-icon_container slds-icon-standard-\${REPLACE(icon,'_','-')}'>
@@ -16803,7 +16810,7 @@ function getFormFields(props, mode = "edit") {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
     return (fields || []).map(function (item) {
-        let formItem = {
+        let formItem = item.isAmis ? item : {
             "type": "steedos-field",
             "name": item.name,
             "config": item
@@ -16818,6 +16825,9 @@ function getFormFields(props, mode = "edit") {
 function getInputTableCell(field, showAsInlineEditMode) {
     if (showAsInlineEditMode) {
         // 这里不可以用quickEdit，因为amis存在bug：input-table内的字段在行编辑模式时会受到外层相同name的字段的影响 https://github.com/baidu/amis/issues/9653
+        if(field.isAmis){
+            return field;
+        }
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
@@ -16836,6 +16846,16 @@ function getInputTableCell(field, showAsInlineEditMode) {
         }
     }
     else {
+        if(field.isAmis){
+            return {
+                ...field,
+                inInputTable: true,
+                "static": true,
+                "readonly": true,
+                label: field.label,
+                name: field.name
+            };
+        }
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
@@ -17238,6 +17258,7 @@ function getFormPaginationWrapper(props, form, mode) {
             "method": "get",
             "adaptor": `
                 const formBody = ${JSON.stringify(formBody)};
+                console.log('formBody===>', formBody);
                 return {
                     "body": formBody
                 }
@@ -19617,21 +19638,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 +19975,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,7 +19998,24 @@ 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)=>{
+  console.log('field',field);
   const tpl = {
     label: label === true ? field.name : false,
     name: field.code,
@@ -20185,6 +20223,7 @@ const getFieldEditTpl = async (field, label)=>{
         break;
       case "number":
         tpl.type = "input-number";
+        tpl.precision=2;
         break;
       case "date":
         tpl.type = "input-date";
@@ -20255,6 +20294,7 @@ const getFieldEditTpl = async (field, label)=>{
         tpl.options = getSelectOptions(field);
         break;
       case "odata":
+        const argsName = getArgumentsList(field.filters);
         var labelField = field.formula.substr(1, field.formula.length - 2);
         labelField = labelField.substr(labelField.indexOf(".") + 1);
         tpl.type = "select";
@@ -20262,14 +20302,9 @@ const getFieldEditTpl = async (field, label)=>{
         // tpl.labelField = labelField;
         // tpl.valueField = "_value";
         tpl.source = {
-          url: _$1.startsWith(field.url, "http")
-            ? field.url
-            : `\${context.rootUrl}${field.url}`,
+          url: field.url,
           method: "get",
           dataType: "json",
-          headers: {
-            Authorization: "Bearer ${context.tenantId},${context.authToken}",
-          },
           adaptor:`
             payload.data = {
               options: _.map(payload.value, (item)=>{
@@ -20285,8 +20320,34 @@ const getFieldEditTpl = async (field, label)=>{
               })
             }
             return payload;
-          `
+          `,
+          requestAdaptor: `
+            const filters = ${_.replace(field.filters, /_.pluck/g, '_.map')};
+            const url = ${field.url}
+            if(filters){
+              console.log('filters', filters);
+              const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
+              if(filters.startsWith('function(') || filters.startsWith('function (')){
+                const argsName = ${JSON.stringify(argsName)};
+                const fun = eval('_fun='+filters);
+                const funArgs = [];
+                for(const item of argsName){
+                  funArgs.push(context[item])
+                }
+                api.url = url + joinKey + "$filter=" + fun.apply({}, funArgs)
+              }else{
+                api.url = url + joinKey + "$filter=" + filters
+              }
+            }else{
+              api.url = url  
+            }
+            api.query = {};
+            return api;
+          `,
+          trackExpression: _.join(_.map(argsName, (item)=>{return `\${${item}|json}`}), '-')
         };
+        tpl.isAmis=true;
+        console.log(`odata`, tpl);
         break;
       case "html":
         if (tpl.disabled) {
@@ -20363,7 +20424,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
       map[item.value] = item.label;
     });
     tpl.type = 'static';
-    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data.${field.code}]) || ''%>`;
+    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data["${field.code}"]]) || ''%>`;
   }else if(field.type === 'odata'){
     tpl.type = 'static';
     tpl.tpl = `<div>\${${field.code}['@label']}</div>`;
@@ -20560,7 +20621,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 +20688,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 +20899,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 +20907,6 @@ const getFlowFormSchema = async (instance, box) => {
   else {
     formContentSchema = await getFormTableView(instance);
   }
-
   const amisSchemaStr = instance.formVersion?.amis_schema;
   
   let initedEvents = [];
@@ -20861,7 +20921,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",
@@ -20870,7 +20930,6 @@ const getFlowFormSchema = async (instance, box) => {
     });
   }
 
-  console.log('getFlowFormSchema formContentSchema', formContentSchema);
   return {
     type: "page",
     name: "instancePage",
@@ -21012,7 +21071,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 +21163,18 @@ 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"
+  });
+  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"
+  });
+  return result;
 };
 
 const getStep = ({ flowVersion, stepId }) => {
@@ -21214,17 +21267,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
         }
       }
     }
@@ -21248,8 +21297,11 @@ const getInstanceInfo = async (props) => {
   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 });