diff --git a/lerna.json b/lerna.json
index 238704286d..67983e6d05 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,9 +2,7 @@
"version": "1.6.0-alpha.28",
"npmClient": "yarn",
"useWorkspaces": true,
- "npmClientArgs": [
- "--ignore-engines"
- ],
+ "npmClientArgs": ["--ignore-engines"],
"command": {
"version": {
"forcePublish": true,
diff --git a/packages/core/client/src/schema-component/antd/variable/TextAreaWithGlobalScope.tsx b/packages/core/client/src/schema-component/antd/variable/TextAreaWithGlobalScope.tsx
index 124be3dca0..e7cd3421d6 100644
--- a/packages/core/client/src/schema-component/antd/variable/TextAreaWithGlobalScope.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/TextAreaWithGlobalScope.tsx
@@ -35,13 +35,14 @@ interface TextAreaWithGlobalScopeProps {
password?: boolean;
number?: boolean;
boolean?: boolean;
+ expression?: boolean;
value?: any;
scope?: string | object;
[key: string]: any;
}
export const TextAreaWithGlobalScope = connect((props: TextAreaWithGlobalScopeProps) => {
- const { supportsLineBreak, password, number, boolean, ...others } = props;
+ const { supportsLineBreak, password, number, boolean, input, expression = true, ...others } = props;
const scope = useEnvironmentVariableOptions(props.scope);
const fieldNames = { value: 'name', label: 'title' };
@@ -57,5 +58,13 @@ export const TextAreaWithGlobalScope = connect((props: TextAreaWithGlobalScopePr
if (boolean) {
return ;
}
- return ;
+
+ if (input) {
+ return ;
+ }
+ if (expression) {
+ return ;
+ }
+
+ return ;
}, mapReadPretty(Input.ReadPretty));
diff --git a/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx b/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx
index 294b53bf23..f1c0a8587f 100644
--- a/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-email/src/client/ConfigForm.tsx
@@ -174,8 +174,9 @@ export const ChannelConfigForm = () => {
'x-decorator': 'FormItem',
'x-component': 'TextAreaWithGlobalScope',
'x-component-props': {
- // useTypedConstant: ['string'],
+ useTypedConstant: ['string'],
placeholder: `noreply `,
+ expression: false,
},
},
},