Browse Source

修改选中过滤和标题bug

tangning 1 ngày trước cách đây
mục cha
commit
fb1c32fd50
4 tập tin đã thay đổi với 12 bổ sung12 xóa
  1. 3 3
      src/app.vue
  2. 2 1
      src/layout/edit/header/index.vue
  3. 5 4
      src/layout/edit/scene-select.vue
  4. 2 4
      src/store/sys.ts

+ 3 - 3
src/app.vue

@@ -91,9 +91,9 @@ const gotoLogin = () => {
   console.log('请登录')
   const params = getAppParam();
   // alert("请登录");/${params.fromRoute}/#/mix3dManager
-  // const loginHref = `/${params.fromRoute}/#/login`
-  // location.href = loginHref + '?redirect=' + escape(`/${params.fromRoute}/#/mix3dManager`)
-  // showLogin.value = true;
+  const loginHref = `/${params.fromRoute}/#/login`
+  location.href = loginHref + '?redirect=' + escape(`/${params.fromRoute}/#/mix3dManager`)
+  showLogin.value = true;
 };
 
 addResErrorHandler((data: any) => {

+ 2 - 1
src/layout/edit/header/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ui-editor-head class="header">
     <div class="main">
-      <span class="title">{{ sysTitle }}</span>
+      <span class="title">{{ sysTitle || '多元融合' }}</span>
     </div>
 
     <div class="control">
@@ -29,6 +29,7 @@ import { custom, params } from "@/env";
 
 const props = defineProps<{ title?: string }>();
 const sysTitle = computed(() => props.title || title.value);
+console.log('sysTitle', props.title, title.value);
 </script>
 
 <style lang="sass" scoped>

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

@@ -178,13 +178,13 @@ const rowSelection: any = ref({
 
   hideSelectAll: true,
   onChange: (ids: string[]) => {
-  console.log('ids', ids)
-    const key =  typeFilterScenes.value[type.value].map((item: any) => item.num).join('')
+
+    const key1 =  typeFilterScenes.value[type.value].map((item: any) => item.num).join('')
     ids = ids.filter(id => !selectIds.value.includes(id))
     if (!cache[type.value]) {
       cache[type.value] = {}
     }
-    cache[type.value][key] = ids
+    cache[type.value][key1] = ids
 
 
 
@@ -192,7 +192,8 @@ const rowSelection: any = ref({
     const curIds = [...selectIds.value]
     for (const keyp in cache) {
       for (const key in cache[keyp]) {
-        curIds.push(...cache[keyp][key])
+        const numNew = cache[keyp][key].filter(id => key == key1 || !key1.includes(id))//过滤非当前table data 已选中数据
+        curIds.push(...numNew)
       }
     }
     selects.value =  [...new Set(curIds)] || []//去重

+ 2 - 4
src/store/sys.ts

@@ -25,15 +25,13 @@ export const prefix = ref("");
 
 export const defTitle = ref("多元融合");
 export const title = computed(() => {
-  console.error(currentMeta.value);
   const last =
     currentMeta.value && "sysTitle" in currentMeta.value
       ? currentMeta.value.sysTitle
       : defTitle.value;
 
-  console.error(prefix.value);
-  if (last) {
-    return  last;
+  if (prefix.value && last) {
+    return prefix.value + " | " + last;
   } else {
     return prefix.value + last;
   }