bi-element-ui 1.6.3-beta.5 → 1.6.3-beta.6

package/packages/Icon/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
-component.install = function(Vue) {
+component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/Log/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
-component.install = function(Vue) {
+component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/Log/src/index.vue

@@ -223,7 +223,7 @@ export default {
                   <div class={'log-more'}>
                     <el-button
                       type={'text'}
-                      onclick={() => {
+                      onClick={() => {
                         this.showMore(row)
                       }}
                     >
@@ -288,7 +288,7 @@ export default {
                   <div class={'log-more'}>
                     <el-button
                       type={'text'}
-                      onclick={() => {
+                      onClick={() => {
                         this.showMore(row)
                       }}
                     >

package/packages/LogButton/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
-component.install = function(Vue) {
+component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/LogDialog/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
-component.install = function(Vue) {
+component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/MoreButton/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
-component.install = function(Vue) {
+component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/NavbarTool/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
 component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/NavbarTool/src/index.vue

@@ -4,14 +4,12 @@
       v-if="downloadCenter"
       ref="DownloadCenter"
       :loading="downloadStatus"
-      :token="token"
       :system="system"
       v-bind="$attrs"
     />
     <NoticeCenter
       v-if="noticeCenter"
       ref="NoticeCenter"
-      :token="token"
       :system="system"
       v-bind="$attrs"
     />
@@ -22,10 +20,7 @@
     />
     <el-divider direction="vertical"></el-divider>
 
-    <SystemLink
-      :token="token"
-      v-bind="$attrs"
-    />
+    <SystemLink v-bind="$attrs" />
   </div>
 </template>
 
@@ -36,6 +31,7 @@ import SystemLink from '../../SystemLink/src/index.vue'
 import Avatar from '../../Avatar/src/index.vue'
 import { getCurrentEnvURL } from '../../config/index'
 import { loadIcon } from '../../utils/svgIcon/index'
+import { getToken } from '../../utils/tools'
 export default {
   name: 'BiNavbarTool',
   components: { NoticeCenter, DownloadCenter, Avatar, SystemLink },
@@ -58,17 +54,18 @@ export default {
       system: this.$BI.system,
       ws: null,
       heartTimer: null,
-      downloadStatus: false
+      downloadStatus: false,
+      reconnectCount: 0,
+      maxReconnectAttempts: 5
     }
   },
   mounted() {
     this.heartTimer = null
+    this.reconnectCount = 0
     this.WebSocketInit()
-
-    this.$AccessReport.setToken(this.token)
     const { needIcon, env, iconInit } = this.$BI
     if (needIcon && !iconInit) {
-      loadIcon(this.token, env, (data) => {
+      loadIcon(getToken(), env, (data) => {
         this.$set(this.$BI, 'iconList', data.data)
         this.$set(this.$BI, 'iconInit', true)
       })
@@ -81,7 +78,7 @@ export default {
   methods: {
     WebSocketInit() {
       const baseUrl = getCurrentEnvURL(this.$BI.env || '').noticeCenterWebsocket.baseUrl
-      const url = baseUrl + `/ws/websocket/message?token=${this.token}&system=${this.system}`
+      const url = baseUrl + `/ws/websocket/message?token=${getToken()}&system=${this.system}`
       this.ws = new WebSocket(url)
       this.ws.onopen = this.wsOnopen
       this.ws.onmessage = this.wsOnmessage
@@ -92,6 +89,7 @@ export default {
       console.log('link-start!!!!!')
       clearInterval(this.heartTimer)
       this.heartTimer = null
+      this.reconnectCount = 0 // 连接成功后重置重连计数
       this.heartTimer = setInterval(() => {
         this.ws.send(JSON.stringify({ code: 1 }))
       }, 30000)
@@ -133,10 +131,18 @@ export default {
       console.log('wsOnclose: link-closed:', e)
       clearInterval(this.heartTimer)
       this.heartTimer = null
-      setTimeout(() => {
-        console.log('重新链接ws')
-        this.WebSocketInit()
-      }, 10000)
+
+      // 检查重连次数是否超过限制
+      if (this.reconnectCount < this.maxReconnectAttempts) {
+        this.reconnectCount++
+        console.log(`WebSocket 重连尝试 ${this.reconnectCount}/${this.maxReconnectAttempts}`)
+        setTimeout(() => {
+          console.log('重新链接ws')
+          this.WebSocketInit()
+        }, 10000)
+      } else {
+        console.log('WebSocket 重连次数已达上限，停止重连')
+      }
     }
   }
 }

package/packages/NoticeCenter/index.js

@@ -1,4 +1,4 @@
-import component from './src'
+import component from './src/index.vue'
 
 component.install = function (Vue) {
   Vue.component(component.name, component)

package/packages/NoticeCenter/src/index.vue

@@ -151,7 +151,7 @@
 import { diffTime } from '../../utils/time/index'
 import { getServiceURL } from '../../config/index'
 import request from '../../utils/request/noticeCenter'
-// import { getToken } from '@/utils/auth'
+import { getToken } from '../../utils/tools'
 export default {
   name: 'BiNoticeCenter',
   props: {
@@ -162,10 +162,6 @@ export default {
     system: {
       type: String,
       default: ''
-    },
-    token: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -233,11 +229,11 @@ export default {
       await request({
         url: this.baseUrl + '/admin/message/setPopup',
         headers: {
-          Authtoken: this.token
+          Authtoken: getToken()
         },
         method: 'post',
         data: {
-          token: this.token,
+          token: getToken(),
           system: this.system,
           msg_id
         }
@@ -247,7 +243,7 @@ export default {
       const res = await request({
         url: this.baseUrl + '/admin/message/getUnreadNum',
         headers: {
-          Authtoken: this.token
+          Authtoken: getToken()
         },
         method: 'post',
         data: {
@@ -271,7 +267,7 @@ export default {
       const res = await request({
         url: this.baseUrl + '/admin/message/getSystemMessage',
         headers: {
-          Authtoken: this.token
+          Authtoken: getToken()
         },
         method: 'post',
         data: {
@@ -308,7 +304,7 @@ export default {
       const res = await request({
         url: this.baseUrl + '/admin/message/read',
         headers: {
-          Authtoken: this.token
+          Authtoken: getToken()
         },
         method: 'post',
         data: {
@@ -327,7 +323,7 @@ export default {
       await request({
         url: this.baseUrl + '/admin/message/isReadAll',
         headers: {
-          Authtoken: this.token
+          Authtoken: getToken()
         },
         method: 'post',
         data: {

package/packages/Pagination/index.js

@@ -1,6 +1,7 @@
-import BiPagination from './src'
+import BiPagination from './src/index.vue'
 
 BiPagination.install = function (Vue) {
   Vue.component(BiPagination.name, BiPagination)
 }
+
 export default BiPagination

package/packages/SearchBlock/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
 component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/SuperDate/index.js

@@ -1,6 +1,7 @@
-import BiDatePicker from './src'
+import BiDatePicker from './src/index.vue'
 
 BiDatePicker.install = function (Vue) {
   Vue.component(BiDatePicker.name, BiDatePicker)
 }
+
 export default BiDatePicker

package/packages/SystemLink/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
 component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/SystemLink/src/index.vue

@@ -38,15 +38,11 @@
 <script>
 import { getCurrentEnvURL } from '../../config/index'
 import request from '../../utils/request/defaultRequest'
+import { getToken } from '../../utils/tools'
 
 export default {
   name: 'BiSystemLink',
-  props: {
-    token: {
-      type: String,
-      default: ''
-    }
-  },
+  props: {},
   data() {
     return {
       systemList: [],
@@ -65,7 +61,7 @@ export default {
         url: this.baseUrl + '/index/system',
         method: 'post',
         headers: {
-          Authorization: this.token,
+          Authorization: getToken(),
           AuthKey: 'authtpe84dzfl3iq62'
         }
       })
@@ -85,7 +81,7 @@ export default {
     goSystem({ link }) {
       const a = document.createElement('a')
       a.target = '_blank'
-      a.href = link + '?authorization=' + this.token
+      a.href = link + '?authorization=' + getToken()
       a.click()
     }
   }

package/packages/Table/index.js

@@ -1,4 +1,4 @@
-import BiTable from './src'
+import BiTable from './src/index.vue'
 
 BiTable.install = function (Vue) {
   Vue.component(BiTable.name, BiTable)

package/packages/TableHeaderPopper/index.js

@@ -1,6 +1,7 @@
-import component from './src'
+import component from './src/index.vue'
 
 component.install = function (Vue) {
   Vue.component(component.name, component)
 }
+
 export default component

package/packages/TaskCenter/Box.vue

@@ -151,6 +151,7 @@
 <script>
 import { taskOption, taskList } from './api'
 import { getServiceURL } from '../config/index'
+import { getToken } from '../utils/tools'
 export default {
   name: 'TaskCenterShow',
   props: {
@@ -158,10 +159,6 @@ export default {
       type: String,
       default: '组别'
     },
-    token: {
-      type: String,
-      default: ''
-    },
     userId: {
       type: String,
       default: ''
@@ -271,7 +268,7 @@ export default {
       this.search()
     },
     async getOption() {
-      const res = await taskOption(this.baseUrl, this.token)
+      const res = await taskOption(this.baseUrl, getToken())
       if (res.status_code === 1) {
         this.taskStatus = res.data.task_status
         this.taskType = res.data.task_types
@@ -298,7 +295,7 @@ export default {
     async getList(params = this.params) {
       this.loading = true
       // taskList
-      const res = await taskList(this.baseUrl, params, this.token)
+      const res = await taskList(this.baseUrl, params, getToken())
       this.loading = false
       if (res.status_code === 1) {
         this.tableData = res.data.data

package/packages/TextEditor/index.js

@@ -0,0 +1,7 @@
+import component from './index.vue'
+
+component.install = function (Vue) {
+  Vue.component(component.name, component)
+}
+
+export default component

package/packages/TooltipIcon/index.js

@@ -6,7 +6,7 @@
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \bi-element-ui\packages\TooltipIcon\index.js
  */
-import BiTooltipIcon from './src'
+import BiTooltipIcon from './src/index.vue'
 BiTooltipIcon.install = function (Vue) {
   Vue.component(BiTooltipIcon.name, BiTooltipIcon)
 }

package/packages/index.js

@@ -24,7 +24,7 @@ import BiSuperDate from './SuperDate'
 import BiTextEditor from './TextEditor'
 import BiFireworks from './Fireworks'
 
-import AccessReport from './AccessReport/index'
+import AccessReport from './AccessReport/index.js'
 
 import { loadSvg } from './utils/svgIcon/index'
 
@@ -52,6 +52,8 @@ const checkDependencies = () => {
     try {
       // 尝试 require (CommonJS/Node环境)
       if (typeof require !== 'undefined') {
+        // 使用 webpack 注释来忽略动态 require 警告
+        // eslint-disable-next-line
         require(dep.name.toLowerCase())
       } else if (typeof window !== 'undefined' && !window[dep.global]) {
         // 检查全局变量 (浏览器环境)
@@ -92,8 +94,8 @@ import BiElementUI from 'bi-element-ui/full'
   }
 }
 
-// 仅在外部依赖版本中进行检查
-if (process.env.BUILD_TARGET !== 'full') {
+// 仅在外部依赖版本中进行检查，且不在开发环境中
+if (process.env.BUILD_TARGET !== 'full' && process.env.NODE_ENV !== 'development') {
   checkDependencies()
 }
 

package/packages/utils/tools.js

@@ -21,3 +21,21 @@ export function randomStr(len) {
   var chat = new Date().getTime()
   return str + chat
 }
+
+// 清除所有 cookies 的函数
+export function removeAllCookies() {
+  const cookies = document.cookie.split(';')
+
+  cookies.forEach((cookie) => {
+    const eqPos = cookie.indexOf('=')
+    const name = eqPos > -1 ? cookie.substr(0, eqPos).trim() : cookie.trim()
+
+    if (name) {
+      // 尝试不同的路径和域名组合来确保 cookie 被删除
+      Cookies.remove(name)
+      Cookies.remove(name, { path: '/' })
+      Cookies.remove(name, { path: '/', domain: window.location.hostname })
+      Cookies.remove(name, { path: '/', domain: '.' + window.location.hostname })
+    }
+  })
+}