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

src/renderer/src/views/components/propertyBox/model.vue

@@ -311,9 +311,11 @@ let observer: IntersectionObserver | null = null
 const treeRef: any = ref('')
 
 watch(modelName, (val) => {
-  if (treeRef.value && treeRef.value !== '') {
-    treeRef.value!.filter(val)
-  }
+  // if (treeRef.value && treeRef.value !== '') {
+  //   treeRef.value!.filter(val)
+  // }
+  categories.value = []
+  getModelList()
 })
 
 watch(isShowPup, (val) => {
@@ -561,13 +563,16 @@ const renderModel = async (data, model) => {
 const getModelListByType = (id) => {
   let formData = new FormData()
   formData.append('modelTypeId', id)
+  formData.append('name', modelName.value)
   ModelApi.showModelByType(formData).then((res) => {
     categories.value = res.data
   })
 }
 
 const getModelList = async () => {
-  const res: any = await ModelApi.modelTypeList()
+  const params = new URLSearchParams()
+  params.append('modelName', modelName.value)
+  const res: any = await ModelApi.modelTypeList(params)
   if (res.code == 0 || res.code == 200) {
     let data = transformNestedJson(res.data, 'name', 'label')
     typeTreeData.value = data
@@ -598,8 +603,7 @@ onBeforeUnmount(() => {
   observer?.disconnect()
 })
 //end
-
-eventBus.on('openModel', (data, cb, type) => {
+let func = (data, cb, type) => {
   selectCallback = cb
   addType.value = type
   isShowPup.value = data
@@ -607,8 +611,9 @@ eventBus.on('openModel', (data, cb, type) => {
     getModelList()
     getSetting()
   }
-})
-eventBus.on('closeModelSet', (data) => {
+}
+
+let func2 = (data) => {
   addType.value = ''
   selectCallback = null
   isShowPup.value = data
@@ -616,6 +621,14 @@ eventBus.on('closeModelSet', (data) => {
     getSetting()
     clickTreeNode.value && getModelListByType(clickTreeNode.value)
   }
+}
+onMounted(() => {
+  eventBus.on('openModel', func)
+  eventBus.on('closeModelSet', func2)
+})
+onUnmounted(() => {
+  eventBus.off('openModel', func)
+  eventBus.off('closeModelSet', func2)
 })
 
 //查看是否有设置模型设置