@steedos-widgets/amis-lib 6.10.2-beta.3 → 6.10.4

package/dist/index.cjs.js

@@ -19353,23 +19353,23 @@ const getApprovalDrawerSchema = async (instance, submitEvents) => {
           //     }
           //   ]
           // },
-          validateError: {
-            weight: 0,
-            actions: [
-              {
-                "componentId": "",
-                "args": {
-                  "msgType": "info",
-                  "position": "top-right",
-                  "closeButton": true,
-                  "showIcon": true,
-                  "title": amisLib.i18next.t('frontend_workflow_submit_validate_error_title'),//"提交失败",
-                  "msg": amisLib.i18next.t('frontend_workflow_submit_validate_error_msg'),//"请填写必填字段"
-                },
-                "actionType": "toast"
-              }
-            ],
-          }
+          // validateError: {
+          //   weight: 0,
+          //   actions: [
+          //     {
+          //       "componentId": "",
+          //       "args": {
+          //         "msgType": "info",
+          //         "position": "top-right",
+          //         "closeButton": true,
+          //         "showIcon": true,
+          //         "title": i18next.t('frontend_workflow_submit_validate_error_title'),//"提交失败",
+          //         "msg": i18next.t('frontend_workflow_submit_validate_error_msg'),//"请填写必填字段"
+          //       },
+          //       "actionType": "toast"
+          //     }
+          //   ],
+          // }
         },
         
       },
@@ -19604,7 +19604,7 @@ const getRelatedInstances = async (instance)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-24 16:48:28
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-08-28 01:38:39
+ * @LastEditTime: 2025-11-03 11:16:43
  * @Description: 
  */
 
@@ -19628,19 +19628,19 @@ const getInstanceApprovalHistory = async ()=>{
             "name": "user_name",
             "label": "user_name",
             "type": "tpl",
-            "tpl": "<div><div>${opinion}</div>${user_name}</div>"
+            "tpl": "<div><div>${opinion}</div>${user_name|raw}</div>"
           },
           {
             "name": "finish_date",
             "label": "finish_date",
-            "classNameExpr": "<%= data.finish_date == i18next.t('frontend_workflow_approval_history_read') ? 'text-[blue]' : (data.finish_date == i18next.t('frontend_workflow_approval_history_unprocessed') ? 'text-[red]' : '') %>"
+            "classNameExpr": `<%= data.finish_date == '${amisLib.i18next.t('frontend_workflow_approval_history_read')}' ? 'text-[blue]' : (data.finish_date == '${amisLib.i18next.t('frontend_workflow_approval_history_unprocessed')}' ? 'text-[red]' : '') %>`
             // "type": "datetime",
             // "format": "YYYY-MM-DD HH:mm"
           },
           {
             "name": "judge",
             "label": "judge",
-            "classNameExpr": "<%= data.judge == i18next.t('frontend_workflow_approval_judge_approved') ? 'text-green-600' : (data.judge == i18next.t('frontend_workflow_approval_judge_rejected') ? 'text-[red]' : '') %>"
+            "classNameExpr": `<%= data.judge == '${amisLib.i18next.t('frontend_workflow_approval_judge_approved')}' ? 'text-green-600' : (data.judge == '${amisLib.i18next.t('frontend_workflow_approval_judge_rejected')}' ? 'text-[red]' : '') %>`
           }
         ]
       }
@@ -19650,7 +19650,7 @@ const getInstanceApprovalHistory = async ()=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-07 16:20:45
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-09-08 14:35:29
+ * @LastEditTime: 2025-10-30 13:40:31
  * @Description:
  */
 
@@ -20480,11 +20480,54 @@ const getApproveButton = async (instance, submitEvents)=>{
     },
     id: "steedos-approve-button",
     level: "primary",
-    className:
-      "approve-button w-14 h-14 rounded-full fixed bottom-4 right-4 shadow-lg text-white text-base text-center font-semibold bg-blue-500 p-0",
+    className: {
+      "approve-button w-14 h-14 rounded-full fixed bottom-4 right-4 shadow-lg text-white text-base text-center font-semibold bg-blue-500 p-0": true,
+      "hidden": instance.box === 'draft'
+    }
   }
 };
 
+const getScrollToBottomAutoOpenApproveDrawerScript = () => {
+  return `
+    (function () {
+      setTimeout(function () {
+        var bodyEl = document.querySelector('.steedos-amis-instance-view-body');
+        if (!bodyEl) return;
+        var btn = document.querySelector('.approve-button');
+        if (!btn) return;
+
+        var lastAtBottom = false; // 上一个scroll事件是否到底
+
+        function isAtBottom() {
+          var scrollTop = bodyEl.scrollTop,
+            scrollHeight = bodyEl.scrollHeight,
+            clientHeight = bodyEl.clientHeight;
+          return (scrollHeight <= clientHeight) || (scrollTop + clientHeight >= scrollHeight - 2);
+        }
+
+        // wheel: 只要现在到底、且是向下滚，即可弹出
+        bodyEl.addEventListener('wheel', function (e) {
+          var atBottom = isAtBottom();
+          if (atBottom && e.deltaY > 0) {
+            // [wheel] 拖动条在底部且向下滚，弹drawer
+            btn.click();
+          }
+        });
+
+        // scroll: 拖动时仅“从非底部->底部”瞬间弹
+        bodyEl.addEventListener('scroll', function () {
+          var atBottom = isAtBottom();
+          if (!lastAtBottom && atBottom) {
+            // [scroll] 拖动条到底，弹drawer
+            btn.click();
+          }
+          lastAtBottom = atBottom;
+        });
+      }, 1000);
+    })();
+  `;
+};
+
 const getFlowFormSchema = async (instance, box) => {
   const formStyle = instance.form.current.style || "table";
   let formContentSchema;
@@ -20503,9 +20546,17 @@ const getFlowFormSchema = async (instance, box) => {
 
   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 || [];
+  }
+  if (box == 'inbox' || box == 'draft') {
+    // 滚动条滚动到底部弹出底部签批drawer窗口
+    initedEvents.push({
+      "actionType": "custom",
+      "script": getScrollToBottomAutoOpenApproveDrawerScript(),
+      "args": {}
+    });
   }
 
   console.log('getFlowFormSchema formContentSchema', formContentSchema);
@@ -20588,23 +20639,23 @@ const getFlowFormSchema = async (instance, box) => {
         ],
         id: "instance_form",
         onEvent: {
-          validateError: {
-            weight: 0,
-            actions: [
-              {
-                "componentId": "",
-                "args": {
-                  "msgType": "info",
-                  "position": "top-right",
-                  "closeButton": true,
-                  "showIcon": true,
-                  "title": amisLib.i18next.t('frontend_workflow_submit_validate_error_title'),//"提交失败",
-                  "msg": amisLib.i18next.t('frontend_workflow_submit_validate_error_msg'),//"请填写必填字段"
-                },
-                "actionType": "toast"
-              }
-            ],
-          },
+          // validateError: {
+          //   weight: 0,
+          //   actions: [
+          //     {
+          //       "componentId": "",
+          //       "args": {
+          //         "msgType": "info",
+          //         "position": "top-right",
+          //         "closeButton": true,
+          //         "showIcon": true,
+          //         "title": i18next.t('frontend_workflow_submit_validate_error_title'),//"提交失败",
+          //         "msg": i18next.t('frontend_workflow_submit_validate_error_msg'),//"请填写必填字段"
+          //       },
+          //       "actionType": "toast"
+          //     }
+          //   ],
+          // },
           change: {
             weight: 0,
             actions: [
@@ -20622,7 +20673,7 @@ const getFlowFormSchema = async (instance, box) => {
       await getInstanceApprovalHistory(),
       await getApproveButton(instance, submitEvents)
     ],
-    id: "u:63849ea39e12",
+    id: "u:instancePage",
     messages: {},
     pullRefresh: {},
     regions: [
@@ -20633,6 +20684,11 @@ const getFlowFormSchema = async (instance, box) => {
       "@data.@instanceDetail.changed": {
         actions: [
           {
+            actionType: "custom",
+            script:"debugger;",
+          },
+          {
+            componentId:"u:instancePage",
             actionType: "reload"
           }
         ]
@@ -20649,22 +20705,7 @@ const getFlowFormSchema = async (instance, box) => {
           },
           ...initedEvents
         ]
-      },
-      // inited: {
-      //   weight: 0,
-      //   actions: [
-      //     // {
-      //     //   componentId: "steedos-approve-button",
-      //     //   actionType: "click",
-      //     // },
-      //     // {
-      //     //   "componentId": "",
-      //     //   "args": {},
-      //     //   "actionType": "drawer",
-      //     //   "drawer": await getApprovalDrawerSchema()
-      //     // }
-      //   ],
-      // }
+      }
     },
     initApi:{
       "url": "${context.rootUrl}/graphql",
@@ -20696,8 +20737,6 @@ const getFlowFormSchema = async (instance, box) => {
         return payload;
       `,
       "data": {
-        // "&": "$$",
-        // "context": "${context}",
         "judge": "${new_judge}",
       }
     },
@@ -20778,7 +20817,7 @@ const getOpinionFieldStepsName = (field, top_keywords) => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-09 17:47:37
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-09-01 23:33:14
+ * @LastEditTime: 2025-11-03 15:17:50
  * @Description:
  */
 
@@ -20927,6 +20966,26 @@ 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;
+  }
+  if (!is_finished) {
+    return false;
+  }
+  if (['returned', 'terminated', 'retrieved'].includes(judge)) {
+    return false;
+  }
+  return true;
+};
+
+const getSpaceUserSign = async (space, handler) => {
+  const result = await amisLib.fetchAPI(`/api/v1/space_user_signs?filters=[["space","=","${space}"],["user","=","${handler}"]]&fields=["sign"]`);
+  if (result?.data?.items && result.data.items.length > 0) {
+    return result.data.items[0].sign;
+  }
+  return null;
+};
 
 const getInstanceInfo = async (props) => {
   const { instanceId, box } = props;
@@ -21015,6 +21074,7 @@ const getInstanceInfo = async (props) => {
   });
 
   const moment = getMoment();
+  const signImageCache = new Map();
   return {
     box: box,
     _id: instanceId,
@@ -21058,14 +21118,28 @@ const getInstanceInfo = async (props) => {
     forward_from_instance: instance.forward_from_instance,
     cc_users: instance.cc_users,
     traces: instance.traces,
-    historyApproves: ___default["default"].map(instance.traces, (trace) => {
+    historyApproves: await Promise.all(___default["default"].map(instance.traces, async (trace) => {
       return Object.assign(
         {
-          children: ___default["default"].map(trace.approves, (approve) => {
+          children: await Promise.all(___default["default"].map(trace.approves, async (approve) => {
             let finishDate = approve.finish_date;
             let judge = approve.judge;
             let userName = approve.user_name;
             let opinion = approve.description;
+            const traceShowSignImage = true;
+            let showSignImage = isNeedToShowSignImage(approve.is_finished, approve.judge, traceShowSignImage);
+            let userSign;
+            if (showSignImage) {
+              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){
+                userName = `<img class="image-sign" alt="${userName}" src="/api/v6/files/download/cfs.avatars.filerecord/${userSign}" />`;
+              }
+            }
             if(approve.type === 'cc'){
               userName = `${userName} (传阅)`;
               opinion = approve.cc_description;
@@ -21119,11 +21193,11 @@ const getInstanceInfo = async (props) => {
               judge: judge,
               opinion: opinion,
             };
-          }),
+          })),
         },
         { name: trace.name, judge: "" }
       );
-    }),
+    })),
   };
 };