From 640f24400eff04b6c7556fbb6a038cab9b5e1b24 Mon Sep 17 00:00:00 2001 From: Sheldon Guo Date: Sun, 2 Mar 2025 12:23:57 +0800 Subject: [PATCH] refactor: replace utils parse import with json-templates parse in multiple files --- packages/core/client/src/block-provider/hooks/index.ts | 3 ++- packages/core/server/src/environment.ts | 2 +- .../plugin-action-custom-request/src/server/actions/send.ts | 3 +-- .../plugin-data-visualization/src/client/hooks/filter.ts | 3 ++- packages/plugins/@nocobase/plugin-users/src/server/server.ts | 2 +- .../src/server/DynamicCalculation.ts | 2 +- .../plugin-workflow/src/client/components/ValueBlock.tsx | 2 +- .../@nocobase/plugin-workflow/src/client/nodes/index.tsx | 4 ++-- .../plugins/@nocobase/plugin-workflow/src/server/Processor.ts | 2 +- .../plugin-workflow/src/server/__tests__/function.test.ts | 2 +- .../src/server/instructions/CalculationInstruction.ts | 1 - 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index 168374889f..441b8bd320 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -12,7 +12,8 @@ import { Field, Form } from '@formily/core'; import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react'; import { untracked } from '@formily/reactive'; import { evaluators } from '@nocobase/evaluators/client'; -import { isURL, parse } from '@nocobase/utils/client'; +import { isURL } from '@nocobase/utils/client'; +import { parse } from '@nocobase/json-templates'; import { App, message } from 'antd'; import _ from 'lodash'; import get from 'lodash/get'; diff --git a/packages/core/server/src/environment.ts b/packages/core/server/src/environment.ts index 7ec8b3045f..f76dc373b2 100644 --- a/packages/core/server/src/environment.ts +++ b/packages/core/server/src/environment.ts @@ -7,7 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { parse } from '@nocobase/utils'; +import { parse } from '@nocobase/json-templates'; import _ from 'lodash'; export class Environment { diff --git a/packages/plugins/@nocobase/plugin-action-custom-request/src/server/actions/send.ts b/packages/plugins/@nocobase/plugin-action-custom-request/src/server/actions/send.ts index 240f52e08b..f1a5035e6a 100644 --- a/packages/plugins/@nocobase/plugin-action-custom-request/src/server/actions/send.ts +++ b/packages/plugins/@nocobase/plugin-action-custom-request/src/server/actions/send.ts @@ -8,8 +8,7 @@ */ import { Context, Next } from '@nocobase/actions'; -import { parse } from '@nocobase/utils'; - +import { parse } from '@nocobase/json-templates'; import { appendArrayColumn } from '@nocobase/evaluators'; import Application from '@nocobase/server'; import axios from 'axios'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts index b6745f9dc4..006efc6ab8 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts @@ -20,7 +20,8 @@ import { useVariables, useLocalVariables, } from '@nocobase/client'; -import { flatten, parse, unflatten } from '@nocobase/utils/client'; +import { flatten, unflatten } from '@nocobase/utils/client'; +import { parse } from '@nocobase/json-templates'; import { useMemoizedFn } from 'ahooks'; import deepmerge from 'deepmerge'; import { default as _, default as lodash } from 'lodash'; diff --git a/packages/plugins/@nocobase/plugin-users/src/server/server.ts b/packages/plugins/@nocobase/plugin-users/src/server/server.ts index d55bb0020a..b1c2c93731 100644 --- a/packages/plugins/@nocobase/plugin-users/src/server/server.ts +++ b/packages/plugins/@nocobase/plugin-users/src/server/server.ts @@ -9,7 +9,7 @@ import { Collection, Model, Op } from '@nocobase/database'; import { InstallOptions, Plugin } from '@nocobase/server'; -import { parse } from '@nocobase/utils'; +import { parse } from '@nocobase/json-templates'; import * as actions from './actions/users'; import { UserModel } from './models/UserModel'; import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync'; diff --git a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/server/DynamicCalculation.ts b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/server/DynamicCalculation.ts index 00f493ec1e..2b372cc256 100644 --- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/server/DynamicCalculation.ts +++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/server/DynamicCalculation.ts @@ -7,7 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { parse } from '@nocobase/utils'; +import { parse } from '@nocobase/json-templates'; import { FlowNodeModel, Instruction, JOB_STATUS, Processor } from '@nocobase/plugin-workflow'; import evaluators, { Evaluator } from '@nocobase/evaluators'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx index 3b46b23c34..acb7e8a86b 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx @@ -9,7 +9,7 @@ import { useFieldSchema } from '@formily/react'; import { css, SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client'; -import { parse } from '@nocobase/utils/client'; +import { parse } from '@nocobase/json-templates'; import React from 'react'; import { useFlowContext } from '../FlowContext'; import { SimpleDesigner } from './SimpleDesigner'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx index 5c1b676754..de839ef8e4 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx @@ -31,8 +31,8 @@ import { usePlugin, useResourceActionContext, } from '@nocobase/client'; -import { parse, str2moment } from '@nocobase/utils/client'; - +import { str2moment } from '@nocobase/utils/client'; +import { parse } from '@nocobase/json-templates'; import WorkflowPlugin from '..'; import { AddButton } from '../AddNodeContext'; import { useFlowContext } from '../FlowContext'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts index 1a6d20dd79..608b4aecf5 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts @@ -10,7 +10,7 @@ import { Model, Transaction, Transactionable } from '@nocobase/database'; import { appendArrayColumn } from '@nocobase/evaluators'; import { Logger } from '@nocobase/logger'; -import { parse } from '@nocobase/utils'; +import { parse } from '@nocobase/json-templates'; import set from 'lodash/set'; import type Plugin from './Plugin'; import { EXECUTION_STATUS, JOB_STATUS } from './constants'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/function.test.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/function.test.ts index 946b4d1bc4..9820ae00b8 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/function.test.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/function.test.ts @@ -10,7 +10,7 @@ import dayjs from 'dayjs'; import { Application } from '@nocobase/server'; import Database from '@nocobase/database'; -import { parse } from '@nocobase/utils'; +import { parse } from '@nocobase/json-templates'; import { dateRangeFns } from '@nocobase/plugin-workflow'; import { getApp, sleep } from '@nocobase/plugin-workflow-test'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CalculationInstruction.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CalculationInstruction.ts index 6512cc4a3b..5a024c74ac 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CalculationInstruction.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/server/instructions/CalculationInstruction.ts @@ -8,7 +8,6 @@ */ import { Evaluator, evaluators } from '@nocobase/evaluators'; -import { parse } from '@nocobase/utils'; import { Instruction } from '.'; import type Processor from '../Processor'; import { JOB_STATUS } from '../constants';