Forráskód Böngészése

修改无效设置问题

bill 3 éve
szülő
commit
3f5bb7e571

+ 11 - 5
src/sdk/association.ts

@@ -101,6 +101,12 @@ const associationModels = (sdk: SDK) => {
               z: round(transform.position.z, 5),
             }
           }
+          if (transform.bottom) {
+            transform.bottom = round(transform.bottom, 2)
+          }
+          if (transform.scale) {
+            transform.scale = round(transform.scale, 2)
+          }
 
           const updateKeys = Object.keys(transform)
           const update: any = {}
@@ -109,6 +115,8 @@ const associationModels = (sdk: SDK) => {
           }
           
           if (deepIsRevise(update, transform)) {
+
+          console.error(update, transform)
             unSet(() => Object.assign(item, transform))
           }
         }, 16)
@@ -235,11 +243,9 @@ export const associationMessaure = <T extends MeasureType>(smMeasure: SceneMeasu
     })
   })
 
-  smMeasure.bus.on('highlight', selected => unSet(() => unSetModelUpdate(() => measure.selected = selected)))
-
-  unSetModelUpdate(() => {
-    measure.desc = getMessaureDesc()!
-  })
+  smMeasure.bus.on('highlight', selected => unSet(() => measure.selected = selected))
+  measure.desc = getMessaureDesc()
+  // unSetModelUpdate(() => measure.desc = getMessaureDesc()!)
 }
 
 const associationMessaures = (sdk: SDK) => {

+ 5 - 3
src/store/measure.ts

@@ -73,11 +73,13 @@ export const saveMeasures = saveStoreItems(
   }
 )
 export const autoSaveMeasures = autoSetModeCallback(measures, {
-  isUpdate: (newMeasure) => 
-    deepIsRevise(
+  isUpdate: (newMeasure) => {
+    console.log(newMeasure, getBackupMeasures())
+    return deepIsRevise(
       newMeasure.map(item => ({...item, selected: false})),
       getBackupMeasures().map(item => ({...item, selected: false}))
-    ),
+    )
+  },
   backup: backupMeasures,
   recovery: recoverMeasures,
   save: saveMeasures

+ 1 - 0
src/store/sys.ts

@@ -79,6 +79,7 @@ export type AutoSetModeSetting<T> = {
 
 let isUnset = false
 export const unSetModelUpdate = (run: () => void) => {
+  console.error('unset')
   isUnset = true
   run()
   nextTick(() => isUnset = false)

+ 2 - 0
src/utils/store-help.ts

@@ -152,6 +152,8 @@ export const saveStoreItems = <T extends {id: any}>(
   }
 ) => () => {
   const oldItems = getOldItem()
+  console.error('save save')
+  console.log(oldItems)
   const {
     deleted,
     updated,

+ 1 - 1
src/views/measure/edit.vue

@@ -30,7 +30,7 @@ modelMeasure.bus.on('submit', () => {
 
 enterEdit(() => {
   emit('close')
-  modelMeasure.destroy()
+  modelMeasure.destroy!()
 })
 sysBus.on('save', () => emit('submit', measure), { pre: true })
 

+ 5 - 1
src/views/measure/sign.vue

@@ -1,5 +1,9 @@
 <template>
-  <ui-group-option class="sign-measure">
+  <ui-group-option 
+    class="sign-measure" 
+    @mouseenter="measure.selected = true"
+    @mouseleave="measure.selected = false"
+  >
     <div class="info">
       <ui-icon :type="MeasureTypeMeta[measure.type].icon" class="type" />
       <div>