test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 11:07:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

amis-saas-6892 [Feature] 纯表达式增加requiredDataPropsVariables属性功能

Browse Source 
Change-Id: I304aaf359dc6f4011e33377ff4f3ea0cfb9860ac
This commit is contained in:
jiatianqi 2022-11-10 19:27:36 +08:00
parent 1d88ae8011
commit 7b4195c3a6
1 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
packages/amis-editor/src/renderer/ExpressionFormulaControl.tsx
View File

@ -12,9 +12,21 @@ import type {VariableItem} from 'amis-ui/lib/components/formula/Editor';
import {resolveVariablesFromScope} from './textarea-formula/utils';
interface ExpressionFormulaControlProps extends FormControlProps {
variables?: any; // 公式变量
/**
* 用于提示的变量集合，默认为空
*/
variables?: Array<VariableItem> | Function;
variableMode?: 'tree' | 'tabs';
/**
* 配合 variables 使用
* 当 props.variables 存在时， 是否再从 amis数据域中取变量集合，默认 false;
*/
requiredDataPropsVariables?: boolean;
/**
* 变量展现模式，可选值：'tabs' ｜ 'tree'
*/
variableMode?: 'tabs' | 'tree';
}
interface ExpressionFormulaControlState {
@ -28,7 +40,8 @@ export default class ExpressionFormulaControl extends React.Component<
ExpressionFormulaControlState
> {
static defaultProps: Partial<ExpressionFormulaControlProps> = {
variableMode: 'tabs'
variableMode: 'tabs',
requiredDataPropsVariables: false
};
isUnmount: boolean;
@ -43,22 +56,12 @@ export default class ExpressionFormulaControl extends React.Component<
componentDidMount() {
this.initFormulaPickerValue(this.props.value);
this.getVariables();
}
componentDidUpdate(prevProps: ExpressionFormulaControlProps) {
// 优先使用props中的变量数据
if (!this.props.variables) {
// 从amis数据域中取变量数据
const {node, manager} = this.props.formProps || this.props;
resolveVariablesFromScope(node, manager).then(variables => {
if (Array.isArray(variables)) {
if (!this.isUnmount && !isEqual(variables, this.state.variables)) {
this.setState({
variables: variables
});
}
}
});
if (this.props.data !== prevProps.data) {
this.getVariables();
}
if (prevProps.value !== this.props.value) {
this.initFormulaPickerValue(this.props.value);
@ -69,6 +72,34 @@ export default class ExpressionFormulaControl extends React.Component<
this.isUnmount = true;
}
// 设置 variables
async getVariables() {
let variablesArr: any[] = [];
const {variables, requiredDataPropsVariables} = this.props;
if (!variables || requiredDataPropsVariables) {
// 从amis数据域中取变量数据
const {node, manager} = this.props.formProps || this.props;
const vars = await resolveVariablesFromScope(node, manager);
if (Array.isArray(vars)) {
if (!this.isUnmount && !isEqual(vars, this.state.variables)) {
variablesArr = vars;
}
}
}
if (variables) {
if (Array.isArray(variables)) {
variablesArr = [...variables, ...variablesArr];
}
if (typeof variables === 'function') {
variablesArr = [...variables(), ...variablesArr];
}
}
this.setState({
variables: variablesArr
});
}
@autobind
initFormulaPickerValue(value: string) {
const formulaPickerValue =
@ -115,12 +146,11 @@ export default class ExpressionFormulaControl extends React.Component<
render() {
const {value, className, variableMode, header, ...rest} = this.props;
const {formulaPickerValue} = this.state;
const {formulaPickerValue, variables} = this.state;
const variables = this.props.variables || this.state.variables;
const highlightValue = FormulaEditor.highlightValue(
formulaPickerValue,
this.state.variables
variables
) || {
html: formulaPickerValue
};