eoss-ui 0.6.52 → 0.6.53

package/src/utils/http.js

@@ -1,50 +1,50 @@
-// 封装请求参数
-import util from './util.js';
-
-// function request({
-//   method = 'get',
-//   url,
-//   data = {},
-//   params = {},
-//   headers = {},
-//   format = true,
-//   mix = true
-// }) {
-//   if (
-//     method.toLowerCase() === 'post' &&
-//     !Object.prototype.hasOwnProperty.call(data, 'userId') &&
-//     util.getStorage('userId')
-//   ) {
-//     data.userId = util.getStorage('userId');
-//   }
-//   if (
-//     (method === 'get' || method === 'GET') &&
-//     !Object.prototype.hasOwnProperty.call(params, 'userId') &&
-//     util.getStorage('userId')
-//   ) {
-//     params.userId = util.getStorage('userId');
-//   }
-//   if (format && (method === 'post' || method === 'POST')) {
-//     data = qs.stringify(data);
-//     headers['content-type'] = 'application/x-www-form-urlencoded';
-//   }
-//   if (!mix && (method === 'get' || method === 'GET')) {
-//     data = {};
-//   }
-//   if (!mix && (method === 'post' || method === 'POST')) {
-//     params = {};
-//   }
-//   return http({
-//     method,
-//     url,
-//     data,
-//     params,
-//     headers
-//   });
-// }
-
-function request(params) {
-  return util.ajax({mix: true, ...params});
-}
-
-export default request;
+// 封装请求参数
+import util from './util.js';
+
+// function request({
+//   method = 'get',
+//   url,
+//   data = {},
+//   params = {},
+//   headers = {},
+//   format = true,
+//   mix = true
+// }) {
+//   if (
+//     method.toLowerCase() === 'post' &&
+//     !Object.prototype.hasOwnProperty.call(data, 'userId') &&
+//     util.getStorage('userId')
+//   ) {
+//     data.userId = util.getStorage('userId');
+//   }
+//   if (
+//     (method === 'get' || method === 'GET') &&
+//     !Object.prototype.hasOwnProperty.call(params, 'userId') &&
+//     util.getStorage('userId')
+//   ) {
+//     params.userId = util.getStorage('userId');
+//   }
+//   if (format && (method === 'post' || method === 'POST')) {
+//     data = qs.stringify(data);
+//     headers['content-type'] = 'application/x-www-form-urlencoded';
+//   }
+//   if (!mix && (method === 'get' || method === 'GET')) {
+//     data = {};
+//   }
+//   if (!mix && (method === 'post' || method === 'POST')) {
+//     params = {};
+//   }
+//   return http({
+//     method,
+//     url,
+//     data,
+//     params,
+//     headers
+//   });
+// }
+
+function request(params) {
+  return util.ajax({mix: true, ...params});
+}
+
+export default request;

package/src/utils/rules.js

@@ -1,18 +1,18 @@
-// 手机号
-const phone = {pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'), message: '手机号不合法'};
-// 身份证
-const idCard = {pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'), message: '身份证号不合法'};
-// 座机号
-const telephone = {pattern: new RegExp('^(\\d{3,4}-)?\\d{7,8}$'), message: '座机号不合法'};
-// IP
-const ip = {pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])$'), message: 'IP地址不合法'};
-// 银行卡号
-const bankCard = {pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message: '银行卡号不合法'};
-
-export default {
-  phone,
-  idCard,
-  telephone,
-  ip,
-  bankCard
-};
+// 手机号
+const phone = {pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'), message: '手机号不合法'};
+// 身份证
+const idCard = {pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'), message: '身份证号不合法'};
+// 座机号
+const telephone = {pattern: new RegExp('^(\\d{3,4}-)?\\d{7,8}$'), message: '座机号不合法'};
+// IP
+const ip = {pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])$'), message: 'IP地址不合法'};
+// 银行卡号
+const bankCard = {pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message: '银行卡号不合法'};
+
+export default {
+  phone,
+  idCard,
+  telephone,
+  ip,
+  bankCard
+};

package/src/utils/store.js

@@ -1,21 +1,21 @@
-let store = {
-  state: {},
-  set(name, value) {
-    this.state[name] = value;
-  },
-  get(name) {
-    return this.state[name];
-  },
-  clear(name) {
-    this.state[name] = null;
-  },
-  remove(name) {
-    if (name) {
-      delete this.state[name];
-    } else {
-      this.state = {};
-    }
-  }
-};
-window.__store = store;
-export default store;
+let store = {
+  state: {},
+  set(name, value) {
+    this.state[name] = value;
+  },
+  get(name) {
+    return this.state[name];
+  },
+  clear(name) {
+    this.state[name] = null;
+  },
+  remove(name) {
+    if (name) {
+      delete this.state[name];
+    } else {
+      this.state = {};
+    }
+  }
+};
+window.__store = store;
+export default store;

package/src/utils/util.js

@@ -562,8 +562,8 @@ const ajaxStream = function ({ controller, method = 'post', host, url, data, par
           if (line === '') {
             return;
           }
-          if (line.startsWith('data:')) {
-            const data = line.replace('data:', '').trim();
+          // if (line.startsWith('data:')) {
+            const data = line.startsWith('data:') ? line.replace('data:', '').trim() : line.trim();
             if (data) {
               try {
                 // 假设数据是 JSON 格式
@@ -610,13 +610,16 @@ const ajaxStream = function ({ controller, method = 'post', host, url, data, par
                 primeval += parsedData.message;
                 done = parsedData.done;
               } catch (parseError) {
-                console.error('解析数据出错:', parseError);
+                remainingData += line;
+                console.log('解析数据出错:', parseError);
               }
             }
-          } else {
-            // 保存未处理完的部分数据
-            remainingData += line + '\n';
-          }
+          // }
+          // else {
+          //   console.log('未处理的数据:', line);
+          //   // 保存未处理完的部分数据
+          //   remainingData += line.replace('data:', '\ndata:');
+          // }
         });
         info.primeval = primeval;
         info.chunk = chunks;
@@ -625,7 +628,7 @@ const ajaxStream = function ({ controller, method = 'post', host, url, data, par
         partialData = remainingData;
         progress && progress({ message: info, controller, done });
       }
-    }).then(() => {
+    }).then((results) => {
       // 处理请求完成后的信息
       const originalText = info.content;
       const regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -634,9 +637,9 @@ const ajaxStream = function ({ controller, method = 'post', host, url, data, par
         info.thinkContent = match ? match[1].trim() : '';
         info.content = match ? match[2].trim() : '';
       }
-      success && success({ message: info, controller });
+      success && success({ message: info, controller, results });
     })
-      .catch(() => {
+      .catch((results) => {
         // 处理请求完成后的信息
         const originalText = info.content || '';
         const regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
@@ -645,7 +648,7 @@ const ajaxStream = function ({ controller, method = 'post', host, url, data, par
           info.thinkContent = match ? match[1].trim() : '';
           info.content = match ? match[2].trim() : '';
         }
-        fail && fail({ status: 1, message: info, controller });
+        fail && fail({ status: 1, message: info, controller, results });
       });
   } catch (error) {
     console.error('聊天请求出错:', error);
@@ -734,7 +737,7 @@ const browser = function () {
 const busEmit = function (that, { method, args }) {
   const bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus : null;
   if (bus) {
-    bus.$emit(method, args);
+    Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
   } else {
     win.parent.postMessage({ method, query: args }, '*');
   }

package/src/utils/webSocket.js

@@ -1,107 +1,107 @@
-import SockJS from 'sockjs-client';
-import Stomp from 'stompjs';
-class WebSocket {
-  // 构造函数
-  constructor() {
-    this.host = sessionStorage.getItem('wshost') || '';
-    this.tryTimes = 1; // 重连次数
-    this.callback = null; // 回调函数
-    this.client = null; // stomp对象
-    this.reconTimeout = null; // 重连延时器
-    this.debug = true; // 调试
-    this.interval = 20; // 重连间隔时间
-    this.vm = null;
-    this.nextDate = 0;
-    this.connects = 1;
-    this.recon = false;
-    this.sendTimeout = null;
-    this.socket = null;
-    this.subscription = null;
-  }
-
-  /** socket连接 */
-  connect() {
-    if (!this.client) {
-    // 连接SockJS
-      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
-      this.client = Stomp.over(this.socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      this.client.debug = () => {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, () => {
-      this.recon = true;
-      // tryTimes定义重置
-      this.connects = 1;
-      // 订阅消息
-      this.subscribe();
-    }, (error) => {
-      this.unsubscribe();
-      this.client = null;
-      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
-      if (this.connects > 5 && diffSecond < this.interval) {
-        this.error && this.error(error);
-      } else {
-        this.reconTimeout = setTimeout(() => {
-          this.connect();
-          this.connects++;
-        }, 5000);
-      }
-    });
-  }// 清除订阅
-  unsubscribe() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-      this.subscription = null;
-    }
-  }
-  /** 订阅服务端 */
-  subscribe() {
-    // 订阅服务端提供的某个topic
-    this.subscription = this.client.subscribe(this.take, (response) => {
-      if (response && (this.callback || this.success)) {
-        let callback = this.callback || this.success;
-        callback(JSON.parse(response.body));
-      }
-    });
-  }
-
-  /** 赋值、初始化socket */
-  init(option, vm) {
-    for (let i in option) {
-      this[i] = option[i];
-    }
-    this.vm = vm;
-    // 初始化连接
-    this.connect();
-  }
-
-  /** 发送消息 */
-  send(data) {
-    if (this.recon) {
-      clearTimeout(this.sendTimeout);
-      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
-    } else {
-      this.sendTimeout = setTimeout(() => {
-        this.send(data);
-      }, 1000);
-    }
-  }
-
-  /** 销毁 */
-  destroy() {
-    // 断开连接,清除定时器
-    this.unsubscribe();
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  }
-}
-
-export default WebSocket;
+import SockJS from 'sockjs-client';
+import Stomp from 'stompjs';
+class WebSocket {
+  // 构造函数
+  constructor() {
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
+  }
+
+  /** socket连接 */
+  connect() {
+    if (!this.client) {
+    // 连接SockJS
+      this.socket = new SockJS(this.host + this.url, {timeout: 60000});
+      this.client = Stomp.over(this.socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      this.client.debug = () => {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, () => {
+      this.recon = true;
+      // tryTimes定义重置
+      this.connects = 1;
+      // 订阅消息
+      this.subscribe();
+    }, (error) => {
+      this.unsubscribe();
+      this.client = null;
+      let diffSecond = parseInt((new Date() - this.nextDate) / 1000, 10);
+      if (this.connects > 5 && diffSecond < this.interval) {
+        this.error && this.error(error);
+      } else {
+        this.reconTimeout = setTimeout(() => {
+          this.connect();
+          this.connects++;
+        }, 5000);
+      }
+    });
+  }// 清除订阅
+  unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  }
+  /** 订阅服务端 */
+  subscribe() {
+    // 订阅服务端提供的某个topic
+    this.subscription = this.client.subscribe(this.take, (response) => {
+      if (response && (this.callback || this.success)) {
+        let callback = this.callback || this.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  }
+
+  /** 赋值、初始化socket */
+  init(option, vm) {
+    for (let i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  }
+
+  /** 发送消息 */
+  send(data) {
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(() => {
+        this.send(data);
+      }, 1000);
+    }
+  }
+
+  /** 销毁 */
+  destroy() {
+    // 断开连接,清除定时器
+    this.unsubscribe();
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  }
+}
+
+export default WebSocket;