@yxhl/specter-pui-vtk 1.0.84 → 1.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yxhl/specter-pui-vtk",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "description": "雅心互联 Vue 3 + Vuetify3 组件库",
   "type": "module",
   "main": "./dist/specter-pui.umd.js",

package/src/components/assembly/VtkImg.vue

@@ -37,10 +37,10 @@
       @click:outside="closePreview"
     >
       <VCard class="image-viewer-card">
-        <v-toolbar dark color="primary">
-          <v-toolbar-title>{{ currentImageTitle }}</v-toolbar-title>
-          <VSpacer></VSpacer>
-          <v-toolbar-items>
+        <v-toolbar dark color="primary">
+          <v-toolbar-title>{{ currentImageTitle }}</v-toolbar-title>
+          <VSpacer></VSpacer>
+          <v-toolbar-items>
             <VBtn icon dark @click="zoomImage(-0.3)">
               <VIcon>mdi-magnify-minus-outline</VIcon>
             </VBtn>
@@ -53,14 +53,14 @@
             <VBtn icon dark @click="rotateImage(90)">
               <VIcon>mdi-rotate-right</VIcon>
             </VBtn>
-            <VBtn icon dark @click="resetImageTransform">
-              <VIcon>mdi-refresh</VIcon>
-            </VBtn>
-            <VBtn icon dark @click="closePreview">
-              <VIcon>mdi-close</VIcon>
-            </VBtn>
-          </v-toolbar-items>
-        </v-toolbar>
+            <VBtn icon dark @click="resetImageTransform">
+              <VIcon>mdi-refresh</VIcon>
+            </VBtn>
+            <VBtn icon dark @click="closePreview">
+              <VIcon>mdi-close</VIcon>
+            </VBtn>
+          </v-toolbar-items>
+        </v-toolbar>
         
         <div class="image-viewer-content">
           <VBtn 
@@ -379,7 +379,7 @@ const endImageDrag = (event) => {
 
 /* 图片查看器样式 */
 .image-viewer-card {
-  background-color: rgba(0, 0, 0, 0.9);
+  background-color: rgba(0, 0, 0, 0.3);
   color: white;
 }
 

package/src/components/assembly/VtkSearch.vue

@@ -93,23 +93,45 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['update:value', 'search', 'reset']);
-const instance = getCurrentInstance();
-
-const user = ref({});
-const menu = ref(false);
-const queryParam = ref({ ...props.value });
-const initialQueryParam = ref({ ...props.value });
-
-const initialIndex = computed(() => {
-  return Object.entries(queryParam.value).filter(([key, val]) => {
-    if (key === 'condition') return false;
-    const initVal = initialQueryParam.value[key];
-    if (Array.isArray(val) && Array.isArray(initVal)) {
-      return JSON.stringify(val) !== JSON.stringify(initVal);
-    }
-    return val !== initVal;
-  }).length;
-});
+const instance = getCurrentInstance();
+
+const user = ref({});
+const menu = ref(false);
+
+const cloneValue = (val) => {
+  if (Array.isArray(val)) return [...val];
+  if (val && typeof val === 'object') return { ...val };
+  return val;
+};
+
+const cloneQueryParam = (source = {}) => {
+  return Object.fromEntries(Object.entries(source || {}).map(([key, val]) => [key, cloneValue(val)]));
+};
+
+const isSameValue = (a, b) => {
+  if (
+    Array.isArray(a) ||
+    Array.isArray(b) ||
+    (a && typeof a === 'object') ||
+    (b && typeof b === 'object')
+  ) {
+    return JSON.stringify(a) === JSON.stringify(b);
+  }
+
+  return a === b;
+};
+
+const queryParam = ref(cloneQueryParam(props.value));
+const initialQueryParam = ref(cloneQueryParam(props.value));
+const externalQueryParam = ref(cloneQueryParam(props.value));
+
+const initialIndex = computed(() => {
+  return Object.entries(queryParam.value).filter(([key, val]) => {
+    if (key === 'condition') return false;
+    const initVal = initialQueryParam.value[key];
+    return !isSameValue(val, initVal);
+  }).length;
+});
 
 const contentStyle = computed(() => {
   const minValue = props.contentMinHeight;
@@ -123,12 +145,29 @@ const contentStyle = computed(() => {
   };
 });
 
-watch(
-  () => props.value,
-  (newVal) => {
-    queryParam.value = { ...newVal };
-  }
-);
+watch(
+  () => props.value,
+  (newVal = {}) => {
+    const nextExternalQueryParam = cloneQueryParam(newVal);
+    const nextQueryParam = { ...queryParam.value };
+
+    Object.entries(nextExternalQueryParam).forEach(([key, val]) => {
+      if (!isSameValue(val, externalQueryParam.value[key])) {
+        nextQueryParam[key] = cloneValue(val);
+      }
+    });
+
+    Object.keys(externalQueryParam.value).forEach((key) => {
+      if (!(key in nextExternalQueryParam)) {
+        delete nextQueryParam[key];
+      }
+    });
+
+    queryParam.value = nextQueryParam;
+    externalQueryParam.value = nextExternalQueryParam;
+  },
+  { deep: true }
+);
 
 onMounted(() => {
   user.value = JSON.parse(localStorage.getItem("_mis_acis_users") || "{}");