Merge branch 'main' into next

packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx

@@ -38,7 +38,7 @@ import { TriggerOptionRender } from './components/TriggerOptionRender';
 import { lang } from './locale';
 import { CategoryTabs } from './WorkflowCategoryTabs';
 import { EnumerationField } from './components/EmunerationField';
-import { useWorkflowFilterActionProps } from './hooks/useWorkflowFilterActionProps';
+import { useResourceFilterActionProps } from './hooks/useResourceFilterActionProps';
 import { ExecutionStatusOptions } from './constants';
 
 function SyncOptionSelect(props) {
@@ -198,7 +198,7 @@ export function WorkflowPane() {
           useTriggersOptions,
           useWorkflowSyncReaction,
           useSyncAction,
-          useWorkflowFilterActionProps,
+          useResourceFilterActionProps,
           useRefreshActionProps,
           useRevisionAction,
           TriggerOptionRender,

packages/plugins/@nocobase/plugin-workflow/src/client/hooks/useResourceFilterActionProps.ts

@@ -14,7 +14,7 @@ import {
   useResourceContext,
 } from '@nocobase/client';
 
-export const useWorkflowFilterActionProps = () => {
+export const useResourceFilterActionProps = () => {
   const { collection } = useResourceContext();
   const options = useFilterFieldOptions(collection.fields);
   const service = useResourceActionContext();

packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx

@@ -101,6 +101,21 @@ export const executionSchema = {
             },
           },
           properties: {
+            filter: {
+              type: 'void',
+              title: '{{ t("Filter") }}',
+              'x-action': 'filter',
+              'x-component': 'Filter.Action',
+              'x-use-component-props': 'useResourceFilterActionProps',
+              'x-component-props': {
+                icon: 'FilterOutlined',
+                nonfilterable: ['workflow'],
+              },
+              'x-align': 'left',
+              default: {
+                $and: [{ status: { $eq: undefined } }],
+              },
+            },
             refresher: {
               type: 'void',
               title: '{{ t("Refresh") }}',

packages/plugins/@nocobase/plugin-workflow/src/client/schemas/workflows.ts

@@ -157,10 +157,10 @@ export const workflowSchema: ISchema = {
                   },
                   'x-action': 'filter',
                   'x-component': 'Filter.Action',
-                  'x-use-component-props': 'useWorkflowFilterActionProps',
+                  'x-use-component-props': 'useResourceFilterActionProps',
                   'x-component-props': {
                     icon: 'FilterOutlined',
-                    nonfilterable: ['description', 'categories'],
+                    nonfilterable: ['id', 'description', 'categories'],
                   },
                   'x-align': 'left',
                 },

packages/plugins/@nocobase/plugin-workflow/src/common/collections/executions.ts

@@ -31,6 +31,18 @@ export default {
       primaryKey: true,
       allowNull: false,
     },
+    {
+      type: 'bigInt',
+      name: 'workflowId',
+      interface: 'id',
+      uiSchema: {
+        type: 'number',
+        title: `{{t("Version ID", { ns: "${NAMESPACE}" })}}`,
+        'x-component': 'InputNumber',
+        'x-component-props': {},
+        'x-read-pretty': true,
+      },
+    },
     {
       type: 'belongsTo',
       name: 'workflow',

packages/plugins/@nocobase/plugin-workflow/src/common/collections/workflows.ts

@@ -21,6 +21,14 @@ export default {
       type: 'snowflakeId',
       primaryKey: true,
       allowNull: false,
+      interface: 'id',
+      uiSchema: {
+        type: 'number',
+        title: '{{t("ID")}}',
+        'x-component': 'InputNumber',
+        'x-component-props': {},
+        'x-read-pretty': true,
+      },
     },
     {
       name: 'key',