lw-cdp-ui 1.4.35 → 1.4.36

package/dist/components/lwCronSelect/index.vue

@@ -1,86 +1,66 @@
 <template>
-  <el-input v-model="showInput"
-            placeholder="CRON">
-
+  <el-input v-model="showInput" placeholder="CRON">
     <template #append>
-      <el-popover placement="top"
-                  :width="380"
-                  :visible="visible"
-                  trigger="click">
+      <el-popover placement="top" :width="380" :visible="visible" trigger="click">
         <template #reference>
           <el-button @click="visible = true">选择</el-button>
         </template>
         <div class="select-model">
-          <el-select v-model="setData.curType"
-                     placeholder="选择类型"
-                     @change="changeInt"
-                     style="margin-right: 5px;min-width: 80px;width: 80px">
-            <el-option label="每天"
-                       :value="3" />
-            <el-option label="每月"
-                       :value="4" />
-            <el-option label="每周"
-                       :value="5" />
+          <el-select
+            v-model="setData.curType"
+            placeholder="选择类型"
+            @change="changeInt"
+            style="margin-right: 5px; min-width: 80px; width: 80px">
+            <el-option label="每天" :value="3" />
+            <el-option label="每月" :value="4" />
+            <el-option label="每周" :value="5" />
           </el-select>
 
-          <el-select v-if="setData.curType === 4"
-                     v-model="setData.day"
-                     multiple
-                     allow-clear
-                     placeholder="日期"
-                     @change="changeDay"
-                     :max-tag-count="1"
-                     style="margin-right: 5px; min-width: 120px">
-            <el-option label="最后一天"
-                       value="L" />
-            <el-option v-for="item in 31"
-                       :key="item"
-                       :label="item"
-                       :value="item"
-                       :disabled="setData.day.indexOf('L') !== -1" />
+          <el-select
+            v-if="setData.curType === 4"
+            v-model="setData.day"
+            multiple
+            allow-clear
+            placeholder="日期"
+            @change="changeDay"
+            :max-tag-count="1"
+            style="margin-right: 5px; min-width: 120px">
+            <el-option label="最后一天" value="L" />
+            <el-option
+              v-for="item in 31"
+              :key="item"
+              :label="item"
+              :value="item"
+              :disabled="setData.day.indexOf('L') !== -1" />
           </el-select>
 
-          <el-select v-if="setData.curType === 5"
-                     v-model="setData.weeks"
-                     multiple
-                     allow-clear
-                     placeholder="星期"
-                     @change="changeWeeks"
-                     :max-tag-count="1"
-                     style="margin-right: 5px; min-width: 120px">
-            <el-option label="周日"
-                       value="1"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
-            <el-option label="周一"
-                       value="2"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
-            <el-option label="周二"
-                       value="3"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
-            <el-option label="周三"
-                       value="4"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
-            <el-option label="周四"
-                       value="5"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
-            <el-option label="周五"
-                       value="6"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
-            <el-option label="周六"
-                       value="7"
-                       :disabled="setData.weeks.indexOf('?') !== -1" />
+          <el-select
+            v-if="setData.curType === 5"
+            v-model="setData.weeks"
+            multiple
+            allow-clear
+            placeholder="星期"
+            @change="changeWeeks"
+            :max-tag-count="1"
+            style="margin-right: 5px; min-width: 120px">
+            <el-option label="周日" value="1" :disabled="setData.weeks.indexOf('?') !== -1" />
+            <el-option label="周一" value="2" :disabled="setData.weeks.indexOf('?') !== -1" />
+            <el-option label="周二" value="3" :disabled="setData.weeks.indexOf('?') !== -1" />
+            <el-option label="周三" value="4" :disabled="setData.weeks.indexOf('?') !== -1" />
+            <el-option label="周四" value="5" :disabled="setData.weeks.indexOf('?') !== -1" />
+            <el-option label="周五" value="6" :disabled="setData.weeks.indexOf('?') !== -1" />
+            <el-option label="周六" value="7" :disabled="setData.weeks.indexOf('?') !== -1" />
           </el-select>
 
-          <el-time-picker v-model="setData.timeData"
-                          placeholder="时分秒"
-                          value-format="HH:mm:ss"
-                          style="min-width: 100px" />
-
+          <el-time-picker
+            v-model="setData.timeData"
+            placeholder="时分秒"
+            value-format="HH:mm:ss"
+            style="min-width: 100px" />
         </div>
-        <div style="margin-top: 10px; text-align: right;">
+        <div style="margin-top: 10px; text-align: right">
           <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary"
-                     @click="changeOk">确定</el-button>
+          <el-button type="primary" @click="changeOk">确定</el-button>
         </div>
       </el-popover>
     </template>
@@ -88,7 +68,7 @@
 </template>
 
 <script>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue'
 
 export default {
   name: 'lwCronSelect',
@@ -139,13 +119,35 @@ export default {
 
     // 初始化setData对象，用于内部数据管理
     const setData = ref({
-      curType: dataList.value[4] !== '*' ? 4 : dataList.value[5] === '?' ? 3 : 5,
-      day: dataList.value[3] === '*' ? [] : dataList.value[3]?.split(','),
-      month: dataList.value[4] === '*' ? [] : dataList.value[4]?.split(','),
-      weeks: dataList.value[5] === '?' ? [] : dataList.value[5]?.split(','),
-      timeData: dataList.value[0] === '*' ? '' : `${dataList.value[2]}:${dataList.value[1]}:${dataList.value[0]}`
+      curType: 3,
+      day: [],
+      month: [],
+      weeks: [],
+      timeData: ''
     })
 
+    watch(
+      () => visible.value,
+      (val) => {
+        if (val) {
+          const values = props.modelValue ? props.modelValue.split(' ') : ['*', '*', '*', '*', '*', '?']
+
+          const hasDay = values[3] !== '*' && values[3] !== '?'
+          const hasWeek = values[5] !== '*' && values[5] !== '?'
+
+          const curType = hasDay ? 4 : hasWeek ? 5 : 3
+
+          setData.value = {
+            curType,
+            day: hasDay ? values[3].split(',') : [],
+            month: values[4] === '*' ? [] : values[4].split(','),
+            weeks: hasWeek ? values[5].split(',') : [],
+            timeData: values[0] === '*' ? '' : `${values[2]}:${values[1]}:${values[0]}`
+          }
+        }
+      }
+    )
+
     /**
      * 处理日期选择
      * @param {string} val - 选择的日期值
@@ -179,9 +181,9 @@ export default {
      */
     const changeOk = () => {
       const time = setData.value.timeData ? setData.value.timeData.split(':') : ['*', '*', '*']
-      dataList.value[0] = time[2] === "*" ? time[2] : parseInt(time[2], 10).toString()
-      dataList.value[1] = time[1] === "*" ? time[1] : parseInt(time[1], 10).toString()
-      dataList.value[2] = time[0] === "*" ? time[0] : parseInt(time[0], 10).toString()
+      dataList.value[0] = time[2] === '*' ? time[2] : parseInt(time[2], 10).toString()
+      dataList.value[1] = time[1] === '*' ? time[1] : parseInt(time[1], 10).toString()
+      dataList.value[2] = time[0] === '*' ? time[0] : parseInt(time[0], 10).toString()
 
       dataList.value[3] = setData.value.day.length > 0 ? setData.value.day.toString() : '*'
       dataList.value[4] = setData.value.month.length > 0 ? setData.value.month.toString() : '*'
@@ -212,7 +214,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.select-model{
+.select-model {
   display: flex;
 }
-</style>
+</style>

package/dist/components/lwLayout/components/tags.vue

@@ -4,14 +4,20 @@
     <div v-if="iconVisible" class="scroll-arrow left" @click="scrollLeft">
       <el-icon><el-icon-arrow-left /></el-icon>
     </div>
-    <draggable v-model="$store.state.viewTags.viewTags" @change="changeTages" class="context-menu-list" ref="tags"
+    <draggable
+      v-model="$store.state.viewTags.viewTags"
+      @change="changeTages"
+      class="context-menu-list"
+      ref="tags"
       itemKey="name">
       <template #item="{ element: tag, index }" keyName="tag">
-        <li v-bind:key="tag" :class="[isActive(tag) ? 'active' : '', tag.meta.affix ? 'affix' : '']"
+        <li
+          v-bind:key="tag"
+          :class="[isActive(tag) ? 'active' : '', tag.meta.affix ? 'affix' : '']"
           @contextmenu.prevent="openContextMenu($event, tag)">
           <router-link :to="tag">
             <span>{{ getIdName(tag) }}</span>
-            <el-icon v-if="!tag.meta.affix" @click.prevent.stop='closeSelectedTag(tag)'><el-icon-close /></el-icon>
+            <el-icon v-if="!tag.meta.affix" @click.prevent.stop="closeSelectedTag(tag)"><el-icon-close /></el-icon>
           </router-link>
         </li>
       </template>
@@ -24,16 +30,20 @@
 
   <transition name="el-zoom-in-top">
     <ul v-if="contextMenuVisible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu" id="contextmenu">
-      <li @click="refreshTab()"><el-icon><el-icon-refresh /></el-icon>刷新</li>
-      <hr>
+      <li @click="refreshTab()">
+        <el-icon><el-icon-refresh /></el-icon>刷新
+      </li>
+      <hr />
       <li @click="closeTabs()" :class="contextMenuItem.meta.affix ? 'disabled' : ''">
         <el-icon><el-icon-close /></el-icon>关闭标签
       </li>
       <li @click="closeOtherTabs()">
         <el-icon><el-icon-folder-delete /></el-icon>关闭其他标签
       </li>
-      <hr>
-      <li v-if="isOpenTour" @click="openTour()"><el-icon><el-icon-finished /></el-icon>显示页面指引</li>
+      <hr />
+      <li v-if="isOpenTour" @click="openTour()">
+        <el-icon><el-icon-finished /></el-icon>显示页面指引
+      </li>
       <li @click="openWindow()">
         <el-icon><el-icon-copy-document /></el-icon>在新的窗口中打开
       </li>
@@ -45,7 +55,7 @@
 import draggable from 'vuedraggable'
 
 export default {
-  name: "tags",
+  name: 'tags',
   components: {
     draggable
   },
@@ -89,23 +99,22 @@ export default {
       }
     },
     $route(e) {
-      this.addViewTags(e);
+      this.addViewTags(e)
     },
     contextMenuVisible(value) {
-      var _this = this;
+      var _this = this
       var cm = function (e) {
-        let sp = document.getElementById("contextmenu");
+        let sp = document.getElementById('contextmenu')
         if (sp && !sp.contains(e.target)) {
           _this.closeMenu()
         }
       }
       if (value) {
-        document.body.addEventListener('click', e => cm(e))
+        document.body.addEventListener('click', (e) => cm(e))
       } else {
-        document.body.removeEventListener('click', e => cm(e))
+        document.body.removeEventListener('click', (e) => cm(e))
       }
-    },
-
+    }
   },
   created() {
     this.init()
@@ -117,7 +126,6 @@ export default {
       this.changeLeftRight()
     })
 
-
     // 判断是否有指引组件
     this.$bus.$on(`lwTourOpen`, (val) => {
       this.isOpenTour = val
@@ -131,16 +139,14 @@ export default {
     init() {
       let tags = this.$tool.data.get('RouteTags') || []
       if (tags.length > 0) {
-
         tags.forEach((tag, index) => {
-          var isRoute = this.treeFind(this.menu, node => node.path == tag.path)
+          var isRoute = this.treeFind(this.menu, (node) => node.path == tag.path)
           if (isRoute) {
             this.addViewTags(tag)
           }
         })
       }
       this.addViewTags(this.$route)
-
     },
     //查找树
     treeFind(tree, func) {
@@ -162,8 +168,8 @@ export default {
       if (route.name && !route.meta.fullpage) {
         delete route.redirectedFrom
         route = { ...route, matched: [] }
-        this.$store.commit("pushViewTags", route)
-        this.$store.commit("pushKeepLive", route.name)
+        this.$store.commit('pushViewTags', route)
+        this.$store.commit('pushKeepLive', route.name)
         this.$tool.data.set('RouteTags', this.$store.state.viewTags.viewTags)
       }
 
@@ -172,10 +178,10 @@ export default {
     changeLeftRight() {
       //判断标签容器是否出现滚动条
       this.$nextTick(() => {
-        const tags = document.querySelector(".context-menu-list")
+        const tags = document.querySelector('.context-menu-list')
         if (tags && tags.scrollWidth > tags.clientWidth) {
           //确保当前标签在可视范围内
-          let targetTag = tags.querySelector(".active")
+          let targetTag = tags.querySelector('.active')
           targetTag.scrollIntoView()
           //显示提示
           if (!this.tipDisplayed) {
@@ -207,9 +213,9 @@ export default {
         return false
       }
 
-      this.$store.commit("removeViewTags", tag)
-      this.$store.commit("removeIframeList", tag)
-      this.$store.commit("removeKeepLive", tag.name)
+      this.$store.commit('removeViewTags', tag)
+      this.$store.commit('removeIframeList', tag)
+      this.$store.commit('removeKeepLive', tag.name)
       this.$tool.data.set('RouteTags', this.$store.state.viewTags.viewTags)
       if (autoPushLatestView && this.isActive(tag)) {
         const latestView = this.tagList.slice(-1)[0]
@@ -224,28 +230,28 @@ export default {
     },
     //tag右键
     openContextMenu(e, tag) {
-      this.contextMenuItem = tag;
-      this.contextMenuVisible = true;
-      this.left = e.clientX + 1;
-      this.top = e.clientY + 1;
+      this.contextMenuItem = tag
+      this.contextMenuVisible = true
+      this.left = e.clientX + 1
+      this.top = e.clientY + 1
 
       //FIX 右键菜单边缘化位置处理
       this.$nextTick(() => {
-        let sp = document.getElementById("contextmenu");
+        let sp = document.getElementById('contextmenu')
         if (document.body.offsetWidth - e.clientX < sp.offsetWidth) {
-          this.left = document.body.offsetWidth - sp.offsetWidth + 1;
-          this.top = e.clientY + 1;
+          this.left = document.body.offsetWidth - sp.offsetWidth + 1
+          this.top = e.clientY + 1
         }
       })
     },
     //关闭右键菜单
     closeMenu() {
-      this.contextMenuItem = null;
+      this.contextMenuItem = null
       this.contextMenuVisible = false
     },
     //TAB 刷新
     refreshTab() {
-      var nowTag = this.contextMenuItem;
+      var nowTag = this.contextMenuItem
       this.contextMenuVisible = false
       //判断是否当前路由，否的话跳转
       if (this.$route.fullPath != nowTag.fullPath) {
@@ -254,17 +260,17 @@ export default {
           query: nowTag.query
         })
       }
-      this.$store.commit("refreshIframe", nowTag)
-      this.$store.commit("removeKeepLive", nowTag.name)
-      this.$store.commit("setRouteShow", true)
+      this.$store.commit('refreshIframe', nowTag)
+      this.$store.commit('removeKeepLive', nowTag.name)
+      this.$store.commit('setRouteShow', true)
       this.$nextTick(() => {
-        this.$store.commit("pushKeepLive", nowTag.name)
-        this.$store.commit("setRouteShow", false)
+        this.$store.commit('pushKeepLive', nowTag.name)
+        this.$store.commit('setRouteShow', false)
       })
     },
     //TAB 关闭
     closeTabs() {
-      var nowTag = this.contextMenuItem;
+      var nowTag = this.contextMenuItem
       if (!nowTag.meta.affix) {
         this.closeSelectedTag(nowTag)
         this.contextMenuVisible = false
@@ -272,7 +278,7 @@ export default {
     },
     //TAB 关闭其他
     closeOtherTabs() {
-      var nowTag = this.contextMenuItem;
+      var nowTag = this.contextMenuItem
       //判断是否当前路由，否的话跳转
       if (this.$route.fullPath != nowTag.fullPath) {
         this.$router.push({
@@ -280,9 +286,9 @@ export default {
           query: nowTag.query
         })
       }
-      var tags = [...this.tagList];
-      tags.forEach(tag => {
-        if (tag.meta && tag.meta.affix || nowTag.fullPath == tag.fullPath) {
+      var tags = [...this.tagList]
+      tags.forEach((tag) => {
+        if ((tag.meta && tag.meta.affix) || nowTag.fullPath == tag.fullPath) {
           return true
         } else {
           this.closeSelectedTag(tag, false)
@@ -297,7 +303,7 @@ export default {
     },
     //TAB 最大化
     maximize() {
-      var nowTag = this.contextMenuItem;
+      var nowTag = this.contextMenuItem
       this.contextMenuVisible = false
       //判断是否当前路由，否的话跳转
       if (this.$route.fullPath != nowTag.fullPath) {
@@ -310,31 +316,34 @@ export default {
     },
     //新窗口打开
     openWindow() {
-      var nowTag = this.contextMenuItem;
-      var url = nowTag.href || '/';
+      var nowTag = this.contextMenuItem
+      var url = nowTag.href || '/'
       if (!nowTag.meta.affix) {
         this.closeSelectedTag(nowTag)
       }
-      window.open(url);
+      window.open(url)
       this.contextMenuVisible = false
     },
     //横向滚动
     scrollInit() {
       const scrollDiv = document.querySelector('.context-menu-list')
-      if (!scrollDiv) { return false }
-      scrollDiv.addEventListener('mousewheel', handler, false) || scrollDiv.addEventListener("DOMMouseScroll", handler, false)
+      if (!scrollDiv) {
+        return false
+      }
+      scrollDiv.addEventListener('mousewheel', handler, false) ||
+        scrollDiv.addEventListener('DOMMouseScroll', handler, false)
       function handler(event) {
-        const detail = event.wheelDelta || event.detail;
+        const detail = event.wheelDelta || event.detail
         //火狐上滚键值-3 下滚键值3，其他内核上滚键值120 下滚键值-120
-        const moveForwardStep = 1;
-        const moveBackStep = -1;
-        let step = 0;
-        if (detail == 3 || detail < 0 && detail != -3) {
-          step = moveForwardStep * 50;
+        const moveForwardStep = 1
+        const moveBackStep = -1
+        let step = 0
+        if (detail == 3 || (detail < 0 && detail != -3)) {
+          step = moveForwardStep * 50
         } else {
-          step = moveBackStep * 50;
+          step = moveBackStep * 50
         }
-        scrollDiv.scrollLeft += step;
+        scrollDiv.scrollLeft += step
       }
     },
     hideTip() {
@@ -356,32 +365,30 @@ export default {
         } else {
           return `${tag.meta.title}:${tag.query.id}`
         }
-
       } else {
         return tag.meta.title
       }
-
     },
     // 左滚动
     scrollLeft() {
-      this.scroll(-200);
+      this.scroll(-200)
     },
 
     // 右滚动
     scrollRight() {
-      this.scroll(200);
+      this.scroll(200)
     },
 
     // 执行滚动
     scroll(offset) {
-      const container = document.querySelector('.context-menu-list');
+      const container = document.querySelector('.context-menu-list')
       if (container) {
         container.scrollBy({
           left: offset,
           behavior: 'smooth'
-        });
+        })
       }
-    },
+    }
   }
 }
 </script>