From ca74b7180ea4e4a29ba03a6289f85100caf9a2b7 Mon Sep 17 00:00:00 2001 From: lvhuaisheng Date: Thu, 28 Jul 2022 12:00:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bugfix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=97=B6=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../naiveui/components/generate/GenerateForm.vue | 14 +++++++++++--- .../components/generate/GenerateFormItem.vue | 7 +++++-- src/components/naiveui/mixins/eventMixin.js | 10 ++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/components/naiveui/components/generate/GenerateForm.vue b/src/components/naiveui/components/generate/GenerateForm.vue index 1e35853..e91db13 100644 --- a/src/components/naiveui/components/generate/GenerateForm.vue +++ b/src/components/naiveui/components/generate/GenerateForm.vue @@ -32,6 +32,7 @@ :element="colItem" :config="data.config" :disabled="disabled" + :widgetForm="widgetForm" /> @@ -54,6 +55,7 @@ (null) + let widgetForm = (props.data && JSON.parse(JSON.stringify(props.data))) ?? naiveui.widgetForm; + for (let key in naiveui.widgetForm) { + if (naiveui.widgetForm.hasOwnProperty(key)) { + if(typeof naiveui.widgetForm[key] === 'function') { + widgetForm[key] = naiveui.widgetForm[key]; + } + } + } const state = reactive({ // generateForm: null as any, model: {} as any, rules: {} as any, - widgetForm: - (props.data && JSON.parse(JSON.stringify(props.data))) ?? - naiveui.widgetForm + widgetForm:widgetForm }) const generateModel = (list: any[]) => { diff --git a/src/components/naiveui/components/generate/GenerateFormItem.vue b/src/components/naiveui/components/generate/GenerateFormItem.vue index 95ef162..7c7f6a6 100644 --- a/src/components/naiveui/components/generate/GenerateFormItem.vue +++ b/src/components/naiveui/components/generate/GenerateFormItem.vue @@ -45,13 +45,15 @@ :max="element.options.max" :min="element.options.min" :disabled="disabled || element.options.disabled" - :round="element.options.round"/> + :round="element.options.round" + @change="handleChange"/>