bill 3 лет назад
Родитель
Сommit
ba8ac5be21
3 измененных файлов с 8 добавлено и 4 удалено
  1. 4 1
      src/layout/edit/scene-select.vue
  2. 1 1
      src/layout/model-list/sign.vue
  3. 3 2
      src/views/merge/index.vue

+ 4 - 1
src/layout/edit/scene-select.vue

@@ -57,7 +57,10 @@ const rowSelection: any = ref({
   selectedRowKeys: selects,
   onChange: (ids: number[]) => {
     selects.value = Array.from(new Set(ids.concat(selectIds.value)))
-  }
+  },
+  getCheckboxProps: (record: Scene) => ({
+    disabled: selectIds.value.includes(record.modelId)
+  })
 })
 const cloumns = [
   {

+ 1 - 1
src/layout/model-list/sign.vue

@@ -11,7 +11,7 @@
       />
     </div>
   </div>
-  <div class="model-desc" @click="$emit('click')" v-if="canChange">
+  <div class="model-desc" @click="$emit('click')" v-if="custom.currentModel === model">
     <p><span>数据来源:</span>{{ SceneTypeDesc[model.type] }}</p>
     <p><span>数据大小:</span>{{ model.size }}</p>
     <p><span>拍摄时间:</span>{{ model.time }}</p>

+ 3 - 2
src/views/merge/index.vue

@@ -46,8 +46,8 @@
         </ui-input>
       </ui-group-option>
       <ui-group-option>
+          <!-- :disabled="currentItem"  -->
         <ui-button 
-          :disabled="currentItem" 
           @click="router.push({ 
             name: RoutesName.registration, 
             params: {id: custom.currentModel!.id, save: '1' } 
@@ -113,7 +113,8 @@ const reset = async () => {
 useViewStack(() => togetherCallback([
   showLeftCtrlPanoStack.push(ref(false)),
   showLeftPanoStack.push(ref(true)),
-  modelsChangeStoreStack.push(ref(true))
+  modelsChangeStoreStack.push(ref(true)),
+  () => currentItem.value = null
 ]))
 useViewStack(autoSaveFuseModels)