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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bi-element-ui",
-  "version": "1.6.3-beta.6",
+  "version": "1.6.3-beta.8",
   "private": false,
   "description": "基于 bi-eleme 编写的企业级 Vue 2 UI 组件库",
   "main": "lib/bi-element-ui-externals.common.js",
@@ -88,7 +88,6 @@
     "autoprefixer": "^10.4.14",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^9.1.2",
-    "bi-eleme": "^2.4.5",
     "chai": "^4.3.7",
     "clean-webpack-plugin": "^4.0.0",
     "commitizen": "^4.3.0",
@@ -105,7 +104,6 @@
     "html-webpack-plugin": "^5.5.0",
     "image-webpack-loader": "^8.1.0",
     "mini-css-extract-plugin": "^2.7.5",
-    "moment": "^2.29.4",
     "node-gyp": "^6.1.0",
     "postcss": "^8.4.21",
     "postcss-loader": "^7.1.0",
@@ -114,7 +112,6 @@
     "style-loader": "^3.3.2",
     "terser-webpack-plugin": "^5.3.7",
     "url-loader": "^4.1.1",
-    "vue": "^2.7.14",
     "vue-loader": "^15.10.1",
     "vue-router": "^3.6.5",
     "vue-style-loader": "^4.1.3",
@@ -130,7 +127,8 @@
     "bi-eleme": "^2.4.5",
     "moment": "^2.29.4",
     "axios": "^0.19.2",
-    "js-cookie": "^3.0.1"
+    "js-cookie": "^3.0.1",
+    "md5": "^2.3.0"
   },
   "peerDependenciesMeta": {
     "axios": {

package/packages/AccessReport/index.js

@@ -34,6 +34,7 @@ var AccessReport = /** @class */ (function () {
             method: 'post',
             headers: {
                 authorization: (0, tools_1.getToken)(),
+                'zw-csrf-token': (0, tools_1.getCSFToken)(),
                 'Login-Device': JSON.stringify(this.browserType())
             },
             data: data

package/packages/AccessReport/index.ts

@@ -1,5 +1,5 @@
 import request from '../utils/request/accessReport'
-import { getToken } from '../utils/tools'
+import { getToken, getCSFToken } from '../utils/tools'
 class AccessReport {
   systemName = ''
   authorization = ''
@@ -33,6 +33,7 @@ class AccessReport {
       method: 'post',
       headers: {
         authorization: getToken(),
+        'zw-csrf-token': getCSFToken(),
         'Login-Device': JSON.stringify(this.browserType())
       },
       data

package/packages/Log/src/index.vue

@@ -360,15 +360,17 @@ export default {
       this.clickSearch()
     },
     initOptions() {
-      this.$BiRequest({
-        url: '/systemlog/options',
-        method: 'post'
-      }).then((res) => {
-        if (res.status_code === 1) {
-          this.optionsList.model = res.data.model
-          this.optionsList.operate_name = res.data.operate_name
-        }
-      })
+      this.$BI
+        .request({
+          url: '/systemlog/options',
+          method: 'post'
+        })
+        .then((res) => {
+          if (res.status_code === 1) {
+            this.optionsList.model = res.data.model
+            this.optionsList.operate_name = res.data.operate_name
+          }
+        })
     },
     singleLogSearch() {},
     clickSearch() {
@@ -381,33 +383,35 @@ export default {
     },
     dataSearch() {
       this.tableLoading = true
-      this.$BiRequest({
-        url: '/systemlog/list',
-        method: 'post',
-        data: this.params
-      }).then((res) => {
-        if (res.status_code === 1) {
-          if (this.params.page > 1) {
-            if (res.data.data.length) {
+      this.$BI
+        .request({
+          url: '/systemlog/list',
+          method: 'post',
+          data: this.params
+        })
+        .then((res) => {
+          if (res.status_code === 1) {
+            if (this.params.page > 1) {
+              if (res.data.data.length) {
+                this.tableData = res.data.data
+              }
+            } else {
               this.tableData = res.data.data
             }
-          } else {
-            this.tableData = res.data.data
-          }
-          if (this.params.page >= this.pageCount) {
-            if (res.data.data.length < this.formData.limit) {
-              this.pageCount = this.params.page
-            } else {
-              this.pageCount = this.params.page + 1
+            if (this.params.page >= this.pageCount) {
+              if (res.data.data.length < this.formData.limit) {
+                this.pageCount = this.params.page
+              } else {
+                this.pageCount = this.params.page + 1
+              }
             }
-          }
 
-          this.tableData.map((item) => {
-            this.$set(item, 'showLength', item.operates && item.operates.length > 3 ? 3 : 0)
-          })
-        }
-        this.tableLoading = false
-      })
+            this.tableData.map((item) => {
+              this.$set(item, 'showLength', item.operates && item.operates.length > 3 ? 3 : 0)
+            })
+          }
+          this.tableLoading = false
+        })
     },
     reset() {
       this.$set(this, 'formData', {

package/packages/NavbarTool/src/index.vue

@@ -65,7 +65,7 @@ export default {
     this.WebSocketInit()
     const { needIcon, env, iconInit } = this.$BI
     if (needIcon && !iconInit) {
-      loadIcon(getToken(), env, (data) => {
+      loadIcon(env, (data) => {
         this.$set(this.$BI, 'iconList', data.data)
         this.$set(this.$BI, 'iconInit', true)
       })

package/packages/TableHeaderPopper/src/popper.js

@@ -1,4 +1,4 @@
-import { getToken, getSystem, getEnv } from '../../utils/tools'
+import { getToken, getSystem, getEnv, getCSFToken } from '../../utils/tools'
 import { getCurrentEnvURL } from '../../config/index'
 import request from '../../utils/request/defaultRequest'
 
@@ -8,6 +8,7 @@ export default class HeaderPopper {
     this.popperData = []
     this.module = moduleName || ''
     this.authorization = getToken()
+    this.csfToken = getCSFToken()
     this.system = getSystem()
     this.$BiEnv = getEnv()
     this.baseUrl = getCurrentEnvURL(this.$BiEnv || '').zhangquan.baseUrl
@@ -28,6 +29,7 @@ export default class HeaderPopper {
       method: 'post',
       headers: {
         Authorization: this.authorization,
+        'zw-csrf-token': this.csfToken,
         System: this.system
       },
       data: {
@@ -60,6 +62,7 @@ export default class HeaderPopper {
         method: 'post',
         headers: {
           Authorization: this.authorization,
+          'zw-csrf-token': this.csfToken,
           System: this.system
         },
         data: obj
@@ -78,6 +81,7 @@ export default class HeaderPopper {
       method: 'post',
       headers: {
         Authorization: this.authorization,
+        'zw-csrf-token': this.csfToken,
         System: this.system
       },
       data: {

package/packages/index.js

@@ -42,7 +42,8 @@ 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: 'moment', global: 'moment', package: 'moment@^2.29.4' },
+    { name: 'md5', global: 'md5', package: 'md5@^2.3.0' }
   ]
 
   const missingDeps = []
@@ -109,19 +110,16 @@ const install = function (Vue, config = {}) {
     iconInit: false,
     iconList: {}
   }
-  if (config && config.request) {
-    Vue.prototype.$BiRequest = config.request
-  }
   if (config && config.needIcon) {
     Vue.prototype.$BI.needIcon = true
   }
 
-  Vue.prototype.$BiEnv = config.env || 'production'
+  // Vue.prototype.$BiEnv = config.env || 'production'
   Vue.prototype.$AccessReport = new AccessReport({ system: config.system, env: config.env || 'production' })
   window.$BI = Vue.prototype.$BI
   window.$AccessReport = Vue.prototype.$AccessReport
-  window.$BiEnv = Vue.prototype.$BiEnv
-  window.$BiSystem = Vue.prototype.$BiSystem
+  window.$BiEnv = Vue.prototype.$BI.env
+  window.$BiSystem = Vue.prototype.$BI.system
 
   Cookies.set('$BiEnv', config.env)
   Cookies.set('$BiSystem', config.system)

package/packages/utils/ossUpload.js

@@ -1,10 +1,11 @@
 import OSS from 'ali-oss'
-import { getToken, getSystem, getEnv, randomStr } from './tools'
+import { getToken, getSystem, getEnv, randomStr, getCSFToken } from './tools'
 import { getCurrentEnvURL } from '../config/index'
 import request from './request/defaultRequest'
 import moment from 'moment'
 export default function ossUpload(file, config, progressCallback) {
   const authorization = getToken()
+  const csfToken = getCSFToken()
   const system = getSystem()
   const $BiEnv = getEnv()
 
@@ -29,6 +30,7 @@ export default function ossUpload(file, config, progressCallback) {
       method: 'post',
       headers: {
         Authorization: authorization,
+        'zw-csrf-token': csfToken,
         System: system
       }
     }).then((result) => {
@@ -49,6 +51,7 @@ export default function ossUpload(file, config, progressCallback) {
             method: 'post',
             headers: {
               Authorization: authorization,
+              'zw-csrf-token': csfToken,
               System: system
             }
           })

package/packages/utils/request/accessReport.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import { Message } from 'bi-eleme'
+import { getToken, getCSFToken } from '../tools'
 // create an axios instance
 
 const service = axios.create({
@@ -11,6 +12,8 @@ const service = axios.create({
 service.interceptors.request.use(
   (config) => {
     config.headers['Content-Type'] = 'application/json'
+    config.headers['Authorization'] = getToken()
+    config.headers['zw-csrf-token'] = getCSFToken()
     return config
   },
   (error) => {

package/packages/utils/request/defaultRequest.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import { Message } from 'bi-eleme'
+import { getToken, getCSFToken } from '../tools'
 // create an axios instance
 
 const service = axios.create({
@@ -11,6 +12,8 @@ const service = axios.create({
 service.interceptors.request.use(
   (config) => {
     config.headers['Content-Type'] = 'application/json'
+    config.headers['Authorization'] = getToken()
+    config.headers['zw-csrf-token'] = getCSFToken()
     return config
   },
   (error) => {

package/packages/utils/request/exportDownload.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import { Message } from 'bi-eleme'
+import { getToken, getCSFToken } from '../tools'
 // create an axios instance
 
 const service = axios.create({
@@ -11,6 +12,8 @@ const service = axios.create({
 service.interceptors.request.use(
   (config) => {
     config.headers['Content-Type'] = 'application/json'
+    config.headers['token'] = getToken()
+    config.headers['zw-csrf-token'] = getCSFToken()
     return config
   },
   (error) => {

package/packages/utils/request/noticeCenter.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import { Message } from 'bi-eleme'
+import { getToken, getCSFToken } from '../tools'
 
 // create an axios instance
 const service = axios.create({
@@ -11,6 +12,8 @@ const service = axios.create({
 service.interceptors.request.use(
   (config) => {
     config.headers['Content-Type'] = 'application/json'
+    config.headers['Authtoken'] = getToken()
+    config.headers['zw-csrf-token'] = getCSFToken()
     return config
   },
   (error) => {

package/packages/utils/svgIcon/index.js

@@ -1,5 +1,6 @@
 import request from '../request/defaultRequest'
 import { getCurrentEnvURL } from '../../config/index'
+import { getCSFToken, getToken } from '../tools'
 
 function getIconUrl(character, baseUrl) {
   return request({
@@ -10,11 +11,12 @@ function getIconUrl(character, baseUrl) {
     }
   })
 }
-function getIconList(baseUrl, authorization) {
+function getIconList(baseUrl) {
   return request({
     headers: {
       AuthKey: 'authtpe84dzfl3iq62',
-      authorization: authorization
+      authorization: getToken(),
+      'zw-csrf-token': getCSFToken()
     },
     url: baseUrl + '/api/icon/list',
     method: 'post'
@@ -37,9 +39,9 @@ export function loadSvg(character, env) {
     }
   })
 }
-export function loadIcon(authorization, env, callback) {
+export function loadIcon(env, callback) {
   const baseUrl = getCurrentEnvURL(env || '').zhangquan.baseUrl
-  getIconList(baseUrl, authorization).then((res) => {
+  getIconList(baseUrl).then((res) => {
     if (res.status_code === 1) {
       callback(res.data)
       setTimeout(() => {

package/packages/utils/tools.js

@@ -1,8 +1,13 @@
 import Cookies from 'js-cookie'
+import md5 from 'md5'
 
-export function getToken(key = 'authorization') {
+export function getToken(key = 'zw-authorization') {
   return Cookies.get(key)
 }
+export function getCSFToken(key = 'zw-csrf-token') {
+  const token = Cookies.get(key)
+  return token ? md5(token) : ''
+}
 export function getSystem(key = '$BiSystem') {
   return Cookies.get(key)
 }

package/packages/SystemLink/src/newFile.js

@@ -1,57 +0,0 @@
-/* __placeholder__ */
-export default (await import('vue')).defineComponent({
-  name: 'BiSystemLink',
-  props: {
-    request: {
-      type: Function,
-      default: () => {
-        return () => {}
-      }
-    },
-    test: {
-      type: Function,
-      default: () => {
-        return () => {}
-      }
-    },
-    token: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      systemList: []
-    }
-  },
-  mounted() {
-    // this.getZqToken()
-    // this.getSystemList()
-  },
-  methods: {
-    async getSystemList() {
-      const res = await this.request({
-        url: '/sys_common/system',
-        method: 'post'
-      })
-      if (res.status_code === 1) {
-        this.systemList = res.data
-      }
-    },
-    async getZqToken() {
-      const res = await this.request({
-        url: '/sys_common/getZqToken',
-        method: 'post'
-      })
-      if (res.status_code === 1) {
-        this.zqToken = res.data
-      }
-    },
-    goSystem({ link }) {
-      const a = document.createElement('a')
-      a.target = '_blank'
-      a.href = link + '?authorization=' + this.token
-      a.click()
-    }
-  }
-})