fix(approval): 审批-发起, 去除硬编码 & 给审批-发起,添加默认的筛选条件 (#1544)

Reviewed-on: daoyoucloud/tachybase#1544
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: bai.zixv <bai.zixv@foxmail.com>
Co-committed-by: bai.zixv <bai.zixv@foxmail.com>

packages/plugins/@hera/plugin-approval-mobile/src/client/approval/component/ApprovalTemplateType.tsx

@@ -21,7 +21,7 @@ export const ApprovalTemplateType = observer((props) => {
       })
       .then((res) => {
         const columnsData = res.data.data.map((value) => {
-          return { label: value.title?.replace('审批流:', '') || '', value: value.id };
+          return { label: value.title || '', value: value.id };
         });
         columnsData.unshift({
           value: 'all',

packages/plugins/@hera/plugin-approval-mobile/src/client/approval/initiations/component/ApprovalItem.tsx

@@ -93,7 +93,7 @@ const changService = (api, setData, user, filter, t, setDefaultData, cm, compile
       const result = res.data?.data.map((item) => {
         const priorityType = ApprovalPriorityType.find((priorityItem) => priorityItem.value === item.data.priority);
         const statusType = approvalTodoListStatus(item, t);
-        const categoryTitle = item.workflow.title.replace('审批流:', '');
+        const categoryTitle = item.workflow.title;
         const collectionName = item.workflow?.config?.collection || item.execution?.context?.collectionName;
         const summary = Object.entries(item.summary)?.map(([key, value]) => {
           const field = cm.getCollectionField(`${collectionName}.${key}`);

packages/plugins/@hera/plugin-approval-mobile/src/client/approval/initiations/component/InitiationsItem.tsx

@@ -37,13 +37,13 @@ export const InitiationsItem = observer((props) => {
               <div
                 style={{ display: 'flex', flexDirection: 'column', alignContent: 'center' }}
                 onClick={(c) => {
-                  navigate(`/mobile/${value.title?.replace('审批流:', '') || ''}/approval/${value.id}/page`);
+                  navigate(`/mobile/${value.title || ''}/approval/${value.id}/page`);
                 }}
               >
                 <div>
                   <TeamFill />
                 </div>
-                {value.title?.replace('审批流:', '') || ''}
+                {value.title || ''}
               </div>
             ),
           };

packages/plugins/@hera/plugin-approval-mobile/src/client/approval/todos/component/TabApprovalItem.tsx

@@ -106,7 +106,7 @@ const changeApprovalRecordsService = (api, params, filter, cm, compile, t, setDa
       const result = res.data?.data.map((item) => {
         const priorityType = ApprovalPriorityType.find((priorityItem) => priorityItem.value === item.snapshot.priority);
         const statusType = approvalTodoListStatus(item, t);
-        const categoryTitle = item.workflow.title.replace('审批流:', '');
+        const categoryTitle = item.workflow.title;
         const collectionName = item.workflow?.config?.collection || item.execution?.context?.collectionName;
 
         const summary = Object.entries(item.summary)?.map(([key, value]) => {
@@ -165,7 +165,7 @@ const changeUsersJobsService = (api, t, cm, compile, input, setData, params, fil
           (priorityItem) => priorityItem.value === item.execution.context?.data?.priority,
         );
         const statusType = ExecutionStatusOptions.find((value) => value.value === item.status);
-        const categoryTitle = item.workflow.title.replace('审批流:', '');
+        const categoryTitle = item.workflow.title;
         const nickName = item.execution?.context?.data?.createdBy?.nickname;
         return {
           ...item,
@@ -225,7 +225,7 @@ export const changeWorkflowNoticeService = (api, t, cm, compile, input, setData,
         const priorityType = ApprovalPriorityType.find(
           (priorityItem) => priorityItem.value === item.snapshot?.priority,
         );
-        const categoryTitle = item.workflow.title.replace('审批流:', '');
+        const categoryTitle = item.workflow.title;
         const collectionName = item.collectionName;
         const summary = Object.entries(item.summary).map(([key, value]) => {
           const field = cm.getCollectionField(`${collectionName}.${key}`);

packages/plugins/@tachybase/plugin-workflow/src/client/features/approval/usage/approval-block/launch/VC.ApprovalBlockLaunchApplication.tsx

@@ -34,9 +34,26 @@ export const ApprovalBlockLaunchApplication = (props) => {
       resource: decorator?.collection,
       action: decorator?.action,
       params: {
-        pageSize: 99999,
+        pagination: false,
-        filter: { ...decorator?.params?.filter },
         sort: 'createdAt',
+        filter: {
+          $and: [
+            // NOTE: 将审批类型的且处于启用状态的筛选出来
+            {
+              type: {
+                $eq: 'approval',
+              },
+            },
+            {
+              enabled: {
+                $eq: true,
+              },
+            },
+            {
+              ...decorator?.params?.filter,
+            },
+          ],
+        },
       },
     },
     {
@@ -133,7 +150,7 @@ export const ApprovalBlockLaunchApplication = (props) => {
                       onClick(item);
                     }}
                   >
-                    {item.title.replace('审批流:', '')}
+                    {item.title}
                   </Button>
                 </Col>
               );