diff --git a/.vscode/settings.json b/.vscode/settings.json index a947eb977..748642425 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -138,5 +138,23 @@ ], "vetur.format.scriptInitialIndent": true, "vetur.format.styleInitialIndent": true, - "vetur.validation.script": false + "vetur.validation.script": false, + "MicroPython.executeButton": [ + { + "text": "▶", + "tooltip": "运行", + "alignment": "left", + "command": "extension.executeFile", + "priority": 3.5 + } + ], + "MicroPython.syncButton": [ + { + "text": "$(sync)", + "tooltip": "同步", + "alignment": "left", + "command": "extension.execute", + "priority": 4 + } + ] } diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts index 66b833719..7af80a562 100644 --- a/src/components/Form/src/hooks/useFormEvents.ts +++ b/src/components/Form/src/hooks/useFormEvents.ts @@ -220,15 +220,19 @@ export function useFormEvents({ return; } const schema: FormSchema[] = []; - updateData.forEach((item) => { - unref(getSchema).forEach((val) => { + unref(getSchema).forEach((val) => { + let _val; + updateData.forEach((item) => { if (val.field === item.field) { - const newSchema = deepMerge(val, item); - schema.push(newSchema as FormSchema); - } else { - schema.push(val); + _val = item; } }); + if (_val !== undefined && val.field === _val.field) { + const newSchema = deepMerge(val, _val); + schema.push(newSchema as FormSchema); + } else { + schema.push(val); + } }); _setDefaultValue(schema); diff --git a/src/components/Tree/src/types/tree.ts b/src/components/Tree/src/types/tree.ts index 0b68b4b44..8d75e8b3e 100644 --- a/src/components/Tree/src/types/tree.ts +++ b/src/components/Tree/src/types/tree.ts @@ -134,7 +134,7 @@ export const treeProps = buildProps({ type: Boolean, default: false, }, - treeWrapperClassName: String + treeWrapperClassName: String, }); export type TreeProps = ExtractPropTypes; diff --git a/src/layouts/page/index.vue b/src/layouts/page/index.vue index d1cd11431..34cb5c4b0 100644 --- a/src/layouts/page/index.vue +++ b/src/layouts/page/index.vue @@ -15,7 +15,9 @@ appear > - +
+ +
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts index 265635dc0..e18387dfa 100644 --- a/src/utils/dateUtil.ts +++ b/src/utils/dateUtil.ts @@ -15,4 +15,3 @@ export function formatToDate(date?: dayjs.ConfigType, format = DATE_FORMAT): str } export const dateUtil = dayjs; - diff --git a/src/utils/index.ts b/src/utils/index.ts index d90e67310..20952adc3 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -36,7 +36,7 @@ export function setObjToUrlParams(baseUrl: string, obj: any): string { // 深度合并 export function deepMerge(src: any = {}, target: any = {}): T { let key: string; - const res: any = cloneDeep(src) + const res: any = cloneDeep(src); for (key in target) { res[key] = isObject(res[key]) ? deepMerge(res[key], target[key]) : (res[key] = target[key]); }