Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

2025-11-28 10:35:11 +08:00
parent c704df3ead 4bec06914f
commit 4958d6c218
3 changed files with 5 additions and 4 deletions
--- a/resources/java/app/target/graphhopper/properties
+++ b/resources/java/app/target/graphhopper/properties
--- a/src/renderer/public/excel/header.csv
+++ b/src/renderer/public/excel/header.csv
@ -1,5 +1,5 @@
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,ԭ<EFBFBD><EFBFBD>ͷ,<EFBFBD>±<EFBFBD>ͷ,
-1,apple(<28><>),ƻ<EFBFBD><EFBFBD>(<28><>),"<EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߸<EFBFBD>ʽ<EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD>Ͻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD>ͷ<EFBFBD><EFBFBD>Ӧ<EFBFBD>ķ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>±<EFBFBD>ͷ<EFBFBD><EFBFBD>"
-2,water(<EFBFBD><EFBFBD>),ˮ(<28><>),
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<EFBFBD><EFBFBD><EFBFBD>ܴ<EFBFBD>,<EFBFBD><EFBFBD><EFBFBD>ܴ<EFBFBD><EFBFBD><EFBFBD>,
+1,<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,code,"<EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߸<EFBFBD>ʽ<EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD>Ͻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѽ<EFBFBD><EFBFBD>ܴ<EFBFBD><EFBFBD>Ŷ<EFBFBD>Ӧ<EFBFBD>ķ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܴʣ<EFBFBD>"
+2,<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,dzxiang,
 3,...,,
--- a/src/renderer/src/views/components/propertyBox/vectorAttr.vue
+++ b/src/renderer/src/views/components/propertyBox/vectorAttr.vue
@ -132,6 +132,7 @@ const getKeys = () => {
      key: key
    })
  }
+  console.log(keyData.value, 'keyDatakeyDatakeyData')
 }
 let node
 let parentNode