diff --git a/lerna.json b/lerna.json index 9c044bc76..37d0753fd 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,6 @@ "packages/amis-ui", "packages/amis" ], - "version": "3.4.1" + "useWorkspaces": true, + "version": "3.4.2" } diff --git a/packages/amis-core/package.json b/packages/amis-core/package.json index 81c6dfcf6..a5b5d4ca5 100644 --- a/packages/amis-core/package.json +++ b/packages/amis-core/package.json @@ -1,6 +1,6 @@ { "name": "amis-core", - "version": "3.4.1", + "version": "3.4.2", "description": "amis-core", "main": "lib/index.js", "module": "esm/index.js", @@ -46,7 +46,7 @@ "esm" ], "dependencies": { - "amis-formula": "*", + "amis-formula": "^3.4.2", "classnames": "2.3.2", "file-saver": "^2.0.2", "hoist-non-react-statics": "^3.3.2", diff --git a/packages/amis-core/src/store/form.ts b/packages/amis-core/src/store/form.ts index 4f0b83945..27e3bfe89 100644 --- a/packages/amis-core/src/store/form.ts +++ b/packages/amis-core/src/store/form.ts @@ -698,6 +698,9 @@ export const FormStore = ServiceStore.named('FormStore') if (item.name && item.type !== 'hidden') { setVariable(toClear, item.name, item.resetValue); } + if (item.extraName && typeof item.extraName === 'string') { + setVariable(toClear, item.extraName, item.resetValue); + } }); setValues(toClear); self.validated = false; diff --git a/packages/amis-formula/package.json b/packages/amis-formula/package.json index dfce8cb93..8b7bc9849 100644 --- a/packages/amis-formula/package.json +++ b/packages/amis-formula/package.json @@ -1,6 +1,6 @@ { "name": "amis-formula", - "version": "3.4.1", + "version": "3.4.2", "description": "负责 amis 里面的表达式实现,内置公式,编辑器等", "main": "lib/index.js", "module": "esm/index.js", diff --git a/packages/amis-ui/package.json b/packages/amis-ui/package.json index 98d332a24..5e0e14f9d 100644 --- a/packages/amis-ui/package.json +++ b/packages/amis-ui/package.json @@ -3,7 +3,7 @@ "main": "lib/index.js", "module": "esm/index.js", "types": "lib/index.d.ts", - "version": "3.4.1", + "version": "3.4.2", "description": "", "scripts": { "build": "npm run clean-dist && NODE_ENV=production rollup -c ", @@ -36,8 +36,8 @@ }, "dependencies": { "@rc-component/mini-decimal": "^1.0.1", - "amis-core": "^3.4.1", - "amis-formula": "^3.4.1", + "amis-core": "^3.4.2", + "amis-formula": "^3.4.2", "classnames": "2.3.2", "codemirror": "^5.63.0", "downshift": "6.1.12", diff --git a/packages/amis/package.json b/packages/amis/package.json index c977ed873..1046c70ee 100644 --- a/packages/amis/package.json +++ b/packages/amis/package.json @@ -1,6 +1,6 @@ { "name": "amis", - "version": "3.4.1", + "version": "3.4.2", "description": "一种MIS页面生成工具", "main": "lib/index.js", "module": "esm/index.js", @@ -37,8 +37,8 @@ } ], "dependencies": { - "amis-core": "^3.4.1", - "amis-ui": "^3.4.1", + "amis-core": "^3.4.2", + "amis-ui": "^3.4.2", "attr-accept": "2.2.2", "blueimp-canvastoblob": "2.1.0", "classnames": "2.3.2", diff --git a/packages/amis/src/renderers/Table/HeadCellSearchDropdown.tsx b/packages/amis/src/renderers/Table/HeadCellSearchDropdown.tsx index 258f07b2d..5ceca2550 100644 --- a/packages/amis/src/renderers/Table/HeadCellSearchDropdown.tsx +++ b/packages/amis/src/renderers/Table/HeadCellSearchDropdown.tsx @@ -80,9 +80,12 @@ export function HeadCellSearchDropDown({ if (schema) { Array.isArray(schema.body) && - schema.body.forEach( - (item: any) => item.name && formItems.push(item.name) - ); + schema.body.forEach((item: any) => { + item.name && formItems.push(item.name); + item.extraName && + typeof item.extraName === 'string' && + formItems.push(item.extraName); + }); schema = { ...schema, type: 'form',