bi-element-ui 1.6.3-beta.11 → 1.6.3-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bi-element-ui",
-  "version": "1.6.3-beta.11",
+  "version": "1.6.3-beta.12",
   "private": false,
   "description": "基于 bi-eleme 编写的企业级 Vue 2 UI 组件库",
   "main": "lib/bi-element-ui-externals.common.js",

package/packages/AccessReport/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var accessReport_1 = require("../utils/request/accessReport");
+var accessReport_1 = require("../utils/request/defaultRequest");
 var AccessReport = /** @class */ (function () {
     function AccessReport(_a) {
         var _b = _a.system, system = _b === void 0 ? '' : _b, _c = _a.authorization, authorization = _c === void 0 ? '' : _c, _d = _a.env, env = _d === void 0 ? 'production' : _d;

package/packages/AccessReport/index.ts

@@ -1,4 +1,4 @@
-import request from '../utils/request/accessReport'
+import request from '../utils/request/defaultRequest'
 class AccessReport {
   systemName = ''
   authorization = ''

package/packages/DownloadCenter/src/index.vue

@@ -76,8 +76,7 @@
 </template>
 
 <script>
-import request from '../../utils/request/exportDownload'
-import { getCurrentEnvURL } from '../../config/index'
+import request from '../../utils/request/index.js'
 import Box from './Box'
 import TaskCenterBox from '../../TaskCenter/Box.vue'
 export default {
@@ -115,19 +114,15 @@ export default {
       downloadingImg: 'https://wanxiaomeng-1255977238.file.myqcloud.com/bi-element-ui/DownloadCenter/downloadingnew.gif',
       drawerVisible: false,
       badgeDot: false,
-      baseUrl: '',
       tabsName: ''
     }
   },
-  mounted() {
-    this.baseUrl = getCurrentEnvURL(this.$BI.env || '').downloadCenter.baseUrl
-    // this.readSignTask()
-  },
   methods: {
     getExportList(params) {
       return request({
-        url: this.baseUrl + '/task/index',
-        method: 'post',
+        env: this.$BI.env,
+        system: 'export',
+        api: '/task/index',
         data: Object.assign({ origin_system: this.system }, params)
       })
     },

package/packages/NoticeCenter/src/index.vue

@@ -149,9 +149,7 @@
 <script>
 // import WebSocketClass from '../../WebSocket'
 import { diffTime } from '../../utils/time/index'
-import { getServiceURL } from '../../config/index'
-import request from '../../utils/request/noticeCenter'
-import { getToken } from '../../utils/tools'
+import request from '../../utils/request/index.js'
 export default {
   name: 'BiNoticeCenter',
   props: {
@@ -187,8 +185,7 @@ export default {
       noticeListLoading: false,
       noMore: false,
       detailData: {},
-      noticeList: [],
-      baseUrl: ''
+      noticeList: []
     }
   },
   computed: {
@@ -197,7 +194,6 @@ export default {
     }
   },
   mounted() {
-    this.baseUrl = getServiceURL('noticeCenter', this.$BI.env || '')
     this.noticeList = []
     this.last_id = ''
     this.last_send_time = ''
@@ -227,13 +223,10 @@ export default {
     },
     async noticePoped(msg_id) {
       await request({
-        url: this.baseUrl + '/admin/message/setPopup',
-        headers: {
-          Authtoken: getToken()
-        },
-        method: 'post',
+        env: this.$BI.env,
+        system: 'service_center',
+        api: '/api/admin/message/setPopup',
         data: {
-          token: getToken(),
           system: this.system,
           msg_id
         }
@@ -241,11 +234,9 @@ export default {
     },
     async initUnreadNum() {
       const res = await request({
-        url: this.baseUrl + '/admin/message/getUnreadNum',
-        headers: {
-          Authtoken: getToken()
-        },
-        method: 'post',
+        env: this.$BI.env,
+        system: 'service_center',
+        api: '/api/admin/message/getUnreadNum',
         data: {
           system: this.system
         }
@@ -265,11 +256,9 @@ export default {
     async getNoticeList() {
       this.noticeListLoading = true
       const res = await request({
-        url: this.baseUrl + '/admin/message/getSystemMessage',
-        headers: {
-          Authtoken: getToken()
-        },
-        method: 'post',
+        env: this.$BI.env,
+        system: 'service_center',
+        api: '/api/admin/message/getSystemMessage',
         data: {
           system: this.system,
           last_id: this.last_id,
@@ -302,11 +291,9 @@ export default {
     },
     async handleNoticeRead(msg_id) {
       const res = await request({
-        url: this.baseUrl + '/admin/message/read',
-        headers: {
-          Authtoken: getToken()
-        },
-        method: 'post',
+        env: this.$BI.env,
+        system: 'service_center',
+        api: '/api/admin/message/read',
         data: {
           system: this.system,
           msg_id
@@ -321,11 +308,9 @@ export default {
     },
     async noticeAllRead() {
       await request({
-        url: this.baseUrl + '/admin/message/isReadAll',
-        headers: {
-          Authtoken: getToken()
-        },
-        method: 'post',
+        env: this.$BI.env,
+        system: 'service_center',
+        api: '/api/admin/message/isReadAll',
         data: {
           system: this.system,
           type: 'system'

package/packages/SystemLink/src/index.vue

@@ -36,8 +36,7 @@
 </template>
 
 <script>
-import { getCurrentEnvURL } from '../../config/index'
-import request from '../../utils/request/defaultRequest'
+import request from '../../utils/request/index.js'
 import { getToken } from '../../utils/tools'
 
 export default {
@@ -45,24 +44,19 @@ export default {
   props: {},
   data() {
     return {
-      systemList: [],
-      baseUrl: ''
+      systemList: []
     }
   },
   mounted() {
-    this.baseUrl = getCurrentEnvURL(this.$BI.env || '').zhangquan.baseUrl
-
     // this.getZqToken()
     this.getSystemList()
   },
   methods: {
     async getSystemList() {
       const res = await request({
-        url: this.baseUrl + '/index/system',
-        headers: {
-          'authkey': 'authtpe84dzfl3iq62'
-        },
-        method: 'post'
+        env: this.$BI.env,
+        system: 'zq',
+        api: '/api/index/system'
       })
       if (res.status_code === 1) {
         this.systemList = res.data

package/packages/TableHeaderPopper/src/popper.js

@@ -1,6 +1,5 @@
 import { getSystem, getEnv } from '../../utils/tools'
-import { getCurrentEnvURL } from '../../config/index'
-import request from '../../utils/request/defaultRequest'
+import request from '../../utils/request/index.js'
 
 export default class HeaderPopper {
   constructor(moduleName) {
@@ -9,7 +8,6 @@ export default class HeaderPopper {
     this.module = moduleName || ''
     this.system = getSystem()
     this.$BiEnv = getEnv()
-    this.baseUrl = getCurrentEnvURL(this.$BiEnv || '').zhangquan.baseUrl
     if (this.module) {
       this.getPopperList()
     }
@@ -23,11 +21,9 @@ export default class HeaderPopper {
 
   async getPopperList() {
     const res = await request({
-      url: this.baseUrl + '/common/table_head/list',
-      method: 'post',
-      headers: {
-        System: this.system
-      },
+      env: this.$BI.env,
+      system: 'zq',
+      api: '/common/table_head/list',
       data: {
         module: this.module
       }
@@ -54,11 +50,9 @@ export default class HeaderPopper {
         obj.id = params.id
       }
       request({
-        url: this.baseUrl + '/common/table_head/save',
-        method: 'post',
-        headers: {
-          System: this.system
-        },
+        env: this.$BI.env,
+        system: 'zq',
+        api: '/common/table_head/save',
         data: obj
       }).then((res) => {
         if (res.status_code === 1) {
@@ -71,11 +65,9 @@ export default class HeaderPopper {
 
   async delPopperItem(id) {
     return request({
-      url: this.baseUrl + '/common/table_head/del',
-      method: 'post',
-      headers: {
-        System: this.system
-      },
+      env: this.$BI.env,
+      system: 'zq',
+      api: '/common/table_head/del',
       data: {
         id
       }

package/packages/TaskCenter/Box.vue

@@ -150,7 +150,6 @@
 
 <script>
 import { taskOption, taskList } from './api'
-import { getServiceURL } from '../config/index'
 export default {
   name: 'TaskCenterShow',
   props: {
@@ -225,8 +224,7 @@ export default {
       showInfo: {
         visible: false,
         info: ''
-      },
-      baseUrl: ''
+      }
     }
   },
   computed: {
@@ -245,7 +243,6 @@ export default {
     }
   },
   mounted() {
-    this.baseUrl = getServiceURL('noticeCenter', this.$BI.env || '')
     this.handlerOpen()
   },
   methods: {
@@ -267,7 +264,7 @@ export default {
       this.search()
     },
     async getOption() {
-      const res = await taskOption(this.baseUrl)
+      const res = await taskOption(this.$BI.env)
       if (res.status_code === 1) {
         this.taskStatus = res.data.task_status
         this.taskType = res.data.task_types
@@ -294,7 +291,7 @@ export default {
     async getList(params = this.params) {
       this.loading = true
       // taskList
-      const res = await taskList(this.baseUrl, params)
+      const res = await taskList(this.$BI.env, params)
       this.loading = false
       if (res.status_code === 1) {
         this.tableData = res.data.data

package/packages/TaskCenter/api.js

@@ -1,15 +1,19 @@
-import request from '../utils/request/noticeCenter'
-export const taskOption = (baseUrl) => {
+// import request from '../utils/request/noticeCenter'
+import request from '../utils/request/index.js'
+
+export const taskOption = (env = 'production') => {
   return request({
-    url: baseUrl + '/admin/task/option',
-    method: 'get'
+    env: env,
+    system: 'service_center',
+    api: '/api/admin/task/option'
   })
 }
 
-export const taskList = (baseUrl, data) => {
+export const taskList = (env, data) => {
   return request({
-    url: baseUrl + '/admin/task/taskMessages',
-    method: 'post',
-    data
+    env: env,
+    system: 'service_center',
+    api: '/api/admin/task/taskMessages',
+    data: data
   })
 }

package/packages/config/index.js

@@ -2,7 +2,6 @@
  * 环境配置管理
  * 支持的环境: development, dev, staging, stage, production, prod, release
  */
-
 // 基础环境常量
 const ENV_TYPES = {
   DEVELOPMENT: 'development',
@@ -26,26 +25,26 @@ const ENV_ALIASES = {
 const BASE_URLS = {
   [ENV_TYPES.DEVELOPMENT]: {
     noticeCenterWebsocket: { baseUrl: 'wss://message.wanqudianchi.com/' },
-    noticeCenter: { baseUrl: '/scenter-dev' },
-    downloadCenter: { baseUrl: '/export-dev' },
+    noticeCenter: { baseUrl: '/zhangquan-dev' },
+    downloadCenter: { baseUrl: '/zhangquan-dev' },
     zhangquan: { baseUrl: '/zhangquan-dev' }
   },
   [ENV_TYPES.STAGING]: {
     noticeCenterWebsocket: { baseUrl: 'wss://message.wanqudianchi.com/' },
-    noticeCenter: { baseUrl: 'https://scenter.zwwlkj03.top/api' },
-    downloadCenter: { baseUrl: 'https://export.zwwlkj03.top' },
+    noticeCenter: { baseUrl: 'https://zq.zwwlkj03.top/api' },
+    downloadCenter: { baseUrl: 'https://zq.zwwlkj03.top/api' },
     zhangquan: { baseUrl: 'https://zq.zwwlkj03.top/api' }
   },
   [ENV_TYPES.PRODUCTION]: {
     noticeCenterWebsocket: { baseUrl: 'wss://message.zwnet.cn/' },
-    noticeCenter: { baseUrl: 'https://scenter.wozhangwan.com/api' },
-    downloadCenter: { baseUrl: 'https://export.wozhangwan.com' },
+    noticeCenter: { baseUrl: 'https://zq.wozhangwan.com/api' },
+    downloadCenter: { baseUrl: 'https://zq.wozhangwan.com/api' },
     zhangquan: { baseUrl: 'https://zq.wozhangwan.com/api' }
   },
   [ENV_TYPES.RELEASE]: {
     noticeCenterWebsocket: { baseUrl: 'wss://message.wanqudianchi.com/' },
-    noticeCenter: { baseUrl: 'https://scenter.zwwlkj03.top/api' },
-    downloadCenter: { baseUrl: 'https://export.zwwlkj03.top' },
+    noticeCenter: { baseUrl: 'https://zq.zwwlkj03.top/api' },
+    downloadCenter: { baseUrl: 'https://zq.zwwlkj03.top/api' },
     zhangquan: { baseUrl: 'https://zq.zwwlkj03.top/api' }
   }
 }
@@ -89,7 +88,7 @@ const getCurrentEnvURL = (env = 'production') => {
  */
 const getServiceURL = (service, env = 'production') => {
   const config = getCurrentEnvURL(env)
-  return (config[service] && config[service].baseUrl) || ''
+  return config['zhangquan'].baseUrl || ''
 }
 
 // 兼容性：保持原有的URLConfig导出

package/packages/index.js

@@ -40,62 +40,62 @@ const components = [BiTable, BiCustomColumn, BiDatePicker, BiDownloadCenter, BiM
 // =============================================
 // 依赖检查机制 - 运行时检查必要的外部依赖
 // =============================================
-const checkDependencies = () => {
-  const requiredDeps = [
-    { name: 'Vue', global: 'Vue', package: 'vue@^2.6.0' },
-    { name: 'ELEMENT', global: 'ELEMENT', package: 'bi-eleme@^2.4.5' },
-    { name: 'moment', global: 'moment', package: 'moment@^2.29.4' },
-    { name: 'md5', global: 'md5', package: 'md5@^2.3.0' }
-  ]
-
-  const missingDeps = []
-
-  // 检查每个必要依赖
-  requiredDeps.forEach((dep) => {
-    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]) {
-        // 检查全局变量 (浏览器环境)
-        missingDeps.push(dep)
-      }
-    } catch (e) {
-      // 在 ES 模块环境下，如果模块不存在会抛出错误
-      if (e.code === 'MODULE_NOT_FOUND' || e.message.includes('Cannot resolve module')) {
-        missingDeps.push(dep)
-      }
-    }
-  })
-
-  // 如果有缺失的依赖，显示友好的错误信息
-  if (missingDeps.length > 0) {
-    const depList = missingDeps.map((dep) => `  - ${dep.package}`).join('\n')
-    const errorMsg = `
-🚨 bi-element-ui: 缺少必要的依赖项
-
-请安装以下依赖项：
-${depList}
-
-安装命令：
-npm install ${missingDeps.map((d) => d.package.split('@')[0]).join(' ')}
-
-或者使用完整版本：
-import BiElementUI from 'bi-element-ui/full'
-
-更多信息请查看: https://github.com/your-repo/bi-element-ui#installation
-    `
-
-    console.error(errorMsg)
-
-    // 在开发环境下抛出错误，生产环境下只警告
-    if (process.env.NODE_ENV === 'development') {
-      throw new Error('bi-element-ui: Missing required dependencies')
-    }
-  }
-}
+// const checkDependencies = () => {
+//   const requiredDeps = [
+//     { name: 'Vue', global: 'Vue', package: 'vue@^2.6.0' },
+//     { name: 'ELEMENT', global: 'ELEMENT', package: 'bi-eleme@^2.4.5' },
+//     { name: 'moment', global: 'moment', package: 'moment@^2.29.4' },
+//     { name: 'md5', global: 'md5', package: 'md5@^2.3.0' }
+//   ]
+
+//   const missingDeps = []
+
+//   // 检查每个必要依赖
+//   requiredDeps.forEach((dep) => {
+//     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]) {
+//         // 检查全局变量 (浏览器环境)
+//         missingDeps.push(dep)
+//       }
+//     } catch (e) {
+//       // 在 ES 模块环境下，如果模块不存在会抛出错误
+//       if (e.code === 'MODULE_NOT_FOUND' || e.message.includes('Cannot resolve module')) {
+//         missingDeps.push(dep)
+//       }
+//     }
+//   })
+
+//   // 如果有缺失的依赖，显示友好的错误信息
+//   if (missingDeps.length > 0) {
+//     const depList = missingDeps.map((dep) => `  - ${dep.package}`).join('\n')
+//     const errorMsg = `
+// 🚨 bi-element-ui: 缺少必要的依赖项
+
+// 请安装以下依赖项：
+// ${depList}
+
+// 安装命令：
+// npm install ${missingDeps.map((d) => d.package.split('@')[0]).join(' ')}
+
+// 或者使用完整版本：
+// import BiElementUI from 'bi-element-ui/full'
+
+// 更多信息请查看: https://github.com/your-repo/bi-element-ui#installation
+//     `
+
+//     console.error(errorMsg)
+
+//     // 在开发环境下抛出错误，生产环境下只警告
+//     if (process.env.NODE_ENV === 'development') {
+//       throw new Error('bi-element-ui: Missing required dependencies')
+//     }
+//   }
+// }
 
 // 仅在外部依赖版本中进行检查，且不在开发环境中
 // 在浏览器环境中，我们假设依赖已经正确安装

package/packages/utils/request/defaultRequest.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import { Message } from 'bi-eleme'
 import { getCSFToken } from '../tools'
 // create an axios instance
-
 const service = axios.create({
   baseURL: '', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests

package/packages/utils/request/index.js

@@ -0,0 +1,28 @@
+import defaultRequest from './defaultRequest.js'
+import { getServiceURL } from '../../config/index'
+
+export default function request({ env = 'production', system, api, data }) {
+  const baseUrl = getServiceURL('', env)
+  if (system === 'zq') {
+    return defaultRequest({
+      url: baseUrl + api,
+      method: 'post',
+      headers: {
+        authkey: 'authtpe84dzfl3iq62'
+      },
+      data: data
+    })
+  }
+  return defaultRequest({
+    url: baseUrl + '/api/cross_system/request',
+    method: 'post',
+    headers: {
+      authkey: 'authtpe84dzfl3iq62'
+    },
+    data: {
+      system: system,
+      api: api,
+      params: data
+    }
+  })
+}

package/packages/utils/svgIcon/index.js

@@ -1,22 +1,20 @@
-import request from '../request/defaultRequest'
-import { getCurrentEnvURL } from '../../config/index'
+import request from '../request/index.js'
 
-function getIconUrl(character, baseUrl) {
+function getIconUrl(character, env) {
   return request({
-    url: baseUrl + '/data/system/getInfo',
-    method: 'post',
+    env: env,
+    system: 'zq',
+    api: '/data/system/getInfo',
     data: {
       character
     }
   })
 }
-function getIconList(baseUrl) {
+function getIconList(env) {
   return request({
-    headers: {
-      AuthKey: 'authtpe84dzfl3iq62'
-    },
-    url: baseUrl + '/api/icon/list',
-    method: 'post'
+    env: env,
+    system: 'zq',
+    api: '/api/icon/list'
   })
 }
 
@@ -26,9 +24,7 @@ function loadScript(url) {
   document.head.appendChild(script)
 }
 export function loadSvg(character, env) {
-  const baseUrl = getCurrentEnvURL(env || '').zhangquan.baseUrl
-
-  getIconUrl(character, baseUrl).then((res) => {
+  getIconUrl(character, env).then((res) => {
     if (res.status_code === 1 && res.data.icon_url) {
       setTimeout(() => {
         loadScript(res.data.icon_url)
@@ -37,8 +33,7 @@ export function loadSvg(character, env) {
   })
 }
 export function loadIcon(env, callback) {
-  const baseUrl = getCurrentEnvURL(env || '').zhangquan.baseUrl
-  getIconList(baseUrl).then((res) => {
+  getIconList(env).then((res) => {
     if (res.status_code === 1) {
       callback(res.data)
       setTimeout(() => {