feat(lib): 调整 widget onChange prop参数格式，添加 formData参数

re #45
lljj-x · Apr 22, 2021 · 4c441fc · 4c441fc
1 parent 55c343a
commit 4c441fc
Show file tree

Hide file tree

Showing 20 changed files with 79 additions and 22 deletions.
diff --git a/packages/demo/demo-v2/src/pages/vue-editor/views/editor/viewComponents/Text/uiSchema.js b/packages/demo/demo-v2/src/pages/vue-editor/views/editor/viewComponents/Text/uiSchema.js
@@ -8,8 +8,8 @@ export default {
             getWidget(widgetVm) {
                 console.log(widgetVm);
             },
-            onChange(newVal, oldVal) {
-                console.log('change:', newVal, oldVal);
+            onChange(data) {
+                console.log('change:', data);
             }
         }
     }

diff --git a/packages/docs/docs/zh/guide/basic-config.md b/packages/docs/docs/zh/guide/basic-config.md
@@ -171,8 +171,15 @@ uiSchema = {
 
             // onChange
             // 支持版本 1.3
-            onChange(newVal, oldVal) {
-                console.log('change:', newVal, oldVal);
+            /**
+             *
+             * @param curVal 当前值
+             * @param preVal 上一次的值
+             * @param parentFormData 当前父节点的值，响应式的值可在这里设置其它需要联动的值
+             * @param rootFormData 当前父节点的值，响应式的值可在这里设置其它需要联动的值
+             */
+            onChange({ curVal, preVal, parentFormData, rootFormData }) {
+                console.log('change:', curVal, preVal, parentFormData, rootFormData);
             },
 
             // 显示标题？只对 type为`object`、`array` 类型有效

diff --git a/packages/lib/vue2/vue2-core/src/components/Widget.js b/packages/lib/vue2/vue2-core/src/components/Widget.js
@@ -325,7 +325,12 @@ export default {
                                 if (formatValue.update && preVal !== formatValue.value) {
                                     self.value = formatValue.value;
                                     if (self.onChange) {
-                                        self.onChange(formatValue.value, preVal);
+                                        self.onChange({
+                                            curVal: formatValue.value,
+                                            preVal,
+                                            parentFormData: getPathVal(self.rootFormData, self.curNodePath, 1),
+                                            rootFormData: self.rootFormData
+                                        });
                                     }
                                 }
                             }

diff --git a/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.js b/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.js
@@ -10316,7 +10316,12 @@ var Widget = {
             self.value = formatValue.value;
 
             if (self.onChange) {
-              self.onChange(formatValue.value, preVal);
+              self.onChange({
+                curVal: formatValue.value,
+                preVal: preVal,
+                parentFormData: getPathVal$1(self.rootFormData, self.curNodePath, 1),
+                rootFormData: self.rootFormData
+              });
             }
           }
         }

diff --git a/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.min.js b/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.esm.min.js
diff --git a/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.umd.js b/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.umd.js
@@ -10324,7 +10324,12 @@
               self.value = formatValue.value;
 
               if (self.onChange) {
-                self.onChange(formatValue.value, preVal);
+                self.onChange({
+                  curVal: formatValue.value,
+                  preVal: preVal,
+                  parentFormData: getPathVal$1(self.rootFormData, self.curNodePath, 1),
+                  rootFormData: self.rootFormData
+                });
               }
             }
           }

diff --git a/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.umd.min.js b/packages/lib/vue2/vue2-form-element/dist/vueJsonSchemaForm.umd.min.js
diff --git a/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.esm.js b/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.esm.js
@@ -10316,7 +10316,12 @@ var Widget = {
             self.value = formatValue.value;
 
             if (self.onChange) {
-              self.onChange(formatValue.value, preVal);
+              self.onChange({
+                curVal: formatValue.value,
+                preVal: preVal,
+                parentFormData: getPathVal$1(self.rootFormData, self.curNodePath, 1),
+                rootFormData: self.rootFormData
+              });
             }
           }
         }

diff --git a/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.esm.min.js b/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.esm.min.js
diff --git a/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.umd.js b/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.umd.js
@@ -10324,7 +10324,12 @@
               self.value = formatValue.value;
 
               if (self.onChange) {
-                self.onChange(formatValue.value, preVal);
+                self.onChange({
+                  curVal: formatValue.value,
+                  preVal: preVal,
+                  parentFormData: getPathVal$1(self.rootFormData, self.curNodePath, 1),
+                  rootFormData: self.rootFormData
+                });
               }
             }
           }

diff --git a/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.umd.min.js b/packages/lib/vue2/vue2-form-iview3/dist/vue2-form-iview3.umd.min.js
diff --git a/packages/lib/vue3/vue3-core/src/components/Widget.js b/packages/lib/vue3/vue3-core/src/components/Widget.js
@@ -318,7 +318,12 @@ export default {
                                         if (preVal !== event) {
                                             widgetValue.value = event;
                                             if (props.onChange) {
-                                                props.onChange(event, preVal);
+                                                props.onChange({
+                                                    curVal: event,
+                                                    preVal,
+                                                    parentFormData: getPathVal(props.rootFormData, props.curNodePath, 1),
+                                                    rootFormData: props.rootFormData
+                                                });
                                             }
                                         }
                                     },

diff --git a/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.esm.js b/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.esm.js
@@ -10045,7 +10045,12 @@ var Widget = {
                 widgetValue.value = event;
 
                 if (props.onChange) {
-                  props.onChange(event, preVal);
+                  props.onChange({
+                    curVal: event,
+                    preVal: preVal,
+                    parentFormData: getPathVal(props.rootFormData, props.curNodePath, 1),
+                    rootFormData: props.rootFormData
+                  });
                 }
               }
             }

diff --git a/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.esm.min.js b/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.esm.min.js
diff --git a/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.umd.js b/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.umd.js
@@ -10049,7 +10049,12 @@
                   widgetValue.value = event;
 
                   if (props.onChange) {
-                    props.onChange(event, preVal);
+                    props.onChange({
+                      curVal: event,
+                      preVal: preVal,
+                      parentFormData: getPathVal(props.rootFormData, props.curNodePath, 1),
+                      rootFormData: props.rootFormData
+                    });
                   }
                 }
               }

diff --git a/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.umd.min.js b/packages/lib/vue3/vue3-form-ant/dist/vue3-form-ant.umd.min.js
diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.js
@@ -10091,7 +10091,12 @@ var Widget = {
                 widgetValue.value = event;
 
                 if (props.onChange) {
-                  props.onChange(event, preVal);
+                  props.onChange({
+                    curVal: event,
+                    preVal: preVal,
+                    parentFormData: getPathVal(props.rootFormData, props.curNodePath, 1),
+                    rootFormData: props.rootFormData
+                  });
                 }
               }
             }

diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.min.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.min.js
diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.js
@@ -10095,7 +10095,12 @@
                   widgetValue.value = event;
 
                   if (props.onChange) {
-                    props.onChange(event, preVal);
+                    props.onChange({
+                      curVal: event,
+                      preVal: preVal,
+                      parentFormData: getPathVal(props.rootFormData, props.curNodePath, 1),
+                      rootFormData: props.rootFormData
+                    });
                   }
                 }
               }

diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.min.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.min.js