@steedos-widgets/amis-lib 6.10.4 → 6.10.6

package/dist/index.cjs.js

@@ -2853,6 +2853,7 @@ var widget_ed = {
 	"steedos-field_type_file": "Attachment",
 	"steedos-field_type_formula": "Formula",
 	"steedos-field_type_summary": "Rollup Summary",
+	"steedos-field_type_approval_comments": "Approval Comments",
 	"steedos-field_label": "Display Name",
 	"steedos-field_api_name": "API Name",
 	"steedos-field_api_name_remark": "The API name can only contain lowercase letters and numbers, must start with a letter, cannot end with an underscore or contain two consecutive underscores.",
@@ -2978,6 +2979,7 @@ var sfield_file = "附件";
 var sfield_formula = "公式";
 var sfield_summary = "累计汇总";
 var sfield_table = "表格";
+var sfield_approval_comments = "审批意见";
 var sfield_settings_panel_title = "设置";
 var sfield_control_advanced = "高级";
 var sfield_control_general = "通用";
@@ -3150,6 +3152,7 @@ var widget_zh = {
 	sfield_formula: sfield_formula,
 	sfield_summary: sfield_summary,
 	sfield_table: sfield_table,
+	sfield_approval_comments: sfield_approval_comments,
 	sfield_settings_panel_title: sfield_settings_panel_title,
 	sfield_control_advanced: sfield_control_advanced,
 	sfield_control_general: sfield_control_general,
@@ -3637,6 +3640,7 @@ var widget_zh = {
 	"steedos-field_type_file": "附件",
 	"steedos-field_type_formula": "公式",
 	"steedos-field_type_summary": "累计汇总",
+	"steedos-field_type_approval_comments": "审批意见",
 	"steedos-field_label": "显示名称",
 	"steedos-field_api_name": "API 名称",
 	"steedos-field_api_name_remark": "API 名称只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符",
@@ -5819,10 +5823,14 @@ function getBatchDelete(objectName){
             if(payload.errors){
                 payload.data.deleteErrorMessage = [];
                 payload.errors.forEach(function(error){
-                    let errorRecord = error.path.map(function (item) {
-                        return item.split('delete__')[1].to_float() + 1;
-                    }).toString();
-                    payload.data.deleteErrorMessage.push("第" + errorRecord + "条记录删除出现异常，报错信息为(" + (window.t ? window.t(error.message) : error.message) + ")");
+                    try {
+                        let errorRecord = error.path.map(function (item) {
+                            return item.split('delete__')[1].to_float() + 1;
+                        }).toString();
+                        payload.data.deleteErrorMessage.push("第" + errorRecord + "条记录删除出现异常，报错信息为(" + (window.t ? window.t(error.message) : error.message) + ")");
+                    } catch (error) {
+                        console.llg(error)
+                    }
                 })
             }
             return payload;
@@ -15290,6 +15298,45 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
     }
 };
 
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-11-04 12:00:23
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-11-11 22:01:39
+ */
+
+function approvalCommentsToAmis(field, readonly, ctx) {
+
+    let approvalComments = `
+        '<div class="instance-sign-item' +  (item.is_finished ? ' mt-1' : ' text-gray-500 border-l-2 px-1 border-blue-500 ' + (item.isMyApprove ? 'my-approve' : '') + ' not-finished') + '">' + 
+            '<p class="m-0 p-0">' + (item.isMyApprove ? (instance_my_approve_description || item.description || '') : (item.description || '')) + '</p>' + 
+            ((item.isMyApprove ? !!(instance_my_approve_description || item.description) : true) ? (item.showApproveSignImage ? item.userSignImage : ('&emsp;&emsp;' + item.handler_name + '&emsp;')) : '') +
+            (item.finishDateFormated || '') + 
+        '</div>'`;
+    let html = `
+        \${JOIN(ARRAYMAP(record.approvalCommentsFields["${field.name}"].comments, item => ${approvalComments}), '') || '&emsp;&emsp;'}
+    `;
+    let approvalCommentsSchema = {
+        "type": "wrapper",
+        "className": "instance-sign",
+        "body": [
+            {
+                "type": "tpl",
+                "tpl": html,
+                "className": "instance-sign-content block m-2.5"
+            },
+            // TODO:签批链接，点击弹出填写签批意见，readonly时不显示签批链接
+        ],
+        "size": "none"
+    };
+    let amisSchema = {
+        "type": "control",
+        "label": field.label,
+        "body": [approvalCommentsSchema]
+    };
+    return amisSchema;
+}
+
 const QUICK_SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
 const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
 // const Lookup = require('./lookup');
@@ -16085,6 +16132,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 }
             }
             break;
+        case 'approval_comments':
+            convertData = approvalCommentsToAmis(field);
+            break;
     }
     if(!___namespace.isEmpty(convertData)){
         const className = convertData.className;
@@ -18722,6 +18772,237 @@ var getDefaultRenderData = function () {
     };
 };
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-10-08 16:26:26
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-11-11 21:23:23
+ * @Description: 
+ */
+
+const getTraceApprovesGroupBySteps = (instance, flow) => {
+  if (!instance || !flow) {
+    return {};
+  }
+
+  const steps = flow.steps;
+  const tracesResult = {};
+
+  (instance.traces || []).forEach(trace => {
+    const step = _$1.find(steps, s => s._id === trace.step);
+    const approves = [];
+
+    (trace.approves || []).forEach(approve => {
+      let judge_name = '';
+      if (trace.is_finished === true) {
+        if (approve.judge === 'approved') {
+          judge_name = amisLib.i18next.t("Instance State approved");
+        } else if (approve.judge === 'rejected') {
+          judge_name = amisLib.i18next.t("Instance State rejected");
+        } else if (approve.judge === 'terminated') {
+          judge_name = amisLib.i18next.t("Instance State terminated");
+        } else if (approve.judge === 'reassigned') {
+          judge_name = amisLib.i18next.t("Instance State reassigned");
+        } else if (approve.judge === 'relocated') {
+          judge_name = amisLib.i18next.t("Instance State relocated");
+        } else if (!approve.judge) {
+          judge_name = "";
+        } else {
+          judge_name = "";
+        }
+      } else {
+        judge_name = amisLib.i18next.t("Instance State pending");
+      }
+
+      approves.push({
+        _id: approve._id,
+        handler: approve.user,
+        handler_name: approve.handler_name,
+        handler_organization_name: approve.handler_organization_name,
+        handler_organization_fullname: approve.handler_organization_fullname,
+        finish_date: approve.finish_date,
+        judge: approve.judge,
+        judge_name: judge_name,
+        description: approve.description,
+        is_finished: approve.is_finished,
+        type: approve.type,
+        opinion_fields_code: approve.opinion_fields_code,
+        sign_field_code: approve.sign_field_code,
+        is_read: approve.is_read,
+        sign_show: approve.sign_show
+      });
+    });
+
+    if (step) {
+      if (tracesResult.hasOwnProperty(step.name)) {
+        tracesResult[step.name] = tracesResult[step.name].concat(approves);
+      } else {
+        tracesResult[step.name] = approves;
+      }
+    }
+  });
+
+  return tracesResult;
+};
+
+const getTraceApprovesByStep = (instance, flow, stepName, only_cc_opinion) => {
+  if (!instance) return [];
+
+  const is_completed = instance?.state === "completed";
+  let completed_date = 0;
+  if (is_completed) {
+    let lastTrace = _$1.last(instance.traces);
+    completed_date = lastTrace && lastTrace.finish_date ? (new Date(lastTrace.finish_date)).getTime() : 0;
+  }
+  if (is_completed && instance.finish_date) {
+    completed_date = (new Date(instance.finish_date)).getTime();
+  }
+
+  const tracesObj = getTraceApprovesGroupBySteps(instance, flow);
+
+  let approves = _$1.clone(tracesObj[stepName] || []);
+
+  const approve_sort = approvesParam => {
+    return _$1.sortBy(approvesParam, approve => {
+      let date = approve.finish_date ? new Date(approve.finish_date) : new Date();
+      return -date.getTime();
+    }) || [];
+  };
+
+  approves = _$1.filter(approves, a => a.type !== "forward" && a.type !== "distribute" && a.type !== "terminated");
+
+  if (only_cc_opinion) {
+    approves = _$1.filter(approves, a => a.type === "cc");
+  }
+
+  let approves_sorted = approve_sort(approves);
+
+  const approvesGroup = _$1.groupBy(approves, "handler");
+
+  function hasNext(approve, group) {
+    const handlerApproves = group[approve.handler];
+    return _$1.indexOf(handlerApproves, approve) + 1 < handlerApproves.length;
+  }
+
+  approves_sorted.forEach(approve => {
+    // showBlank为false时，签字字段上配置的默认意见不会生效
+    const showBlank = true;//Meteor.settings.public.workflow?.showBlankApproveDescription;
+    if (
+      approve.sign_show !== false
+      && (approve.description
+        || (!approve.description && !hasNext(approve, approvesGroup) && !approve.is_finished)
+        || showBlank
+      )
+      && approve.judge !== 'terminated'
+    ) {
+      approve._display = true;
+    }
+  });
+
+  approves_sorted = _$1.filter(approves_sorted, a => {
+    if (is_completed) {
+      return a._display === true && a.is_finished && a.finish_date && (new Date(a.finish_date)).getTime() <= completed_date;
+    } else {
+      return a._display === true;
+    }
+  });
+
+  return approves_sorted;
+};
+
+const isOpinionOfField = (approve, field) => {
+  if (approve.type === "cc" && field.name) {
+    return field.name === approve.sign_field_code;
+  } else {
+    return true;
+  }
+};
+
+const isMyApprove = ({ approve, only_cc_opinion, box, currentApprove, field }) => {
+  if (box !== 'inbox') {
+    return false;
+  }
+
+  if (!approve?._id) {
+    approve = currentApprove;
+  }
+
+  if (
+    approve._id === currentApprove?._id &&
+    currentApprove?.type === 'cc' &&
+    field.name
+  ) {
+    return ___default["default"].indexOf(currentApprove?.opinion_fields_code, field.name) > -1;
+  }
+
+  if (!(currentApprove?.type === 'cc') && only_cc_opinion) {
+    return false;
+  }
+
+  if (currentApprove && approve._id === currentApprove._id) {
+    return true;
+  }
+
+  return false;
+};
+
+const showApprove = (approve, field) => {
+  if (!approve.sign_field_code || approve.sign_field_code === field.name) {
+    if (approve?.is_read) {
+      if (approve.is_finished) {
+        return ["approved", "rejected", "submitted", "readed"].includes(approve.judge);
+      }
+    }
+  }
+  return false;
+};
+
+const isReaded = (judge) => {
+  return ["approved", "rejected", "submitted", "readed"].includes(judge);
+};
+
+const showApproveDefaultDescription = (approve) => {
+  if (approve.is_finished && isReaded(approve.judge)) {
+    return true;
+  }
+  return false;
+};
+
+const showApproveSignImage = (judge) => {
+  return !['returned', 'terminated', 'retrieved'].includes(judge);
+};
+
+const getUserApprove = ({ instance, userId }) => {
+  const currentTrace = _$1.find(instance.traces, (trace) => {
+    return trace.is_finished != true;
+  });
+  let currentApprove = null;
+  if (currentTrace) {
+    currentApprove = _$1.find(currentTrace.approves, (approve) => {
+      return approve.is_finished != true && approve.handler == userId;
+    });
+  }
+
+  //传阅的approve返回最新一条
+  if (!currentApprove || currentApprove.type == "cc") {
+    // 当前是传阅
+    ___default["default"].each(instance.traces, function (t) {
+      ___default["default"].each(t.approves, function (a) {
+        if (a.type == "cc" && a.handler == userId && a.is_finished == false) {
+          currentApprove = a;
+        }
+      });
+    });
+  }
+
+  if (!currentApprove) return;
+
+  if (currentApprove._id) {
+    currentApprove.id = currentApprove._id;
+  }
+  return currentApprove;
+};
+
 //TODO Meteor.settings.public?.workflow?.hideCounterSignJudgeOptions
 
 const HIDE_COUNTER_SIGN_JUDGE_OPTIONS = false;
@@ -19290,6 +19571,8 @@ const getSubmitActions = async (instance, submitEvents) => {
 };
 
 const getApprovalDrawerSchema = async (instance, submitEvents) => {
+  const userId = amisLib.getSteedosAuth().userId;
+  const userApprove = getUserApprove({ instance, userId });
   return {
     type: "drawer",
     overlay: false,
@@ -19327,7 +19610,23 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
             minRows: 3,
             maxRows: 20,
             placeholder: amisLib.i18next.t('frontend_workflow_suggestion_placeholder'),//"请填写意见",
-            requiredOn: "${judge === 'rejected'}"
+            requiredOn: "${judge === 'rejected'}",
+            value: userApprove?.description,
+            "onEvent": {
+              "change": {
+                "actions": [
+                  {
+                    "componentId": "u:instancePage",
+                    "actionType": "setValue",
+                    "args": {
+                      "value": {
+                        "instance_my_approve_description": "${value}"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
           },
           await getNextStepInput(instance),
           await getNextStepUsersInput(instance),
@@ -19668,7 +19967,7 @@ const getSelectOptions = (field) => {
   return options;
 };
 
-const isOpinionField$1 = (field)=>{
+const isOpinionField = (field)=>{
   const field_formula = field.formula;
   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)
 };
@@ -19682,7 +19981,7 @@ const getFieldEditTpl = async (field, label)=>{
     disabled: field.permission !== "editable",
     required: field.is_required
   };
-  if(isOpinionField$1(field)){
+  if(isOpinionField(field)){
     tpl.type = 'input-group';
     tpl.body = [
       {
@@ -20744,83 +21043,6 @@ const getFlowFormSchema = async (instance, box) => {
   };
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-10-08 16:26:26
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-10-08 16:28:42
- * @Description: 
- */
-
-const isOpinionField = (field_formula)=>{
-    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 getOpinionFieldStepsName = (field, top_keywords) => {
-    const field_formula = field.formula;
-    var foo1, opinionFields;
-    opinionFields = new Array();
-    if (isOpinionField(field_formula)) {
-      if (field_formula) {
-        foo1 = field_formula.split(";");
-        foo1.forEach(function(foo) {
-          var json_formula, s1, sf, _ref, _ref1;
-          json_formula = {};
-          try {
-            json_formula = eval("(" + foo + ")");
-          } catch (_error) {
-            json_formula = {};
-          }
-          if (json_formula != null ? json_formula.yijianlan : void 0) {
-            sf = {};
-            sf.stepName = json_formula.yijianlan.step;
-            sf.image_sign = json_formula.yijianlan.image_sign || false;
-            sf.only_cc_opinion = json_formula.yijianlan.only_cc || false;
-            sf.default_description = json_formula.yijianlan["default"];
-            sf.only_handler = json_formula.yijianlan.only_handler;
-            sf.top_keywords = json_formula.yijianlan.top_keywords || top_keywords;
-            return opinionFields.push(sf);
-          } else if ((field_formula != null ? field_formula.indexOf("{traces.") : void 0) > -1 || (field_formula != null ? field_formula.indexOf("{signature.traces.") : void 0) > -1) {
-            sf = {
-              only_cc_opinion: false,
-              image_sign: false,
-              top_keywords: top_keywords
-            };
-            if (foo.indexOf("{signature.") > -1) {
-              sf.image_sign = true;
-              foo = foo.replace("{signature.", "");
-            }
-            s1 = foo.replace("{", "").replace("}", "");
-            if (s1.split(".").length > 1) {
-              sf.stepName = s1.split(".")[1];
-              if (opinionFields.filterProperty("stepName", sf.stepName).length > 0) {
-                if ((_ref = opinionFields.findPropertyByPK("stepName", sf.stepName)) != null) {
-                  _ref.only_cc_opinion = true;
-                }
-              } else {
-                if (s1.split(".").length > 2) {
-                  if (((_ref1 = s1.split(".")[2]) != null ? _ref1.toLocaleLowerCase() : void 0) === 'cc') {
-                    sf.only_cc_opinion = true;
-                  }
-                }
-              }
-            }
-            return opinionFields.push(sf);
-          }
-        });
-      }
-    }
-    return opinionFields;
-};
-
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-09-09 17:47:37
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-11-03 15:17:50
- * @Description:
- */
-
 const getMoment = ()=>{
   if(window.amisRequire){
     return window.amisRequire("moment");
@@ -20835,37 +21057,6 @@ const getTrace = ({ instance, traceId }) => {
   });
 };
 
-const getUserApprove = ({ instance, userId }) => {
-  const currentTrace = _$1.find(instance.traces, (trace) => {
-    return trace.is_finished != true;
-  });
-  let currentApprove = null;
-  if (currentTrace) {
-    currentApprove = _$1.find(currentTrace.approves, (approve) => {
-      return approve.is_finished != true && approve.handler == userId;
-    });
-  }
-
-  //传阅的approve返回最新一条
-  if (!currentApprove || currentApprove.type == "cc") {
-    // 当前是传阅
-    ___default["default"].each(instance.traces, function (t) {
-      ___default["default"].each(t.approves, function (a) {
-        if (a.type == "cc" && a.handler == userId && a.is_finished == false) {
-          currentApprove = a;
-        }
-      });
-    });
-  }
-
-  if (!currentApprove) return;
-
-  if (currentApprove._id) {
-    currentApprove.id = currentApprove._id;
-  }
-  return currentApprove;
-};
-
 const getApproveValues = ({ instance, trace, step, approve, box }) => {
   let instanceValues = null;
   if (!approve || approve.type === "cc") {
@@ -20962,10 +21153,6 @@ const getLastCCStep = ({ traces }, userId) => {
   return step_id;
 };
 
-const isCurrentStepOpinionField = (field, currentStep)=>{
-  return ___default["default"].includes(___default["default"].map(getOpinionFieldStepsName(field), 'stepName'), currentStep?.name);
-};
-
 const isNeedToShowSignImage = (is_finished, judge, traceShowSignImage) => {
   if (traceShowSignImage === false) {
     return false;
@@ -21038,7 +21225,7 @@ const getInstanceInfo = async (props) => {
     }),
   });
   
-
+  const moment = getMoment();
   let userApprove = null;
   let trace = null;
   let step = null;
@@ -21073,8 +21260,77 @@ const getInstanceInfo = async (props) => {
     method: "get",
   });
 
-  const moment = getMoment();
   const signImageCache = new Map();
+  const approvalCommentsFields = {};
+  ___default["default"].each(formVersion.fields, (field) => {
+    if (field.config?.type === "approval_comments") {
+      approvalCommentsFields[field.code] = ___default["default"].clone(field.config);
+    }
+    if (field.type === 'section') {
+      ___default["default"].each(field.fields, (subField) => {
+        if (subField.config?.type === "approval_comments") {
+          approvalCommentsFields[subField.code] = ___default["default"].clone(subField.config);
+        }
+      });
+    }
+  });
+  const myApproveFields = [];
+  for (const field of ___default["default"].values(approvalCommentsFields)) {
+    const fieldSteps = ___default["default"].clone(field.steps);
+    if (fieldSteps && fieldSteps.length > 0) {
+      let fieldComments = [];
+      for (const fieldStep of fieldSteps) {
+        const only_cc_opinion = fieldStep.show_cc && !fieldStep.show_handler;
+        const stepApproves = getTraceApprovesByStep(instance, flowVersion, fieldStep.name, only_cc_opinion);
+        for (const approve of stepApproves) {
+          let userName = approve.handler_name;
+          approve.isOpinionOfField = isOpinionOfField(approve, field);
+          if (approve.isOpinionOfField) {
+            approve.isMyApprove = isMyApprove({ approve, only_cc_opinion, box, currentApprove: userApprove, field });
+            if (approve.isMyApprove) {
+              myApproveFields.push(field);
+            }
+            approve.showApprove = showApprove(approve, field);
+            if (approve.showApprove && !approve.description && fieldStep.default && showApproveDefaultDescription(approve)) {
+              approve.description = fieldStep.default;
+            }
+            if (approve.description){
+              approve.description = approve.description.replace(/\n/g, "<br/>");
+            }
+            if (moment && approve.finish_date){
+              approve.finishDateFormated = moment(approve.finish_date).format("YYYY-MM-DD");
+            }
+            let showSignImage = fieldStep.show_image_sign && showApproveSignImage(approve.judge);
+            if (showSignImage){
+              let userSign, userSignImage;
+              if (signImageCache.has(approve.handler)) {
+                userSign = signImageCache.get(approve.handler);
+              } else {
+                userSign = await getSpaceUserSign(instance.space, approve.handler);
+                signImageCache.set(approve.handler, userSign);
+              }
+              if (userSign){
+                userSignImage = `<img class="image-sign" alt="${userName}" src="/api/v6/files/download/cfs.avatars.filerecord/${userSign}" />`;
+              }
+              approve.showApproveSignImage = !!userSign;
+              approve.userSignImage = userSignImage;
+            }
+          }
+        }        fieldComments = ___default["default"].union(fieldComments, stepApproves);
+      }      field.comments = fieldComments.filter((comment) => {
+        return comment.isOpinionOfField && (comment.isMyApprove || (comment.showApprove && !!comment.description));
+      });
+    }
+  }
+  if (step?.permissions) {
+    // 字段字段
+    ___default["default"].each(approvalCommentsFields, (field) => {
+      delete step.permissions[field.name];
+      if (___default["default"].find(myApproveFields, { name: field.name })) {
+        step.permissions[field.name] = 'editable';
+      }
+    });
+  }
   return {
     box: box,
     _id: instanceId,
@@ -21093,12 +21349,14 @@ const getInstanceInfo = async (props) => {
     name: instance.name || instance.form.name,
     fields: ___default["default"].map(formVersion.fields, (field) => {
       const newField = Object.assign({}, field, {
-        permission:  userApprove?.type != 'cc' && (step?.permissions[field.code] || ( isCurrentStepOpinionField(field, step) ? 'editable' : '')),
+        // permission:  userApprove?.type != 'cc' && (step?.permissions[field.code] || ( isCurrentStepOpinionField(field, step) ? 'editable' : '')),
+        permission:  userApprove?.type != 'cc' && step?.permissions[field.code],
       }) ;
       if(field.type === 'section'){
         newField.fields = ___default["default"].map(field.fields, (sfield) => {
           return Object.assign({}, sfield, {
-            permission:  userApprove?.type != 'cc' && (step?.permissions[sfield.code] || ( isCurrentStepOpinionField(sfield, step) ? 'editable' : '')),
+            // permission:  userApprove?.type != 'cc' && (step?.permissions[sfield.code] || ( isCurrentStepOpinionField(sfield, step) ? 'editable' : '')),
+            permission:  userApprove?.type != 'cc' && step?.permissions[sfield.code],
             type: sfield._type || sfield.type
           });
         });
@@ -21198,6 +21456,7 @@ const getInstanceInfo = async (props) => {
         { name: trace.name, judge: "" }
       );
     })),
+    approvalCommentsFields
   };
 };