byt-ui 0.1.14 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byt-ui",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "private": false,
   "description": "byt组件库",
   "author": {
@@ -35,6 +35,7 @@
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "babel-plugin-component": "^1.1.1",
+    "babel-plugin-import": "1.13.6",
     "babel-preset-env": "^1.7.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",

package/packages/common/modules/request.js

@@ -1,7 +1,6 @@
 import axios from 'axios'
 import { Message } from 'element-ui'
 import { getCookie } from './cookie'
-
 class Request {
   constructor(config = {}, Vue = null) {
     const { options = {}, handler = {}} = config;
@@ -18,6 +17,7 @@ class Request {
       '428': 'token过期，请重新登录',
       '429': '请求过频繁',
       '479': '演示环境，没有权限操作',
+      '503': '服务未启动，请联系管理员处理',
       'default': '系统未知错误,请反馈给管理员'
     }
     this._methods = ['get', 'post', 'delete', 'put']
@@ -26,17 +26,22 @@ class Request {
       baseURL: '/bytserver',
       responseType: 'json',
       timeout: 60000,
-      withCredentials: false
+      showError: true,
+      withCredentials: false,
+      validateStatus(status) {
+        // >=200或者<=500的统一由成功拦截处理
+        return status >= 200 && status <= 500 // 默认的
+      }
     }, options)
 
-    this.request = axios.create(this.options)
+    this._request = axios.create(this.options)
     // 注册fetch;
     this.register()
   }
 
   interceptors() {
     // HTTPrequest拦截
-    this.request.interceptors.request.use(config => {
+    this._request.interceptors.request.use(config => {
       const TENANT_ID = getCookie('tenantId')
       const isToken = (config.headers || {}).isToken === false
       const token = getCookie('access_token')
@@ -51,7 +56,7 @@ class Request {
     })
 
     // HTTPresponse拦截
-    this.request.interceptors.response.use(res => {
+    this._request.interceptors.response.use(res => {
       const status = Number(res.status) || 200
       const message = res.data.msg || this._errorCode[status] || this._errorCode['default']
       if (status == 424 || status == 428) {
@@ -61,7 +66,7 @@ class Request {
           const { outLogin } = this._Vue.prototype.$appCommon;
           outLogin && outLogin();
         }
-        return res.data
+        return Promise.reject(res.data)
       }
       if (status !== 200 || res.data.code === 1) {
         if (res.config.showError) Message.error(message)
@@ -70,7 +75,7 @@ class Request {
 
       this.handler.success && this.handler.success(res.data);
       return res.data
-    }, error => {
+    }, (error) => {
       if (error.response) {
         // const status = error.response.status
         const message = error.response.data.msg;
@@ -91,7 +96,7 @@ class Request {
   }
   setMethods() {
     this._methods.forEach(v => {
-      this.request[v] = ({
+      this._request[v] = ({
         url,
         data = {},
         params = {},
@@ -101,7 +106,7 @@ class Request {
         showError
       }) => {
         return new Promise((resolve, reject) => {
-          this.request({
+          this._request({
             url,
             method: v.toUpperCase(),
             data,
@@ -124,7 +129,7 @@ class Request {
             // 重试请求
             reject(err)
             if (retry > 0) {
-              this.request[v]({
+              this._request[v]({
                 url,
                 data,
                 params,
@@ -150,8 +155,8 @@ class Request {
 }
 
 export const fetch = (config = {}, Vue) => {
-  const { request } = new Request(Object.assign({}, config), Vue)
-  return request
+  const { _request } = new Request(Object.assign({}, config), Vue)
+  return _request
 }
 
 export default {

package/packages/index.js

@@ -2,26 +2,18 @@
  * @Description:
  * @Author: 王国火
  * @Date: 2022-09-15 17:02:55
- * @LastEditTime: 2024-04-18 16:27:33
+ * @LastEditTime: 2024-06-26 11:27:07
  * @LastEditors: 王国火
  */
-import Vue from 'vue'
+// import Vue from 'vue'
 // 通用组件
 import components from './components.js'
 // 公用方法
 import Common from './common/index'
 
 // 第三方依赖
-import 'xe-utils'
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-Vue.use(VXETable)
-Vue.use(ElementUI, {
-  size: 'small',
-  menuType: 'text'
-})
+import './plugins/element-ui.js'
+import './plugins/vxe-table.js'
 
 const Cmps = {}
 components.map(component => {

package/packages/plugins/element-ui.js

@@ -0,0 +1,103 @@
+import Vue from 'vue'
+import {
+  Pagination,
+  Dialog,
+  Autocomplete,
+  Input,
+  InputNumber,
+  Radio,
+  RadioGroup,
+  RadioButton,
+  Checkbox,
+  CheckboxButton,
+  CheckboxGroup,
+  Switch,
+  Select,
+  Option,
+  OptionGroup,
+  Button,
+  ButtonGroup,
+  Table,
+  TableColumn,
+  DatePicker,
+  Popover,
+  Tooltip,
+  Form,
+  FormItem,
+  Tabs,
+  TabPane,
+  Tag,
+  Tree,
+  Icon,
+  Row,
+  Col,
+  Upload,
+  Cascader,
+  Transfer,
+  Link,
+  Divider,
+  Image,
+  Loading,
+  MessageBox,
+  Message,
+  Empty
+} from 'element-ui';
+import langZHCN from 'element-ui/lib/locale/lang/zh-CN'
+import locale from 'element-ui/lib/locale'
+// import 'element-ui/lib/theme-chalk/index.css';
+// Vue.use(ElementUI, {
+//   size: 'small',
+//   menuType: 'text'
+// })
+locale.use(langZHCN)
+Vue.prototype.$ELEMENT = {
+  size: 'small',
+  menuType: 'text'
+}
+Vue.use(Pagination);
+Vue.use(Dialog);
+Vue.use(Autocomplete);
+Vue.use(Input);
+Vue.use(InputNumber);
+Vue.use(Radio);
+Vue.use(RadioGroup);
+Vue.use(RadioButton);
+Vue.use(Checkbox);
+Vue.use(CheckboxButton);
+Vue.use(CheckboxGroup);
+Vue.use(Switch);
+Vue.use(Select);
+Vue.use(Option);
+Vue.use(OptionGroup);
+Vue.use(Button);
+Vue.use(ButtonGroup);
+Vue.use(Table);
+Vue.use(TableColumn);
+Vue.use(DatePicker);
+Vue.use(Popover);
+Vue.use(Tooltip);
+Vue.use(Form);
+Vue.use(FormItem);
+Vue.use(Tabs);
+Vue.use(TabPane);
+Vue.use(Tag);
+Vue.use(Tree);
+Vue.use(Icon);
+Vue.use(Row);
+Vue.use(Col);
+Vue.use(Upload);
+Vue.use(Cascader);
+Vue.use(Transfer);
+Vue.use(Link);
+Vue.use(Divider);
+Vue.use(Image);
+Vue.use(Empty)
+Vue.use(Loading.directive);
+
+Vue.prototype.$loading = Loading.service;
+Vue.prototype.$msgbox = MessageBox;
+Vue.prototype.$alert = MessageBox.alert;
+Vue.prototype.$confirm = MessageBox.confirm;
+Vue.prototype.$prompt = MessageBox.prompt;
+Vue.prototype.$notify = Notification;
+Vue.prototype.$message = Message;

package/packages/plugins/vxe-table.js

@@ -0,0 +1,53 @@
+/*
+ * @Description:
+ * @Author: 王国火
+ * @Date: 2024-06-26 11:20:33
+ * @LastEditTime: 2024-06-26 12:02:26
+ * @LastEditors: 王国火
+ */
+import Vue from 'vue'
+import XEUtils from 'xe-utils'
+import {
+  // 全局实例对象
+  VXETable,
+  // 可选表格模块
+  // VxeTableFilterModule,
+  // VxeTableEditModule,
+  // VxeTableMenuModule,
+  // VxeTableExportModule,
+  // VxeTableKeyboardModule,
+  // VxeTableValidatorModule,
+  // VxeTableCustomModule,
+
+  // 可选组件
+  VxeIcon,
+  VxeTable,
+  VxeColumn,
+  VxeColgroup,
+  VxeInput
+} from 'vxe-table'
+
+// 导入默认的语言
+import zhCN from 'vxe-table/lib/locale/lang/zh-CN'
+
+// 按需加载的方式默认是不带国际化的，自定义国际化需要自行解析占位符 '{0}'，例如：
+VXETable.setConfig({
+  size: 'small',
+  i18n: (key, args) => XEUtils.toFormatString(XEUtils.get(zhCN, key), args)
+})
+
+// 可选表格模块
+// Vue.use(VxeTableFilterModule)
+// Vue.use(VxeTableEditModule)
+// Vue.use(VxeTableMenuModule)
+// Vue.use(VxeTableExportModule)
+// Vue.use(VxeTableKeyboardModule)
+// Vue.use(VxeTableValidatorModule)
+// Vue.use(VxeTableCustomModule)
+
+// 可选组件
+Vue.use(VxeIcon)
+Vue.use(VxeTable)
+Vue.use(VxeColumn)
+Vue.use(VxeColgroup)
+Vue.use(VxeInput)

package/.env.local

@@ -1,10 +0,0 @@
-###
- # @Description: 
- # @Author: 王国火
- # @Date: 2024-04-18 16:52:22
- # @LastEditTime: 2024-06-19 15:48:12
- # @LastEditors: 王国火
-### 
-VUE_APP_SERVER=http://192.168.0.125/bytserver
-VUE_APP_MINIO_HOST=192.168.0.125
-VUE_APP_MINIO_PORT=19000