bill 3 روز پیش
والد
کامیت
f56af4c492

+ 4 - 3
src/components/bill-ui/components/message/index.js

@@ -37,12 +37,13 @@ Message.use = function use(app) {
     const existsShows = []
     const oneShow = config => {
         const key = config.type + config.msg
+        console.log(existsShows, key)
         if (!existsShows.includes(key)) {
-            const index = existsShows.length
-            existsShows[index] = key
+            existsShows.push(key)
             Message.show(config)
             setTimeout(() => {
-                existsShows.splice(index, 1)
+                const index = existsShows.indexOf(key)
+                ~index && existsShows.splice(index, 1)
             }, config.time + 1000)
         }
     }

+ 1 - 1
src/model/app.vue

@@ -228,7 +228,7 @@ export default Model;
   margin: 10px;
   transition: top 0.3s ease, right 0.3s ease;
   &.full {
-    right: 0 !important;
+    // right: 0 !important;
   }
 }
 </style>

+ 6 - 0
src/style.scss

@@ -186,4 +186,10 @@ input::-ms-clear,input::-ms-reveal {
 
 .ant-select-clear {
   background: none !important;
+}
+
+.ant-modal .ant-modal-footer {
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }

+ 1 - 1
src/views/login.vue

@@ -85,7 +85,7 @@ const login = (username: string, password: string) => {
 };
 
 if (import.meta.env.DEV) {
-  login("super-admin", "Aa123456");
+  // login("super-admin", "Aa123456");
 }
 </script>
 

+ 1 - 0
src/views/merge/index.vue

@@ -1,6 +1,7 @@
 <template>
   <RightPano
     v-if="
+      custom.showRightPano &&
       custom.currentModel &&
       active &&
       (custom.showMode === 'fuse' || !getSceneModel(custom.currentModel)?.supportPano())

+ 30 - 1
src/views/tagging/hot/style-float-select.vue

@@ -3,6 +3,7 @@
     placement="bottom"
     v-if="current.length"
     v-model:open="visible"
+    overlayClassName="style-float-select-overlay"
     :trigger="['click']"
   >
     <div class="fsd">
@@ -56,7 +57,7 @@
 
 <script lang="ts" setup>
 import { styleTypes } from "@/api";
-import { computed, ref, watchEffect } from "vue";
+import { computed, nextTick, ref, watch, watchEffect } from "vue";
 import { Menu, Dropdown } from "ant-design-vue";
 import { DownOutlined } from "@ant-design/icons-vue";
 import { taggings, getTaggingStyle } from "@/store";
@@ -125,6 +126,29 @@ const visible = ref(false);
 const items = computed(() => getItems(types.value));
 const current = computed(() => getCurrentItem(props.value));
 
+const oldValue = ref(props.value);
+watchEffect(() => {
+  if (!current.value[current.value.length - 1].children?.length) {
+    oldValue.value = props.value;
+  }
+});
+watch(visible, (visible) => {
+  nextTick(() => {
+    if (visible) {
+      document
+        .querySelector(".style-float-select-overlay")
+        ?.parentElement?.classList.add("style-float-select-overlay-parent");
+    } else {
+      document
+        .querySelector(".style-float-select-overlay")
+        ?.parentElement?.classList.remove("style-float-select-overlay-parent");
+    }
+  });
+  if (!visible && current.value[current.value.length - 1].children?.length) {
+    emit("update:value", oldValue.value);
+  }
+});
+
 if (props.count && props.all) {
   watchEffect(() => {
     if (
@@ -222,4 +246,9 @@ span {
 .ant-dropdown-menu {
   border-radius: 2px !important;
 }
+.style-float-select-overlay-parent {
+  position: absolute;
+  inset: 0;
+  z-index: 1050;
+}
 </style>