fix(plugin-workflow): fix date range variables (#5954)

* feat: hidden date range variables from nodes which is not filter components

* feat: remove system daterange variables from plugin

* refactor(plugin-workflow): move date range variables to component

* fix(plugin-workflow): remove useless code

---------

Co-authored-by: Linda <huanghui9850@gmail.com>

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

@@ -58,6 +58,7 @@ export function AssignedFieldsFormSchemaConfig(props) {
   const { setFormValueChanged } = useActionContext();
   const api = useAPIClient();
   const scope = useWorkflowVariableOptions();
+
   const { values, setValuesIn, disabled } = useForm();
   const params = toJS(values.params);
   const [dataSourceName, collectionName] = parseCollectionName(values.collection);

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

@@ -9,13 +9,131 @@
 
 import React from 'react';
 
-import { Variable } from '@nocobase/client';
+import { useCompile, Variable } from '@nocobase/client';
+import type { DefaultOptionType } from 'antd/lib/cascader';
 
 import { useWorkflowVariableOptions } from '../variable';
+import { NAMESPACE } from '../locale';
+
+const dateRangeSystemVariables = {
+  key: 'dateRange',
+  label: `{{t('Date range', { ns: '${NAMESPACE}' })}}`,
+  value: 'dateRange',
+  children: [
+    {
+      key: 'yesterday',
+      value: 'yesterday',
+      label: '{{t("Yesterday")}}',
+    },
+    {
+      key: 'today',
+      value: 'today',
+      label: '{{t("Today")}}',
+    },
+    {
+      key: 'tomorrow',
+      value: 'tomorrow',
+      label: '{{t("Tomorrow")}}',
+    },
+    {
+      key: 'lastWeek',
+      value: 'lastWeek',
+      label: '{{t("Last week")}}',
+    },
+    {
+      key: 'thisWeek',
+      value: 'thisWeek',
+      label: '{{t("This week")}}',
+    },
+    {
+      key: 'nextWeek',
+      value: 'nextWeek',
+      label: '{{t("Next week")}}',
+    },
+    {
+      key: 'lastMonth',
+      value: 'lastMonth',
+      label: '{{t("Last month")}}',
+    },
+    {
+      key: 'thisMonth',
+      value: 'thisMonth',
+      label: '{{t("This month")}}',
+    },
+    {
+      key: 'nextMonth',
+      value: 'nextMonth',
+      label: '{{t("Next month")}}',
+    },
+    {
+      key: 'lastQuarter',
+      value: 'lastQuarter',
+      label: '{{t("Last quarter")}}',
+    },
+    {
+      key: 'thisQuarter',
+      value: 'thisQuarter',
+      label: '{{t("This quarter")}}',
+    },
+    {
+      key: 'nextQuarter',
+      value: 'nextQuarter',
+      label: '{{t("Next quarter")}}',
+    },
+    {
+      key: 'lastYear',
+      value: 'lastYear',
+      label: '{{t("Last year")}}',
+    },
+    {
+      key: 'thisYear',
+      value: 'thisYear',
+      label: '{{t("This year")}}',
+    },
+    {
+      key: 'nextYear',
+      value: 'nextYear',
+      label: '{{t("Next year")}}',
+    },
+    {
+      key: 'last7Days',
+      value: 'last7Days',
+      label: '{{t("Last 7 days")}}',
+    },
+    {
+      key: 'next7Days',
+      value: 'next7Days',
+      label: '{{t("Next 7 days")}}',
+    },
+    {
+      key: 'last30Days',
+      value: 'last30Days',
+      label: '{{t("Last 30 days")}}',
+    },
+    {
+      key: 'next30Days',
+      value: 'next30Days',
+      label: '{{t("Next 30 days")}}',
+    },
+    {
+      key: 'last90Days',
+      value: 'last90Days',
+      label: '{{t("Last 90 days")}}',
+    },
+    {
+      key: 'next90Days',
+      value: 'next90Days',
+      label: '{{t("Next 90 days")}}',
+    },
+  ],
+};
 
 export function FilterDynamicComponent({ value, onChange, renderSchemaComponent }) {
-  const scope = useWorkflowVariableOptions();
+  const compile = useCompile();
+  const scope: Partial<DefaultOptionType>[] | (() => Partial<DefaultOptionType>[]) = useWorkflowVariableOptions();
+  const index = scope.findIndex((v) => v.key === '$system');
 
+  scope[index].children.push(compile(dateRangeSystemVariables));
   return (
     <Variable.Input value={value} onChange={onChange} scope={scope}>
       {renderSchemaComponent()}

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

@@ -18,7 +18,8 @@ import {
   LoadingOutlined,
   RedoOutlined,
 } from '@ant-design/icons';
-import { NAMESPACE } from './locale';
+import { i18n } from '@nocobase/client';
+import { NAMESPACE, lang } from './locale';
 
 export const EXECUTION_STATUS = {
   QUEUEING: null,

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

@@ -126,118 +126,6 @@ export default class PluginWorkflowClient extends Plugin {
       label: `{{t("System time", { ns: "${NAMESPACE}" })}}`,
       value: 'now',
     });
-    this.registerSystemVariable({
-      key: 'dateRange',
-      label: `{{t("Date range", { ns: "${NAMESPACE}" })}}`,
-      value: 'dateRange',
-      children: [
-        {
-          key: 'yesterday',
-          value: 'yesterday',
-          label: `{{t("Yesterday")}}`,
-        },
-        {
-          key: 'today',
-          value: 'today',
-          label: `{{t("Today")}}`,
-        },
-        {
-          key: 'tomorrow',
-          value: 'tomorrow',
-          label: `{{t("Tomorrow")}}`,
-        },
-        {
-          key: 'lastWeek',
-          value: 'lastWeek',
-          label: `{{t("Last week")}}`,
-        },
-        {
-          key: 'thisWeek',
-          value: 'thisWeek',
-          label: `{{t("This week")}}`,
-        },
-        {
-          key: 'nextWeek',
-          value: 'nextWeek',
-          label: `{{t("Next week")}}`,
-        },
-        {
-          key: 'lastMonth',
-          value: 'lastMonth',
-          label: `{{t("Last month")}}`,
-        },
-        {
-          key: 'thisMonth',
-          value: 'thisMonth',
-          label: `{{t("This month")}}`,
-        },
-        {
-          key: 'nextMonth',
-          value: 'nextMonth',
-          label: `{{t("Next month")}}`,
-        },
-        {
-          key: 'lastQuarter',
-          value: 'lastQuarter',
-          label: `{{t("Last quarter")}}`,
-        },
-        {
-          key: 'thisQuarter',
-          value: 'thisQuarter',
-          label: `{{t("This quarter")}}`,
-        },
-        {
-          key: 'nextQuarter',
-          value: 'nextQuarter',
-          label: `{{t("Next quarter")}}`,
-        },
-        {
-          key: 'lastYear',
-          value: 'lastYear',
-          label: `{{t("Last year")}}`,
-        },
-        {
-          key: 'thisYear',
-          value: 'thisYear',
-          label: `{{t("This year")}}`,
-        },
-        {
-          key: 'nextYear',
-          value: 'nextYear',
-          label: `{{t("Next year")}}`,
-        },
-        {
-          key: 'last7Days',
-          value: 'last7Days',
-          label: `{{t("Last 7 days")}}`,
-        },
-        {
-          key: 'next7Days',
-          value: 'next7Days',
-          label: `{{t("Next 7 days")}}`,
-        },
-        {
-          key: 'last30Days',
-          value: 'last30Days',
-          label: `{{t("Last 30 days")}}`,
-        },
-        {
-          key: 'next30Days',
-          value: 'next30Days',
-          label: `{{t("Next 30 days")}}`,
-        },
-        {
-          key: 'last90Days',
-          value: 'last90Days',
-          label: `{{t("Last 90 days")}}`,
-        },
-        {
-          key: 'next90Days',
-          value: 'next90Days',
-          label: `{{t("Next 90 days")}}`,
-        },
-      ],
-    });
   }
 }