amis 1.9.1-beta.13 → 1.9.1-beta.19

package/lib/utils/formula.js

@@ -180,12 +180,13 @@ function registerFormulaExec(execMode, formulaExec) {
 exports.registerFormulaExec = registerFormulaExec;
 // 用于判断是否优先使用value。
 function isExpression(expression) {
-    if (!(0, isString_1.default)(expression)) {
+    if (!expression || !(0, isString_1.default)(expression)) {
         // 非字符串类型，比如：Object、Array类型、boolean、number类型
         return false;
     }
-    // 备注: "\\${xxx}"不作为表达式，至少含一个${xxx}才算是表达式
-    return /(?<!\\)(\${).+(\})/.test(expression);
+    // 备注1: "\\${xxx}"不作为表达式，至少含一个${xxx}才算是表达式
+    // 备注2: safari 不支持 /(?<!\\)(\${).+(\})/.test(expression) 
+    return /(^|[^\\])\$\{.+\}/.test(expression);
 }
 exports.isExpression = isExpression;
 // 用于判断是否需要执行表达式:

package/lib/utils/formula.js.map

@@ -6,8 +6,8 @@
         "/src/utils/formula.ts"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import isObjectByLodash from 'lodash/isObject';\nimport isString from 'lodash/isString';\nimport isBoolean from 'lodash/isBoolean';\nimport {\n  getVariable,\n  isPureVariable,\n  resolveVariable,\n  resolveVariableAndFilter,\n  evaluate\n} from 'amis-formula';\n\nimport {filter} from './tpl';\nimport {getFilters} from './tpl-builtin';\nimport {collectVariables} from './grammar';\n\n/**\n * formulaExec 运算器：根据当前字符串类型执行对应运算，也可按指定执行模式执行运算\n *\n * 运算模式（execMode）支持以下取值:\n * 1. tpl: 按模板字符串执行（JavaScript 模板引擎），比如：Hello ${amisUser.email}、<h1>Hello</h1>, <span>${amisUser.email}</span>；\n *    备注: 在模板中可以自由访问变量，详细请见：https://www.lodashjs.com/docs/lodash.template；\n * 2. formula: 按新版公式表达式执行，用于执行 ${ xxx } 格式的表达式；\n *    支持从window、localStorage、sessionStorage获取数据，比如：${num1 + 2}、${ls:env}、${window:document}、${window:document.URL}、${amisUser.email}；\n *    详细请见：https://aisuda.bce.baidu.com/amis/zh-CN/docs/concepts/data-mapping#namespace\n * 3. evalFormula: 按新版公式表达式执行，用于执行 ${ xxx } 和 非${ xxx } 格式的表达式（evalMode 为 true，不用 ${} 包裹也可以执行），功能同 formula 运算模式；\n * 4. js: 按Javascript执行，表达式中可以通过data.xxx来获取指定数据，并且支持简单运算；\n *    比如：data.num1 + 2、this.num1 + 2、num1 + 2；（备注：三个表达式是等价的，这里的 this 就是 data。）\n * 5. var: 以此字符串作为key值从当前数据域data中获取数值；性能最高（运行期间不会生成ast和表达式运算）；\n * 6. true 或者 false: 当execMode设置为true时，不用 ${} 包裹也可以执行表达式；\n * 7. collect: 用于从表达式中获取所有变量；\n * \n * 备注1: 用户也可以使用 registerFormulaExec 注册一个自定义运算器；\n * 备注2: 模板字符串 和 Javascript 模板引擎 不可以交叉使用；\n * 备注3: amis 现有的 evalFormula 方法，可执行 ${} 格式类表达式，但不支持 filter 过滤器，所以这里用 resolveValueByName 实现；\n * 备注4: 后续可考虑将 amis现有的运算器都放这里管理，充当统一的运算器入口。\n */\n\n// 缓存，用于提升性能\nconst FORMULA_EVAL_CACHE: {[key: string]: Function} = {};\n\n/**\n * 用于存储当前可用运算器，默认支持 tpl、formula、js、var 四种类型运算器\n * 备注：在这里统一参数。\n */\nexport const FormulaExec: {\n  [key: string]: Function;\n} = {\n  tpl: (expression: string, data?: object) => {\n    const curData = data || {};\n    return filter(expression, curData);\n  },\n  formula: (expression: string, data?: object) => {\n    // 邮箱格式直接返回，后续需要在 amis-formula 中处理\n    if (\n      /^\\$\\{([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})\\}$/.test(\n        expression\n      )\n    ) {\n      return expression.substring(2, expression.length - 1); // 剔除前后特殊字符\n    }\n    const curData = data || {};\n    let result = undefined;\n    try {\n      // 执行 ${} 格式类表达式，且支持 filter 过滤器。（备注: isPureVariable 可用于判断是否有 过滤器。）\n      result = resolveVariableAndFilter(expression, curData, '| raw');\n    } catch (e) {\n      console.warn(\n        '[formula]表达式执行异常，当前表达式: ',\n        expression,\n        '，当前上下文数据: ',\n        data\n      );\n      return expression;\n    }\n    // 备注: 此处不用 result ?? expression 是为了避免 没有对应结果时直接显示 expression: ${xxx}\n    return result;\n  },\n  evalFormula: (expression: string, data?: object) => {\n    const curData = data || {};\n    let result = undefined;\n    try {\n      result = evaluate(expression, curData, {\n        evalMode: true, // evalMode 为 true 时，不用 ${} 包裹也可以执行，\n        allowFilter: false\n      });\n    } catch (e) {\n      console.warn(\n        '[evalFormula]表达式执行异常，当前表达式: ',\n        expression,\n        '，当前上下文数据: ',\n        data\n      );\n      return expression;\n    }\n    return result ?? expression;\n  },\n  js: (expression: string, data?: object) => {\n    let debug = false;\n    const idx = expression.indexOf('debugger');\n    if (~idx) {\n      debug = true;\n      expression = expression.replace(/debugger;?/, '');\n    }\n\n    let fn;\n    if (expression in FORMULA_EVAL_CACHE) {\n      fn = FORMULA_EVAL_CACHE[expression];\n    } else {\n      fn = new Function(\n        'data',\n        'utils',\n        `with(data) {${debug ? 'debugger;' : ''}return (${expression});}`\n      );\n      FORMULA_EVAL_CACHE[expression] = fn;\n    }\n\n    data = data || {};\n\n    let curResult = undefined;\n    try {\n      curResult = fn.call(data, data, getFilters());\n    } catch (e) {\n      console.warn(\n        '[formula:js]表达式执行异常，当前表达式: ',\n        expression,\n        '，当前上下文数据: ',\n        data\n      );\n      return expression;\n    }\n    return curResult;\n  },\n  var: (expression: string, data?: object) => {\n    const curData = data || {};\n    const result = getVariable(curData, expression); // 不支持过滤器\n    return result ?? expression;\n  },\n  collect: (expression: any) => {\n    let variables: Array<string> = [];\n    if (isObjectByLodash(expression) || isString(expression)) {\n      // 仅对 Object类型 和 String类型 进行变量提取\n      variables = collectVariables(expression);\n    } else {\n      variables = [];\n    }\n    return variables;\n  }\n};\n\n// 根据表达式类型自动匹配指定运算器，也可以通过设置 execMode 直接指定运算器\nexport function formulaExec(\n  value: any,\n  data: any,\n  execMode?: string | boolean\n) {\n  if (!value) {\n    return '';\n  }\n  let OpenFormulaExecEvalMode = false;\n  let curExecMode = '';\n  if (isBoolean(execMode)) {\n    // OpenFormulaExecEvalMode 设置为 true 后，非 ${ xxx } 格式也使用表达式运算器\n    OpenFormulaExecEvalMode = execMode;\n  } else if (isString(execMode)) {\n    // 指定 execMode 可以直接选用对应的运算器\n    curExecMode = execMode;\n  }\n  if (!isString(value)) {\n    // 非字符串类型，直接返回，比如：boolean、number类型、Object、Array类型\n    return value;\n  } else if (curExecMode && FormulaExec[curExecMode]) {\n    return FormulaExec[curExecMode];\n  }\n\n  const curValue = value.trim(); // 剔除前后空格\n\n  // OpenFormulaExecEvalMode 为 true 时，非 ${ xxx } 格式也会尝试使用表达式运算器\n  if (OpenFormulaExecEvalMode && /^[0-9a-zA-z_]+$/.test(curValue)) {\n    // 普通字符串类型（非表达式），先试一下从上下文中获取数据\n    const curValueTemp = FormulaExec['var'](curValue, data);\n    // 备注: 其他特殊格式，比如邮箱、日期\n    return curValueTemp ?? curValue;\n  } else if (curValue.startsWith('${') && curValue.endsWith('}')) {\n    // ${ xxx } 格式 使用 formula 运算器\n    return FormulaExec['formula'](curValue, data);\n  } else if (isExpression(test)) {\n    // 表达式格式使用 formula 运算器\n    return FormulaExec['formula'](curValue, data);\n  } else if (/(\\${).+(\\})/.test(curValue)) {\n    // 包含 ${ xxx } 则使用 tpl 运算器\n    return FormulaExec['tpl'](curValue, data); // 可识别 <% %> 语法\n  } else if (OpenFormulaExecEvalMode) {\n    // 支持 ${} 和 非 ${} 表达式\n    return FormulaExec['evalFormula'](curValue, data);\n  } else {\n    return curValue;\n  }\n}\n\n// 用于注册自定义 formulaExec 运算器\nexport function registerFormulaExec(execMode: string, formulaExec: Function) {\n  if (FormulaExec[execMode]) {\n    console.error(\n      `registerFormulaExec: 运算器注册失败，存在同名运算器（$(execMode)）。`\n    );\n  } else {\n    FormulaExec[execMode] = formulaExec;\n  }\n}\n\n// 用于判断是否优先使用value。\nexport function isExpression(expression: any): boolean {\n  if (!isString(expression)) {\n    // 非字符串类型，比如：Object、Array类型、boolean、number类型\n    return false;\n  }\n  // 备注: \"\\\\${xxx}\"不作为表达式，至少含一个${xxx}才算是表达式\n  return /(?<!\\\\)(\\${).+(\\})/.test(expression);\n}\n\n// 用于判断是否需要执行表达式:\nexport function isNeedFormula(\n  expression: any,\n  prevData: {[propName: string]: any},\n  curData: {[propName: string]: any}\n): boolean {\n  const variables = FormulaExec.collect(expression);\n  return variables.some(\n    (variable: string) =>\n      FormulaExec.var(variable, prevData) !== FormulaExec.var(variable, curData)\n  );\n}\n\n// 将 \\${xx} 替换成 ${xx}\nexport function replaceExpression(expression: any): any {\n  if (expression && isString(expression) && /(\\\\)(\\${).+(\\})/.test(expression)) {\n    return expression.replace(/\\\\\\$\\{/g, '${');\n  }\n  return expression;\n}\n"
+        "import isObjectByLodash from 'lodash/isObject';\nimport isString from 'lodash/isString';\nimport isBoolean from 'lodash/isBoolean';\nimport {\n  getVariable,\n  isPureVariable,\n  resolveVariable,\n  resolveVariableAndFilter,\n  evaluate\n} from 'amis-formula';\n\nimport {filter} from './tpl';\nimport {getFilters} from './tpl-builtin';\nimport {collectVariables} from './grammar';\n\n/**\n * formulaExec 运算器：根据当前字符串类型执行对应运算，也可按指定执行模式执行运算\n *\n * 运算模式（execMode）支持以下取值:\n * 1. tpl: 按模板字符串执行（JavaScript 模板引擎），比如：Hello ${amisUser.email}、<h1>Hello</h1>, <span>${amisUser.email}</span>；\n *    备注: 在模板中可以自由访问变量，详细请见：https://www.lodashjs.com/docs/lodash.template；\n * 2. formula: 按新版公式表达式执行，用于执行 ${ xxx } 格式的表达式；\n *    支持从window、localStorage、sessionStorage获取数据，比如：${num1 + 2}、${ls:env}、${window:document}、${window:document.URL}、${amisUser.email}；\n *    详细请见：https://aisuda.bce.baidu.com/amis/zh-CN/docs/concepts/data-mapping#namespace\n * 3. evalFormula: 按新版公式表达式执行，用于执行 ${ xxx } 和 非${ xxx } 格式的表达式（evalMode 为 true，不用 ${} 包裹也可以执行），功能同 formula 运算模式；\n * 4. js: 按Javascript执行，表达式中可以通过data.xxx来获取指定数据，并且支持简单运算；\n *    比如：data.num1 + 2、this.num1 + 2、num1 + 2；（备注：三个表达式是等价的，这里的 this 就是 data。）\n * 5. var: 以此字符串作为key值从当前数据域data中获取数值；性能最高（运行期间不会生成ast和表达式运算）；\n * 6. true 或者 false: 当execMode设置为true时，不用 ${} 包裹也可以执行表达式；\n * 7. collect: 用于从表达式中获取所有变量；\n * \n * 备注1: 用户也可以使用 registerFormulaExec 注册一个自定义运算器；\n * 备注2: 模板字符串 和 Javascript 模板引擎 不可以交叉使用；\n * 备注3: amis 现有的 evalFormula 方法，可执行 ${} 格式类表达式，但不支持 filter 过滤器，所以这里用 resolveValueByName 实现；\n * 备注4: 后续可考虑将 amis现有的运算器都放这里管理，充当统一的运算器入口。\n */\n\n// 缓存，用于提升性能\nconst FORMULA_EVAL_CACHE: {[key: string]: Function} = {};\n\n/**\n * 用于存储当前可用运算器，默认支持 tpl、formula、js、var 四种类型运算器\n * 备注：在这里统一参数。\n */\nexport const FormulaExec: {\n  [key: string]: Function;\n} = {\n  tpl: (expression: string, data?: object) => {\n    const curData = data || {};\n    return filter(expression, curData);\n  },\n  formula: (expression: string, data?: object) => {\n    // 邮箱格式直接返回，后续需要在 amis-formula 中处理\n    if (\n      /^\\$\\{([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})\\}$/.test(\n        expression\n      )\n    ) {\n      return expression.substring(2, expression.length - 1); // 剔除前后特殊字符\n    }\n    const curData = data || {};\n    let result = undefined;\n    try {\n      // 执行 ${} 格式类表达式，且支持 filter 过滤器。（备注: isPureVariable 可用于判断是否有 过滤器。）\n      result = resolveVariableAndFilter(expression, curData, '| raw');\n    } catch (e) {\n      console.warn(\n        '[formula]表达式执行异常，当前表达式: ',\n        expression,\n        '，当前上下文数据: ',\n        data\n      );\n      return expression;\n    }\n    // 备注: 此处不用 result ?? expression 是为了避免 没有对应结果时直接显示 expression: ${xxx}\n    return result;\n  },\n  evalFormula: (expression: string, data?: object) => {\n    const curData = data || {};\n    let result = undefined;\n    try {\n      result = evaluate(expression, curData, {\n        evalMode: true, // evalMode 为 true 时，不用 ${} 包裹也可以执行，\n        allowFilter: false\n      });\n    } catch (e) {\n      console.warn(\n        '[evalFormula]表达式执行异常，当前表达式: ',\n        expression,\n        '，当前上下文数据: ',\n        data\n      );\n      return expression;\n    }\n    return result ?? expression;\n  },\n  js: (expression: string, data?: object) => {\n    let debug = false;\n    const idx = expression.indexOf('debugger');\n    if (~idx) {\n      debug = true;\n      expression = expression.replace(/debugger;?/, '');\n    }\n\n    let fn;\n    if (expression in FORMULA_EVAL_CACHE) {\n      fn = FORMULA_EVAL_CACHE[expression];\n    } else {\n      fn = new Function(\n        'data',\n        'utils',\n        `with(data) {${debug ? 'debugger;' : ''}return (${expression});}`\n      );\n      FORMULA_EVAL_CACHE[expression] = fn;\n    }\n\n    data = data || {};\n\n    let curResult = undefined;\n    try {\n      curResult = fn.call(data, data, getFilters());\n    } catch (e) {\n      console.warn(\n        '[formula:js]表达式执行异常，当前表达式: ',\n        expression,\n        '，当前上下文数据: ',\n        data\n      );\n      return expression;\n    }\n    return curResult;\n  },\n  var: (expression: string, data?: object) => {\n    const curData = data || {};\n    const result = getVariable(curData, expression); // 不支持过滤器\n    return result ?? expression;\n  },\n  collect: (expression: any) => {\n    let variables: Array<string> = [];\n    if (isObjectByLodash(expression) || isString(expression)) {\n      // 仅对 Object类型 和 String类型 进行变量提取\n      variables = collectVariables(expression);\n    } else {\n      variables = [];\n    }\n    return variables;\n  }\n};\n\n// 根据表达式类型自动匹配指定运算器，也可以通过设置 execMode 直接指定运算器\nexport function formulaExec(\n  value: any,\n  data: any,\n  execMode?: string | boolean\n) {\n  if (!value) {\n    return '';\n  }\n  let OpenFormulaExecEvalMode = false;\n  let curExecMode = '';\n  if (isBoolean(execMode)) {\n    // OpenFormulaExecEvalMode 设置为 true 后，非 ${ xxx } 格式也使用表达式运算器\n    OpenFormulaExecEvalMode = execMode;\n  } else if (isString(execMode)) {\n    // 指定 execMode 可以直接选用对应的运算器\n    curExecMode = execMode;\n  }\n  if (!isString(value)) {\n    // 非字符串类型，直接返回，比如：boolean、number类型、Object、Array类型\n    return value;\n  } else if (curExecMode && FormulaExec[curExecMode]) {\n    return FormulaExec[curExecMode];\n  }\n\n  const curValue = value.trim(); // 剔除前后空格\n\n  // OpenFormulaExecEvalMode 为 true 时，非 ${ xxx } 格式也会尝试使用表达式运算器\n  if (OpenFormulaExecEvalMode && /^[0-9a-zA-z_]+$/.test(curValue)) {\n    // 普通字符串类型（非表达式），先试一下从上下文中获取数据\n    const curValueTemp = FormulaExec['var'](curValue, data);\n    // 备注: 其他特殊格式，比如邮箱、日期\n    return curValueTemp ?? curValue;\n  } else if (curValue.startsWith('${') && curValue.endsWith('}')) {\n    // ${ xxx } 格式 使用 formula 运算器\n    return FormulaExec['formula'](curValue, data);\n  } else if (isExpression(test)) {\n    // 表达式格式使用 formula 运算器\n    return FormulaExec['formula'](curValue, data);\n  } else if (/(\\${).+(\\})/.test(curValue)) {\n    // 包含 ${ xxx } 则使用 tpl 运算器\n    return FormulaExec['tpl'](curValue, data); // 可识别 <% %> 语法\n  } else if (OpenFormulaExecEvalMode) {\n    // 支持 ${} 和 非 ${} 表达式\n    return FormulaExec['evalFormula'](curValue, data);\n  } else {\n    return curValue;\n  }\n}\n\n// 用于注册自定义 formulaExec 运算器\nexport function registerFormulaExec(execMode: string, formulaExec: Function) {\n  if (FormulaExec[execMode]) {\n    console.error(\n      `registerFormulaExec: 运算器注册失败，存在同名运算器（$(execMode)）。`\n    );\n  } else {\n    FormulaExec[execMode] = formulaExec;\n  }\n}\n\n// 用于判断是否优先使用value。\nexport function isExpression(expression: any): boolean {\n  if (!expression || !isString(expression)) {\n    // 非字符串类型，比如：Object、Array类型、boolean、number类型\n    return false;\n  }\n  // 备注1: \"\\\\${xxx}\"不作为表达式，至少含一个${xxx}才算是表达式\n  \n  // 备注2: safari 不支持 /(?<!\\\\)(\\${).+(\\})/.test(expression) \n  return /(^|[^\\\\])\\$\\{.+\\}/.test(expression);\n}\n\n// 用于判断是否需要执行表达式:\nexport function isNeedFormula(\n  expression: any,\n  prevData: {[propName: string]: any},\n  curData: {[propName: string]: any}\n): boolean {\n  const variables = FormulaExec.collect(expression);\n  return variables.some(\n    (variable: string) =>\n      FormulaExec.var(variable, prevData) !== FormulaExec.var(variable, curData)\n  );\n}\n\n// 将 \\${xx} 替换成 ${xx}\nexport function replaceExpression(expression: any): any {\n  if (expression && isString(expression) && /(\\\\)(\\${).+(\\})/.test(expression)) {\n    return expression.replace(/\\\\\\$\\{/g, '${');\n  }\n  return expression;\n}\n"
     ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "1.9.1-beta.13",
+  "version": "1.9.1-beta.19",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "scripts": {
@@ -43,7 +43,7 @@
     ]
   },
   "dependencies": {
-    "amis-formula": "^1.3.13",
+    "amis-formula": "^1.3.15",
     "ansi-to-react": "^6.1.6",
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",

package/schema.json

@@ -19425,7 +19425,7 @@
         },
         "WebkitMaxInlineSize": {
           "$ref": "#/definitions/Property.MaxInlineSize%3C(string%7Cnumber)%3E",
-          "description": "The **`max-inline-size`** CSS property defines the horizontal or vertical maximum size of an element's block, depending on its writing mode. It corresponds to either the `max-width` or the `max-height` property, depending on the value of `writing-mode`.\n\n**Syntax**: `<'max-width'>`\n\n**Initial value**: `none`"
+          "description": "The **`max-inline-size`** CSS property defines the horizontal or vertical maximum size of an element's block, depending on its writing mode. It corresponds to either the `max-width` or the `max-height` property, depending on the value of `writing-mode`.\n\n**Syntax**: `<'max-width'>`\n\n**Initial value**: `0`"
         },
         "WebkitOrder": {
           "$ref": "#/definitions/Property.Order",
@@ -19573,7 +19573,7 @@
         },
         "all": {
           "$ref": "#/definitions/Property.All",
-          "description": "The **`all`** shorthand CSS property resets all of an element's properties except `unicode-bidi`, `direction`, and CSS Custom Properties. It can set properties to their initial or inherited values, or to the values specified in another stylesheet origin.\n\n**Syntax**: `initial | inherit | unset | revert | revert-layer`\n\n**Initial value**: There is no practical initial value for it.\n\n| Chrome | Firefox | Safari  |  Edge  | IE  | | :----: | :-----: | :-----: | :----: | :-: | | **37** | **27**  | **9.1** | **79** | No  |"
+          "description": "The **`all`** shorthand CSS property resets all of an element's properties except `unicode-bidi`, `direction`, and CSS Custom Properties. It can set properties to their initial or inherited values, or to the values specified in another stylesheet origin.\n\n**Syntax**: `initial | inherit | unset | revert`\n\n**Initial value**: There is no practical initial value for it.\n\n| Chrome | Firefox | Safari  |  Edge  | IE  | | :----: | :-----: | :-----: | :----: | :-: | | **37** | **27**  | **9.1** | **79** | No  |"
         },
         "animation": {
           "$ref": "#/definitions/Property.Animation%3Cstring%3E",
@@ -19737,7 +19737,7 @@
         },
         "textEmphasis": {
           "$ref": "#/definitions/Property.TextEmphasis",
-          "description": "The **`text-emphasis`** CSS property applies emphasis marks to text (except spaces and control characters). It is a shorthand for `text-emphasis-style` and `text-emphasis-color`.\n\n**Syntax**: `<'text-emphasis-style'> || <'text-emphasis-color'>`\n\n|  Chrome  | Firefox | Safari |   Edge   | IE  | | :------: | :-----: | :----: | :------: | :-: | |  **99**  | **46**  | **7**  |  **99**  | No  | | 25 _-x-_ |         |        | 79 _-x-_ |     |"
+          "description": "The **`text-emphasis`** CSS property applies emphasis marks to text (except spaces and control characters). It is a shorthand for `text-emphasis-style` and `text-emphasis-color`.\n\n**Syntax**: `<'text-emphasis-style'> || <'text-emphasis-color'>`\n\n|    Chrome    | Firefox | Safari |     Edge     | IE  | | :----------: | :-----: | :----: | :----------: | :-: | | **25** _-x-_ | **46**  | **7**  | **79** _-x-_ | No  |"
         },
         "transition": {
           "$ref": "#/definitions/Property.Transition%3Cstring%3E",
@@ -20133,7 +20133,7 @@
         },
         "contentVisibility": {
           "$ref": "#/definitions/Property.ContentVisibility",
-          "description": "The **`content-visibility`** CSS property controls whether or not an element renders its contents at all, along with forcing a strong set of containments, allowing user agents to potentially omit large swathes of layout and rendering work until it becomes needed. Basically it enables the user agent to skip an element's rendering work (including layout and painting) until it is needed — which makes the initial page load much faster.\n\n**Syntax**: `visible | auto | hidden`\n\n**Initial value**: `visible`\n\n| Chrome | Firefox | Safari |  Edge  | IE  | | :----: | :-----: | :----: | :----: | :-: | | **85** |   No    |   No   | **85** | No  |"
+          "description": "The **`content-visibility`** CSS property controls whether or not an element renders its contents at all, along with forcing a strong set of containments, allowing user agents to potentially omit large swathes of layout and rendering work until it becomes needed. Basically it enables the user agent to skip an element's rendering work (including layout and painting) until it is needed — which makes the initial page load much faster.\n\n**Syntax**: `visible | auto | hidden`\n\n**Initial value**: `visible`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **85** |   No    | **15.4** | **85** | No  |"
         },
         "counterIncrement": {
           "$ref": "#/definitions/Property.CounterIncrement",
@@ -20385,11 +20385,11 @@
         },
         "marginBlockEnd": {
           "$ref": "#/definitions/Property.MarginBlockEnd%3C(string%7Cnumber)%3E",
-          "description": "The **`margin-block-end`** CSS property defines the logical block end margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **87** | **41**  | **12.1** | **87** | No  |"
+          "description": "The **`margin-block-end`** CSS property defines the logical block end margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **69** | **41**  | **12.1** | **79** | No  |"
         },
         "marginBlockStart": {
           "$ref": "#/definitions/Property.MarginBlockStart%3C(string%7Cnumber)%3E",
-          "description": "The **`margin-block-start`** CSS property defines the logical block start margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **87** | **41**  | **12.1** | **87** | No  |"
+          "description": "The **`margin-block-start`** CSS property defines the logical block start margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **69** | **41**  | **12.1** | **79** | No  |"
         },
         "marginBottom": {
           "$ref": "#/definitions/Property.MarginBottom%3C(string%7Cnumber)%3E",
@@ -20401,11 +20401,11 @@
         },
         "marginInlineEnd": {
           "$ref": "#/definitions/Property.MarginInlineEnd%3C(string%7Cnumber)%3E",
-          "description": "The **`margin-inline-end`** CSS property defines the logical inline end margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation. In other words, it corresponds to the `margin-top`, `margin-right`, `margin-bottom` or `margin-left` property depending on the values defined for `writing-mode`, `direction`, and `text-orientation`.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n|          Chrome          |        Firefox        |          Safari          |           Edge            | IE  | | :----------------------: | :-------------------: | :----------------------: | :-----------------------: | :-: | |          **87**          |        **41**         |         **12.1**         |          **87**           | No  | | 2 _(-webkit-margin-end)_ | 3 _(-moz-margin-end)_ | 3 _(-webkit-margin-end)_ | 79 _(-webkit-margin-end)_ |     |"
+          "description": "The **`margin-inline-end`** CSS property defines the logical inline end margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation. In other words, it corresponds to the `margin-top`, `margin-right`, `margin-bottom` or `margin-left` property depending on the values defined for `writing-mode`, `direction`, and `text-orientation`.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n|          Chrome          |        Firefox        |          Safari          |  Edge  | IE  | | :----------------------: | :-------------------: | :----------------------: | :----: | :-: | |          **69**          |        **41**         |         **12.1**         | **79** | No  | | 2 _(-webkit-margin-end)_ | 3 _(-moz-margin-end)_ | 3 _(-webkit-margin-end)_ |        |     |"
         },
         "marginInlineStart": {
           "$ref": "#/definitions/Property.MarginInlineStart%3C(string%7Cnumber)%3E",
-          "description": "The **`margin-inline-start`** CSS property defines the logical inline start margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation. It corresponds to the `margin-top`, `margin-right`, `margin-bottom`, or `margin-left` property depending on the values defined for `writing-mode`, `direction`, and `text-orientation`.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n|           Chrome           |         Firefox         |           Safari           |            Edge             | IE  | | :------------------------: | :---------------------: | :------------------------: | :-------------------------: | :-: | |           **87**           |         **41**          |          **12.1**          |           **87**            | No  | | 2 _(-webkit-margin-start)_ | 3 _(-moz-margin-start)_ | 3 _(-webkit-margin-start)_ | 79 _(-webkit-margin-start)_ |     |"
+          "description": "The **`margin-inline-start`** CSS property defines the logical inline start margin of an element, which maps to a physical margin depending on the element's writing mode, directionality, and text orientation. It corresponds to the `margin-top`, `margin-right`, `margin-bottom`, or `margin-left` property depending on the values defined for `writing-mode`, `direction`, and `text-orientation`.\n\n**Syntax**: `<'margin-left'>`\n\n**Initial value**: `0`\n\n|           Chrome           |         Firefox         |           Safari           |  Edge  | IE  | | :------------------------: | :---------------------: | :------------------------: | :----: | :-: | |           **69**           |         **41**          |          **12.1**          | **79** | No  | | 2 _(-webkit-margin-start)_ | 3 _(-moz-margin-start)_ | 3 _(-webkit-margin-start)_ |        |     |"
         },
         "marginLeft": {
           "$ref": "#/definitions/Property.MarginLeft%3C(string%7Cnumber)%3E",
@@ -20485,7 +20485,7 @@
         },
         "maxBlockSize": {
           "$ref": "#/definitions/Property.MaxBlockSize%3C(string%7Cnumber)%3E",
-          "description": "The **`max-block-size`** CSS property specifies the maximum size of an element in the direction opposite that of the writing direction as specified by `writing-mode`. That is, if the writing direction is horizontal, then `max-block-size` is equivalent to `max-height`; if the writing direction is vertical, `max-block-size` is the same as `max-width`.\n\n**Syntax**: `<'max-width'>`\n\n**Initial value**: `none`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **57** | **41**  | **12.1** | **79** | No  |"
+          "description": "The **`max-block-size`** CSS property specifies the maximum size of an element in the direction opposite that of the writing direction as specified by `writing-mode`. That is, if the writing direction is horizontal, then `max-block-size` is equivalent to `max-height`; if the writing direction is vertical, `max-block-size` is the same as `max-width`.\n\n**Syntax**: `<'max-width'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **57** | **41**  | **12.1** | **79** | No  |"
         },
         "maxHeight": {
           "$ref": "#/definitions/Property.MaxHeight%3C(string%7Cnumber)%3E",
@@ -20493,7 +20493,7 @@
         },
         "maxInlineSize": {
           "$ref": "#/definitions/Property.MaxInlineSize%3C(string%7Cnumber)%3E",
-          "description": "The **`max-inline-size`** CSS property defines the horizontal or vertical maximum size of an element's block, depending on its writing mode. It corresponds to either the `max-width` or the `max-height` property, depending on the value of `writing-mode`.\n\n**Syntax**: `<'max-width'>`\n\n**Initial value**: `none`\n\n| Chrome | Firefox |   Safari   |  Edge  | IE  | | :----: | :-----: | :--------: | :----: | :-: | | **57** | **41**  |  **12.1**  | **79** | No  | |        |         | 10.1 _-x-_ |        |     |"
+          "description": "The **`max-inline-size`** CSS property defines the horizontal or vertical maximum size of an element's block, depending on its writing mode. It corresponds to either the `max-width` or the `max-height` property, depending on the value of `writing-mode`.\n\n**Syntax**: `<'max-width'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |   Safari   |  Edge  | IE  | | :----: | :-----: | :--------: | :----: | :-: | | **57** | **41**  |  **12.1**  | **79** | No  | |        |         | 10.1 _-x-_ |        |     |"
         },
         "maxLines": {
           "$ref": "#/definitions/Property.MaxLines",
@@ -20521,7 +20521,7 @@
         },
         "mixBlendMode": {
           "$ref": "#/definitions/Property.MixBlendMode",
-          "description": "The **`mix-blend-mode`** CSS property sets how an element's content should blend with the content of the element's parent and the element's background.\n\n**Syntax**: `<blend-mode> | plus-lighter`\n\n**Initial value**: `normal`\n\n| Chrome | Firefox | Safari |  Edge  | IE  | | :----: | :-----: | :----: | :----: | :-: | | **41** | **32**  | **8**  | **79** | No  |"
+          "description": "The **`mix-blend-mode`** CSS property sets how an element's content should blend with the content of the element's parent and the element's background.\n\n**Syntax**: `<blend-mode>`\n\n**Initial value**: `normal`\n\n| Chrome | Firefox | Safari |  Edge  | IE  | | :----: | :-----: | :----: | :----: | :-: | | **41** | **32**  | **8**  | **79** | No  |"
         },
         "motionDistance": {
           "$ref": "#/definitions/Property.OffsetDistance%3C(string%7Cnumber)%3E",
@@ -20545,7 +20545,7 @@
         },
         "offsetAnchor": {
           "$ref": "#/definitions/Property.OffsetAnchor%3C(string%7Cnumber)%3E",
-          "description": "**Syntax**: `auto | <position>`\n\n**Initial value**: `auto`\n\n| Chrome | Firefox | Safari | Edge | IE  | | :----: | :-----: | :----: | :--: | :-: | |   No   | **72**  |   No   |  No  | No  |"
+          "description": "**Syntax**: `auto | <position>`\n\n**Initial value**: `auto`\n\n| Chrome | Firefox | Safari |  Edge  | IE  | | :----: | :-----: | :----: | :----: | :-: | | **79** | **72**  |   No   | **79** | No  |"
         },
         "offsetDistance": {
           "$ref": "#/definitions/Property.OffsetDistance%3C(string%7Cnumber)%3E",
@@ -20641,11 +20641,11 @@
         },
         "paddingBlockEnd": {
           "$ref": "#/definitions/Property.PaddingBlockEnd%3C(string%7Cnumber)%3E",
-          "description": "The **`padding-block-end`** CSS property defines the logical block end padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **87** | **41**  | **12.1** | **87** | No  |"
+          "description": "The **`padding-block-end`** CSS property defines the logical block end padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **69** | **41**  | **12.1** | **79** | No  |"
         },
         "paddingBlockStart": {
           "$ref": "#/definitions/Property.PaddingBlockStart%3C(string%7Cnumber)%3E",
-          "description": "The **`padding-block-start`** CSS property defines the logical block start padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **87** | **41**  | **12.1** | **87** | No  |"
+          "description": "The **`padding-block-start`** CSS property defines the logical block start padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n| Chrome | Firefox |  Safari  |  Edge  | IE  | | :----: | :-----: | :------: | :----: | :-: | | **69** | **41**  | **12.1** | **79** | No  |"
         },
         "paddingBottom": {
           "$ref": "#/definitions/Property.PaddingBottom%3C(string%7Cnumber)%3E",
@@ -20657,11 +20657,11 @@
         },
         "paddingInlineEnd": {
           "$ref": "#/definitions/Property.PaddingInlineEnd%3C(string%7Cnumber)%3E",
-          "description": "The **`padding-inline-end`** CSS property defines the logical inline end padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n|          Chrome           |        Firefox         |          Safari           |            Edge            | IE  | | :-----------------------: | :--------------------: | :-----------------------: | :------------------------: | :-: | |          **87**           |         **41**         |         **12.1**          |           **87**           | No  | | 2 _(-webkit-padding-end)_ | 3 _(-moz-padding-end)_ | 3 _(-webkit-padding-end)_ | 79 _(-webkit-padding-end)_ |     |"
+          "description": "The **`padding-inline-end`** CSS property defines the logical inline end padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n|          Chrome           |        Firefox         |          Safari           |  Edge  | IE  | | :-----------------------: | :--------------------: | :-----------------------: | :----: | :-: | |          **69**           |         **41**         |         **12.1**          | **79** | No  | | 2 _(-webkit-padding-end)_ | 3 _(-moz-padding-end)_ | 3 _(-webkit-padding-end)_ |        |     |"
         },
         "paddingInlineStart": {
           "$ref": "#/definitions/Property.PaddingInlineStart%3C(string%7Cnumber)%3E",
-          "description": "The **`padding-inline-start`** CSS property defines the logical inline start padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n|           Chrome            |         Firefox          |           Safari            |             Edge             | IE  | | :-------------------------: | :----------------------: | :-------------------------: | :--------------------------: | :-: | |           **87**            |          **41**          |          **12.1**           |            **87**            | No  | | 2 _(-webkit-padding-start)_ | 3 _(-moz-padding-start)_ | 3 _(-webkit-padding-start)_ | 79 _(-webkit-padding-start)_ |     |"
+          "description": "The **`padding-inline-start`** CSS property defines the logical inline start padding of an element, which maps to a physical padding depending on the element's writing mode, directionality, and text orientation.\n\n**Syntax**: `<'padding-left'>`\n\n**Initial value**: `0`\n\n|           Chrome            |         Firefox          |           Safari            |  Edge  | IE  | | :-------------------------: | :----------------------: | :-------------------------: | :----: | :-: | |           **69**            |          **41**          |          **12.1**           | **79** | No  | | 2 _(-webkit-padding-start)_ | 3 _(-moz-padding-start)_ | 3 _(-webkit-padding-start)_ |        |     |"
         },
         "paddingLeft": {
           "$ref": "#/definitions/Property.PaddingLeft%3C(string%7Cnumber)%3E",
@@ -20941,15 +20941,15 @@
         },
         "textEmphasisColor": {
           "$ref": "#/definitions/Property.TextEmphasisColor",
-          "description": "The **`text-emphasis-color`** CSS property sets the color of emphasis marks. This value can also be set using the `text-emphasis` shorthand.\n\n**Syntax**: `<color>`\n\n**Initial value**: `currentcolor`\n\n|  Chrome  | Firefox | Safari |   Edge   | IE  | | :------: | :-----: | :----: | :------: | :-: | |  **99**  | **46**  | **7**  |  **99**  | No  | | 25 _-x-_ |         |        | 79 _-x-_ |     |"
+          "description": "The **`text-emphasis-color`** CSS property sets the color of emphasis marks. This value can also be set using the `text-emphasis` shorthand.\n\n**Syntax**: `<color>`\n\n**Initial value**: `currentcolor`\n\n|    Chrome    | Firefox | Safari |     Edge     | IE  | | :----------: | :-----: | :----: | :----------: | :-: | | **25** _-x-_ | **46**  | **7**  | **79** _-x-_ | No  |"
         },
         "textEmphasisPosition": {
           "$ref": "#/definitions/Property.TextEmphasisPosition",
-          "description": "The **`text-emphasis-position`** CSS property sets where emphasis marks are drawn. Like ruby text, if there isn't enough room for emphasis marks, the line height is increased.\n\n**Syntax**: `[ over | under ] && [ right | left ]`\n\n**Initial value**: `over right`\n\n|  Chrome  | Firefox | Safari |   Edge   | IE  | | :------: | :-----: | :----: | :------: | :-: | |  **99**  | **46**  | **7**  |  **99**  | No  | | 25 _-x-_ |         |        | 79 _-x-_ |     |"
+          "description": "The **`text-emphasis-position`** CSS property sets where emphasis marks are drawn. Like ruby text, if there isn't enough room for emphasis marks, the line height is increased.\n\n**Syntax**: `[ over | under ] && [ right | left ]`\n\n**Initial value**: `over right`\n\n|    Chrome    | Firefox | Safari |     Edge     | IE  | | :----------: | :-----: | :----: | :----------: | :-: | | **25** _-x-_ | **46**  | **7**  | **79** _-x-_ | No  |"
         },
         "textEmphasisStyle": {
           "$ref": "#/definitions/Property.TextEmphasisStyle",
-          "description": "The **`text-emphasis-style`** CSS property sets the appearance of emphasis marks. It can also be set, and reset, using the `text-emphasis` shorthand.\n\n**Syntax**: `none | [ [ filled | open ] || [ dot | circle | double-circle | triangle | sesame ] ] | <string>`\n\n**Initial value**: `none`\n\n|  Chrome  | Firefox | Safari |   Edge   | IE  | | :------: | :-----: | :----: | :------: | :-: | |  **99**  | **46**  | **7**  |  **99**  | No  | | 25 _-x-_ |         |        | 79 _-x-_ |     |"
+          "description": "The **`text-emphasis-style`** CSS property sets the appearance of emphasis marks. It can also be set, and reset, using the `text-emphasis` shorthand.\n\n**Syntax**: `none | [ [ filled | open ] || [ dot | circle | double-circle | triangle | sesame ] ] | <string>`\n\n**Initial value**: `none`\n\n|    Chrome    | Firefox | Safari |     Edge     | IE  | | :----------: | :-----: | :----: | :----------: | :-: | | **25** _-x-_ | **46**  | **7**  | **79** _-x-_ | No  |"
         },
         "textIndent": {
           "$ref": "#/definitions/Property.TextIndent%3C(string%7Cnumber)%3E",
@@ -21131,7 +21131,6 @@
         "inherit",
         "initial",
         "revert",
-        "revert-layer",
         "unset"
       ]
     },
@@ -31360,10 +31359,6 @@
         },
         {
           "$ref": "#/definitions/DataType.BlendMode"
-        },
-        {
-          "type": "string",
-          "const": "plus-lighter"
         }
       ]
     },
@@ -35160,6 +35155,10 @@
         "addBtnText": {
           "type": "string",
           "description": "自定义增加按钮文案"
+        },
+        "activeKey": {
+          "$ref": "#/definitions/SchemaExpression",
+          "description": "默认激活的选项卡，hash值或索引值，支持使用表达式"
         }
       },
       "required": [
@@ -65692,6 +65691,10 @@
           "type": "boolean",
           "description": "选父级的时候，是否只把子节点的值包含在内"
         },
+        "onlyLeaf": {
+          "type": "boolean",
+          "description": "单选时，只运行选择叶子节点"
+        },
         "rootCreatable": {
           "type": "boolean",
           "description": "顶级节点是否可以创建子节点"
@@ -67055,7 +67058,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -67517,7 +67520,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -67891,7 +67894,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -68353,7 +68356,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -68727,7 +68730,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|label|fixed|name|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|label|fixed|name|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
           }
         },
         {
@@ -69189,7 +69192,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
           }
         },
         {
@@ -69563,7 +69566,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -70025,7 +70028,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -70399,7 +70402,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|rowClassName|cellClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -70861,7 +70864,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|rowClassName|cellClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -71235,7 +71238,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|unique|columnClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|unique|columnClassName)$": {}
           }
         },
         {
@@ -71697,7 +71700,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|unique|columnClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|unique|columnClassName)$": {}
           }
         },
         {
@@ -72071,7 +72074,7 @@
           "$ref": "#/definitions/TabsSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|columnClassName|columnRatio)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|tabs|source|tabsClassName|tabsMode|contentClassName|linksClassName|mountOnEnter|unmountOnExit|toolbar|subFormMode|subFormHorizontal|addable|closable|draggable|showTip|showTipClassName|editable|scrollable|sidePosition|addBtnText|activeKey|columnClassName|columnRatio)$": {}
           }
         },
         {
@@ -72533,7 +72536,7 @@
           "$ref": "#/definitions/TreeControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|rootCreatable|enableNodePath|pathSeparator|showOutline|columnClassName|columnRatio)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|id|onEvent|type|size|label|labelAlign|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|readOnlyOn|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|options|source|selectFirst|initFetchOn|initFetch|multiple|joinValues|delimiter|extractValue|clearable|resetValue|deferApi|addApi|addControls|creatable|createBtnLabel|editable|editApi|editControls|removable|deleteApi|deleteConfirmText|autoFill|hideRoot|rootLabel|rootValue|showIcon|autoCheckChildren|cascade|withChildren|onlyChildren|onlyLeaf|rootCreatable|enableNodePath|pathSeparator|showOutline|columnClassName|columnRatio)$": {}
           }
         },
         {

package/scss/components/_formula.scss

@@ -65,13 +65,17 @@
     margin-top: #{px2rem(10px)};
   }
 
+  &-settings.only-variable {
+    height: #{px2rem(350px)};
+  }
+
   &-panel {
     display: flex;
     flex: 1;
     flex-flow: column nowrap;
     justify-content: space-between;
     align-items: stretch;
-    height: #{px2rem(250px)};
+    height: 100%;
     border-radius: var(--borderRadius);
     border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
 
@@ -91,10 +95,11 @@
       flex: 1;
       display: flex;
       flex-flow: column nowrap;
-      max-height: #{px2rem(220px)};
+      max-height: calc(100% - 30px);
+      overflow: hidden;
 
       &--tabs {
-        max-height: #{px2rem(250px)};
+        max-height: 100%;
       }
     }
   }
@@ -215,12 +220,18 @@
         vertical-align: middle;
         text-align: center;
         padding: 0 #{px2rem(8px)};
-        line-height: 17px;
         border-radius: var(--borderRadius);
         background: #f5f5f5;
         color: var(--black);
       }
     }
+    .#{$ns}GroupedSelection {
+      &-item {
+        &-tag {
+          line-height: 17px;
+        }
+      }
+    }
   }
 
   /* 函数列表 */
@@ -405,3 +416,33 @@
     }
   }
 }
+
+.#{$ns}FormulaPicker.is-input-group {
+  border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  padding: var(--Form-input-paddingY) var(--Form-input-paddingX);
+  border-radius: var(--borderRadius);
+  .#{$ns}FormulaPicker-input {
+    display: inline-block;
+    width: 100%;
+    background: none;
+    padding: 0;
+    border: 0;
+    margin: 0;
+    &:focus {
+      border: none;
+      outline: none;
+      box-sizing: none;
+    }
+  }
+  .#{$ns}FormulaPicker-toggler {
+    .icon-function {
+      transform: scale(1.6);
+    }
+    .icon-ellipsis-v {
+      transform: rotate(90deg);
+    }
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}