eoss-ui 0.6.39 → 0.6.41

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

@@ -498,128 +498,168 @@ const ajax = function ({
  * @param {Object} [params] - 请求参数
  **/
 const ajaxStream = function ({ controller, method = 'post', host, url, data, params, progress, success, fail, final, ...configs }) {
-    try {
-      // 如果有正在进行的请求，取消它
-      if (controller) {
-        controller.abort();
-      }
-      controller = new AbortController();
-      const baseURL = host || getStorage('baseHost') || '';
-      let userId = getStorage('userId');
-      if (
-        data && !Object.prototype.hasOwnProperty.call(data, 'userId') &&
-        userId
-      ) {
-        data.userId = userId;
-      }
-      if (
-        params && !Object.prototype.hasOwnProperty.call(params, 'userId') &&
-        userId
-      ) {
-        params.userId = getStorage('userId');
-      }
-      let info = {
+  try {
+    // 如果有正在进行的请求，取消它
+    if (controller) {
+      controller.abort();
+    }
+    controller = new AbortController();
+    const baseURL = host || getStorage('baseHost') || '';
+    let userId = getStorage('userId');
+    if (
+      data && !Object.prototype.hasOwnProperty.call(data, 'userId') &&
+      userId
+    ) {
+      data.userId = userId;
+    }
+    if (
+      params && !Object.prototype.hasOwnProperty.call(params, 'userId') &&
+      userId
+    ) {
+      params.userId = getStorage('userId');
+    }
+    let info = {
+      time: 0,
+      conversationId: '',
+      content: '',
+      thinkContent: '',
+      primeval: '',
+      chunk: ''
+    };
+    let partialData = '';
+    let lastProcessedIndex = 0;
+    let done = false;
+    let finishThink = false;
+    let hasThink = false;
+    ajax({
+      timeout: 990000,
+      format: false,
+      method,
+      url: baseURL + url,
+      signal: controller.signal,
+      responseType: 'text',
+      data,
+      params,
+      ...configs,
+      onDownloadProgress: progressEvent => {
+        // 获取从上次处理后新增的数据
+        const currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
+        const chunk = currentResponse.slice(lastProcessedIndex);
+        if (chunk === 'data:') {
+          return;
+        }
 
-      };
-      let partialData = '';
-      let lastProcessedIndex = 0;
-      let done = false;
-      ajax({
-        timeout: 990000,
-        format: false,
-        method,
-        url: baseURL + url,
-        signal: controller.signal,
-        responseType: 'text',
-        data,
-        params,
-        ...configs,
-        onDownloadProgress: progressEvent => {
-          // 获取从上次处理后新增的数据
-          const currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
-          const chunk = currentResponse.slice(lastProcessedIndex);
-
-          // 更新偏移量
-          lastProcessedIndex = currentResponse.length;
-
-          // 假设数据是以 'data:' 开头的 SSE 格式
-          partialData += chunk;
-          const lines = partialData.split('\n');
-          let remainingData = ''; // 用于保存未完整处理的部分数据
-          lines.forEach(line => {
-            if (line.startsWith('data:')) {
-              const data = line.replace('data:', '').trim();
-              if (data) {
-                try {
-                  // 假设数据是 JSON 格式
-                  const parsedData = JSON.parse(data);
-                  info.time = parsedData.time;
-                  info.conversationId = parsedData.conversationId;
-
-                  // 使用正则表达式匹配 <think> 标签
-                  const thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
-                  const match = parsedData.message.match(thinkRegex);
-                  if (match) {
-                    const thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
-                    const content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
-                    // 更新 AI 消息内容
+        // 更新偏移量
+        lastProcessedIndex = currentResponse.length;
+
+        // 假设数据是以 'data:' 开头的 SSE 格式
+        partialData += chunk;
+        const lines = partialData.split('\n');
+        let remainingData = ''; // 用于保存未完整处理的部分数据
+        let primeval = '';
+        let chunks = '';
+        lines.forEach(line => {
+          if (line === '') {
+            return;
+          }
+          if (line.startsWith('data:')) {
+            const data = line.replace('data:', '').trim();
+            if (data) {
+              try {
+                // 假设数据是 JSON 格式
+                const parsedData = JSON.parse(data);
+                info.time = parsedData.time;
+                info.conversationId = parsedData.conversationId;
+                const thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
+                const match = parsedData.message.match(thinkRegex);
+                if (match) {
+                  const thinkContent = match[1] ? match[1].trim() : ''; // <think> 标签内的数据
+                  const content = match[2] ? match[2].trim() : ''; // <think> 标签后的数据
+                  // 更新 AI 消息内容
+                  info.thinkContent += thinkContent;
+                  info.content += content;
+                } else {
+                  const startRegex = /<think>([\s\S]*)/;
+                  const endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
+                  const start = parsedData.message.match(startRegex);
+                  const end = parsedData.message.match(endRegex);
+                  if (start) {
+                    hasThink = true;
+                    const thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += thinkContent;
-                    info.content += content;
-                  } else {
-                    // 如果没有 <think> 标签，直接将消息内容赋值到 content
+                  } else if (hasThink === false) {
                     info.content += parsedData.message;
+                    chunks += parsedData.message;
+                  } else {
+                    if (end) {
+                      finishThink = true;
+                      const thinkContent = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
+                      const content = end[2] ? end[2].trim() : '';
+                      // 更新 AI 消息内容
+                      info.thinkContent += thinkContent;
+                      info.content += content;
+                      chunks += content;
+                    } else if (finishThink) {
+                      info.content += parsedData.message;
+                      chunks += parsedData.message;
+                    } else {
+                      info.thinkContent += parsedData.message;
+                    }
                   }
-                  done = parsedData.done;
-                } catch (parseError) {
-                  console.error('解析数据出错:', parseError);
                 }
-                // Promise.resolve({message: info, controller});
+                primeval += parsedData.message;
+                done = parsedData.done;
+              } catch (parseError) {
+                console.error('解析数据出错:', parseError);
               }
-            } else {
-              // 保存未处理完的部分数据
-              remainingData += line + '\n';
             }
-          });
+          } else {
+            // 保存未处理完的部分数据
+            remainingData += line + '\n';
+          }
+        });
+        info.primeval = primeval;
+        info.chunk = chunks;
 
-          // 将未完整处理的数据保留到 partialData 中
-          partialData = remainingData;
-          progress && progress({ message: info, controller, done });
-        }
-      }).then(() => {
+        // 将未完整处理的数据保留到 partialData 中
+        partialData = remainingData;
+        progress && progress({ message: info, controller, done });
+      }
+    }).then(() => {
+      // 处理请求完成后的信息
+      const originalText = info.content;
+      const regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
+      const match = originalText.match(regex);
+      if (match) {
+        info.thinkContent = match ? match[1].trim() : '';
+        info.content = match ? match[2].trim() : '';
+      }
+      success && success({ message: info, controller });
+    })
+      .catch(() => {
         // 处理请求完成后的信息
-        const originalText = info.content;
+        const originalText = info.content || '';
         const regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
         const match = originalText.match(regex);
         if (match) {
           info.thinkContent = match ? match[1].trim() : '';
           info.content = match ? match[2].trim() : '';
         }
-        success && success({ message: info, controller });
-      })
-        .catch(() => {
-          // 处理请求完成后的信息
-          const originalText = info.content || '';
-          const regex = /<think>([\s\S]*?)<\/think>([\s\S]*)/;
-          const match = originalText.match(regex);
-          if (match) {
-            info.thinkContent = match ? match[1].trim() : '';
-            info.content = match ? match[2].trim() : '';
-          }
-          fail && fail({ status: 1, message: info, controller });
-        });
-    } catch (error) {
-      console.error('聊天请求出错:', error);
-      let errorMessage = '抱歉，发生了一个错误，请稍后再试。';
-      if (error.code === 'ERR_NETWORK') {
-        errorMessage = '网络连接错误，请检查服务器是否正在运行或网络连接是否正常。';
-      } else if (error.response) {
-        errorMessage = `服务器错误 (${error.response.status}): ${error.response.data || '未知错误'
-          }`;
-      }
-      fail && fail({ status: 0, message: { role: 'assistant', content: errorMessage }, controller });
-    } finally {
-      final && final({ status: -1, message: null, controller });
+        fail && fail({ status: 1, message: info, controller });
+      });
+  } catch (error) {
+    console.error('聊天请求出错:', error);
+    let errorMessage = '抱歉，发生了一个错误，请稍后再试。';
+    if (error.code === 'ERR_NETWORK') {
+      errorMessage = '网络连接错误，请检查服务器是否正在运行或网络连接是否正常。';
+    } else if (error.response) {
+      errorMessage = `服务器错误 (${error.response.status}): ${error.response.data || '未知错误'
+        }`;
     }
+    fail && fail({ status: 0, message: { role: 'assistant', content: errorMessage }, controller });
+  } finally {
+    final && final({ status: -1, message: null, controller });
+  }
 };
 /**
  * arrUnique