adtec-core-package 0.2.10 → 0.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/Search/ElSearch.vue

@@ -11,7 +11,6 @@
         </div>
       </div>
     </el-flex>
-
     <el-flex
       width="240px"
       justify="flex-end"
@@ -22,20 +21,19 @@
       <el-button type="primary" @click="search" :class="getRouteName + '_search'">查询</el-button>
       <el-button type="text" @click="retract" v-show="is_retract">
         <el-icon
-          ><ArrowDown v-show="retractval === '展开'" /><ArrowUp
-            v-show="retractval === '收起'" /></el-icon
+        ><ArrowDown v-show="retractval === '展开'" /><ArrowUp
+          v-show="retractval === '收起'" /></el-icon
         >{{ retractval }}</el-button
       >
     </el-flex>
   </el-flex>
 </template>
 <script setup lang="ts">
-import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, inject, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useWindowSize } from '@vueuse/core'
 import { useRouter } from 'vue-router'
-import ElFlex from '../ElFlex/ElFlex.vue'
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'
-
+import ElFlex from '../ElFlex/ElFlex.vue'
 const router = useRouter()
 const getRouteName = computed(() => {
   return router.currentRoute.value.name as string
@@ -47,30 +45,42 @@ const is_retract = ref(false)
 const ref_div = ref()
 const windowContent = useWindowSize()
 const collapsed = inject<boolean>('collapsed')
+const collapsedSearch=ref<boolean|undefined>(false)
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-expect-error
 watch(collapsed, () => {
+  collapsedSearch.value = collapsed
+  calculation()
+})
+watch(collapsedSearch, () => {
   calculation()
 })
 watch(windowContent.width, () => {
   calculation()
 })
 const calculation = () => {
-  setTimeout(() => {
-    if (!(ref_div.value.offsetHeight > 95)) {
-      if (ref_div.value.offsetHeight !== 0) {
-        is_retract.value = false
-        height.value = ref_div.value.offsetHeight + 15 + 'px'
-        retractval.value = '收起'
-      } else {
-        calculation()
+  nextTick(()=>{
+    setTimeout(() => {
+      if(ref_div.value.children.length>0) {
+        if (!(ref_div.value.children[0].offsetHeight > 95)) {
+          if (ref_div.value.children[0].offsetHeight !== 0) {
+            is_retract.value = false
+            height.value = ref_div.value.children[0].offsetHeight + 15 + 'px'
+            retractval.value = '收起'
+          } else {
+            calculation()
+          }
+        }else if(ref_div.value.children[0].offsetHeight<=95){
+          is_retract.value = false
+        }
+        else {
+          is_retract.value = true
+          height.value = '95px'
+          retractval.value = '展开'
+        }
       }
-    } else {
-      is_retract.value = true
-      height.value = '95px'
-      retractval.value = '展开'
-    }
-  }, 100)
+    }, 200)
+  })
 }
 watch(windowContent.height, () => {
   calculation()
@@ -100,6 +110,11 @@ const emit = defineEmits<{
   (event: 'search'): void
 }>()
 onMounted(() => {
+  collapsedSearch.value = collapsed
+  //@ts-ignore
+  window.$wujie?.bus.$on("collapsedChangeBus", (val:boolean) => {
+    collapsedSearch.value=val
+  });
   nextTick(() => {
     if (!(ref_content.value.children[0].scrollHeight > 95)) {
       is_retract.value = false
@@ -112,7 +127,10 @@ onMounted(() => {
     }
   })
 })
-
+onUnmounted(()=>{
+  //@ts-ignore
+  window.$wujie?.bus.$off("collapsedChangeBus")
+})
 // onKeyStroke(['d', 'D', 'ArrowRight'], () => {
 //   translateX.value += 10
 // }, { dedupe: true })

package/src/hooks/useResetRefHooks.ts

@@ -1,6 +1,4 @@
 import { type Ref, ref } from 'vue'
-import { cloneDeep } from 'lodash-es'
-
 /**
  * 创建人 胡啸东
  * 说明: 用于重置对象
@@ -9,10 +7,10 @@ import { cloneDeep } from 'lodash-es'
  */
 
 export function useResetRefHooks<T>(value: T): [Ref<T>, () => void] {
-  const initValue = cloneDeep(value)
+  const initValue = JSON.parse(JSON.stringify(value))
   const state = ref(value)
   const reset = () => {
-    state.value = cloneDeep(initValue)
+    state.value = JSON.parse(JSON.stringify(initValue))
   }
   //@ts-ignore
   return [state, reset]