From be8a175584462957804d8264589fd942d8047e5a Mon Sep 17 00:00:00 2001
From: albert <790321193@qq.com>
Date: Wed, 21 Dec 2022 11:13:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E5=90=8E=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=A2=AB=E9=87=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/json-schema-editor/main.vue | 14 ++++++++------
 packages/json-schema-editor/util.js  | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/json-schema-editor/main.vue b/packages/json-schema-editor/main.vue
index ab1c132..9076d06 100644
--- a/packages/json-schema-editor/main.vue
+++ b/packages/json-schema-editor/main.vue
@@ -115,7 +115,7 @@
 </template>
 <script>
 import Vue from 'vue'
-import { isNull } from './util'
+import { isNull, renamePropertyAndKeepKeyPrecedence } from './util'
 import {TYPE_NAME, TYPE} from './type/type'
 import { Row,Col,Button,Input,InputNumber, Icon,Checkbox,Select,Tooltip,Modal,Form,Switch} from 'ant-design-vue'
 import LocalProvider from './LocalProvider'
@@ -242,11 +242,13 @@ export default {
       const newKey = e.target.value
       if(oldKey === newKey) return
 
-      const nodeValue = this.parent.properties[oldKey]
+      // const nodeValue = this.parent.properties[oldKey]
 
-      // 替换key名
-      this.$delete(this.parent.properties, oldKey)
-      this.$set(this.parent.properties, newKey, nodeValue)
+      // // 替换key名
+      // this.$delete(this.parent.properties, oldKey)
+      // this.$set(this.parent.properties, newKey, nodeValue)
+      const _this = this
+      renamePropertyAndKeepKeyPrecedence(_this, this.parent.properties,[ oldKey, newKey ])
 
       // required重新设置
       const requireds = this.parent.required || []
@@ -324,7 +326,7 @@ export default {
       const node = this.pickValue
       node.properties || this.$set(node,'properties',{})
       const props = node.properties
-      this.$set(props,name,{type: type})
+      this.$set(props,name,{type: type, title: ''})
     },
     parseCustomProps () {
       const ownProps = this.ownProps
diff --git a/packages/json-schema-editor/util.js b/packages/json-schema-editor/util.js
index a545b23..2cfc79d 100644
--- a/packages/json-schema-editor/util.js
+++ b/packages/json-schema-editor/util.js
@@ -21,4 +21,23 @@ export function isNull(ele){
     return true;
   }
   return false;
+}
+export function renamePropertyAndKeepKeyPrecedence(_this, obj, [oldKey, newKey]) {
+  const descriptors = Object.getOwnPropertyDescriptors(obj)
+  if (Object.prototype.hasOwnProperty.call(descriptors, oldKey)) {
+    Object.entries(descriptors)
+      .reduce((target, [key, descriptor]) => {
+        if(key === '__ob__') return target
+        // Reflect.deleteProperty(target, key)
+        console.info('TTT', target, key ,descriptor)
+        _this.$delete(target, key)
+        if (key === oldKey) {
+          key = newKey
+        }
+        // // Reflect.defineProperty(target, key, descriptor)
+        _this.$set(target, key, descriptor.get())
+        return target;
+      }, obj)
+  }
+  return obj
 }
\ No newline at end of file