@ebiz/designer-components 0.1.97 → 0.1.98

package/dist/index.mjs

@@ -50159,10 +50159,15 @@ sx.interceptors.request.use(
 sx.interceptors.response.use(
   (e) => {
     const { data: t } = e;
-    return t.code === 0 ? t.data : Promise.reject({
-      code: t.code,
-      message: t.message || t.msg || "请求失败"
-    });
+    if (t.code === void 0)
+      return t;
+    if (t.code === 0)
+      return t.data;
+    if (t.code < 0)
+      return Promise.reject({
+        code: t.code,
+        message: t.message || t.msg || "请求失败"
+      });
   },
   (e) => {
     if (e.response) {
@@ -50182,7 +50187,7 @@ let hP = {
   7: "/appdata/delData",
   8: "/appdata/delDatas",
   9: "/appdata/link/select",
-  10: "/file/upload",
+  10: "/app/td-upload",
   // 文件上传API
   MULTIPLE_DATA_SEARCH: "/appdata/select",
   DETAILS_DATA: "/appdata/detailData",
@@ -50194,7 +50199,7 @@ let hP = {
   DEL_DATA: "/appdata/delData",
   BATCH_DEL_DATA: "/appdata/delDatas",
   MULTIPLE_DATA_LINK_SEARCH: "/appdata/link/select",
-  FILE_UPLOAD: "/file/upload",
+  FILE_UPLOAD: "/file/app/td-upload",
   // 文件上传API
   PROCESS: "/appdata/process"
 };
@@ -50241,7 +50246,9 @@ const en = {
             u instanceof File || u instanceof Blob ? (console.log(`Found file in field ${l}, adding as 'file'`), r.append("file", u), a = !0) : r.append(l, u);
           }
         else
-          console.log("FormData.entries() not supported, using original FormData"), r = t, a = !0;
+          console.log(
+            "FormData.entries() not supported, using original FormData"
+          ), r = t, a = !0;
       } catch (i) {
         console.error("Error processing FormData:", i), r = t;
       }
@@ -50257,7 +50264,9 @@ const en = {
         "Content-Type": void 0
       },
       onUploadProgress: (i) => {
-        const l = Math.round(i.loaded * 100 / i.total);
+        const l = Math.round(
+          i.loaded * 100 / i.total
+        );
         n(l);
       }
     };
@@ -50267,6 +50276,8 @@ const en = {
         return console.log("Converted file path to full URL:", s), s;
       }
       return i;
+    }).catch((i) => {
+      console.log("上传失败：", i);
     });
   }
 }, A3e = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.1.97",
+  "version": "0.1.98",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/apiService/simpleDataService.js

@@ -4,10 +4,10 @@
  * 所有接口均使用POST方法提交
  */
 
-import axios from 'axios'
+import axios from "axios";
 // import { TinyNotify } from '@opentiny/vue'
 // 从环境变量获取API基础URL
-const API_BASE_URL = window.location.origin + '/api'
+const API_BASE_URL = window.location.origin + "/api";
 
 /**
  * 创建axios实例
@@ -16,56 +16,58 @@ const axiosInstance = axios.create({
   baseURL: API_BASE_URL,
   timeout: 30000,
   headers: {
-    'Content-Type': 'application/json',
-    Accept: 'application/json'
+    "Content-Type": "application/json",
+    Accept: "application/json"
   }
-})
+});
 
 /**
  * 请求拦截器
  */
 axiosInstance.interceptors.request.use(
-  (config) => {
+  config => {
     // 添加认证信息
-    const token = localStorage.getItem('token')
+    const token = localStorage.getItem("token");
     if (token) {
-      config.headers['AppDataAuthorization'] = `Bearer ${token}`
+      config.headers["AppDataAuthorization"] = `Bearer ${token}`;
     }
 
     // 如果是FormData格式，不设置Content-Type，让浏览器自动设置
     if (config.data instanceof FormData) {
-      config.headers['Content-Type'] = undefined
+      config.headers["Content-Type"] = undefined;
     }
 
-    return config
+    return config;
   },
-  (error) => {
-    return Promise.reject(error)
+  error => {
+    return Promise.reject(error);
   }
-)
+);
 
 /**
  * 响应拦截器
  */
 axiosInstance.interceptors.response.use(
-  (response) => {
-    const { data } = response
+  response => {
+    const { data } = response;
 
     // 根据后端API的响应格式进行调整
-    if (data.code === 0) {
-      return data.data
-    } else {
+    if (data.code === undefined) {
+      return data;
+    } else if (data.code === 0) {
+      return data.data;
+    } else if (data.code < 0) {
       // message.error(data.message || '请求失败');
       return Promise.reject({
         code: data.code,
-        message: data.message || data.msg || '请求失败'
-      })
+        message: data.message || data.msg || "请求失败"
+      });
     }
   },
-  (error) => {
+  error => {
     // 错误处理
     if (error.response) {
-      const { status } = error.response
+      const { status } = error.response;
 
       switch (status) {
         case 401:
@@ -76,7 +78,7 @@ axiosInstance.interceptors.response.use(
           //   position: 'top-right',
           //   duration: 2000
           // })
-          break
+          break;
         case 403:
           // TinyNotify({
           //   type: 'warning',
@@ -85,7 +87,7 @@ axiosInstance.interceptors.response.use(
           //   position: 'top-right',
           //   duration: 2000
           // })
-          break
+          break;
         case 404:
           // TinyNotify({
           //   type: 'warning',
@@ -94,7 +96,7 @@ axiosInstance.interceptors.response.use(
           //   position: 'top-right',
           //   duration: 2000
           // })
-          break
+          break;
         case 500:
           // TinyNotify({
           //   type: 'warning',
@@ -103,15 +105,15 @@ axiosInstance.interceptors.response.use(
           //   position: 'top-right',
           //   duration: 2000
           // })
-          break
+          break;
         default:
-          // TinyNotify({
-          //   type: 'warning',
-          //   title: '请求失败',
-          //   message: error.message,
-          //   position: 'top-right',
-          //   duration: 2000
-          // })
+        // TinyNotify({
+        //   type: 'warning',
+        //   title: '请求失败',
+        //   message: error.message,
+        //   position: 'top-right',
+        //   duration: 2000
+        // })
       }
     } else {
       // TinyNotify({
@@ -124,36 +126,36 @@ axiosInstance.interceptors.response.use(
       // message.error('网络错误，请检查您的网络连接');
     }
 
-    return Promise.reject(error)
+    return Promise.reject(error);
   }
-)
+);
 
 let apiMap = {
-  "0": '/appdata/select',
-  "1": '/appdata/detailData',
-  "2": '/appdata/plugin',
-  "3": '/appdata/addData',
-  "4": '/appdata/addDatas',
-  "5": '/appdata/updateData',
-  "6": '/appdata/updateDatas',
-  "7": '/appdata/delData',
-  "8": '/appdata/delDatas',
-  "9": '/appdata/link/select',
-  "10": '/file/upload', // 文件上传API
+  "0": "/appdata/select",
+  "1": "/appdata/detailData",
+  "2": "/appdata/plugin",
+  "3": "/appdata/addData",
+  "4": "/appdata/addDatas",
+  "5": "/appdata/updateData",
+  "6": "/appdata/updateDatas",
+  "7": "/appdata/delData",
+  "8": "/appdata/delDatas",
+  "9": "/appdata/link/select",
+  "10": "/app/td-upload", // 文件上传API
 
-  MULTIPLE_DATA_SEARCH: '/appdata/select',
-  DETAILS_DATA: '/appdata/detailData',
-  INTERFACE_PLUGIN: '/appdata/plugin',
-  DATA_INSERT: '/appdata/addData',
-  BATCH_DATA_INSERT: '/appdata/addDatas',
-  DATA_MODIFY: '/appdata/updateData',
-  BATCH_DATA_MODIFY: '/appdata/updateDatas',
-  DEL_DATA: '/appdata/delData',
-  BATCH_DEL_DATA: '/appdata/delDatas',
-  MULTIPLE_DATA_LINK_SEARCH: '/appdata/link/select',
-  FILE_UPLOAD: '/file/upload', // 文件上传API
-  PROCESS: '/appdata/process'
-}
+  MULTIPLE_DATA_SEARCH: "/appdata/select",
+  DETAILS_DATA: "/appdata/detailData",
+  INTERFACE_PLUGIN: "/appdata/plugin",
+  DATA_INSERT: "/appdata/addData",
+  BATCH_DATA_INSERT: "/appdata/addDatas",
+  DATA_MODIFY: "/appdata/updateData",
+  BATCH_DATA_MODIFY: "/appdata/updateDatas",
+  DEL_DATA: "/appdata/delData",
+  BATCH_DEL_DATA: "/appdata/delDatas",
+  MULTIPLE_DATA_LINK_SEARCH: "/appdata/link/select",
+  FILE_UPLOAD: "/file/app/td-upload", // 文件上传API
+  PROCESS: "/appdata/process"
+};
 
 /**
  * 数据服务
@@ -169,36 +171,36 @@ const dataService = {
    * @returns {Promise<any>} 响应数据
    * @example
    */
-  fetch: (params = {}, apiConfig = {}, url = '') => {
+  fetch: (params = {}, apiConfig = {}, url = "") => {
     if (!url) {
-      url = apiMap[apiConfig.apiType+'']
+      url = apiMap[apiConfig.apiType + ""];
       if (!url) {
-        url = apiMap.PROCESS
+        url = apiMap.PROCESS;
       }
-      url += '?key=' + apiConfig.key
+      url += "?key=" + apiConfig.key;
     }
-    console.log('apiConfig', apiConfig)
+    console.log("apiConfig", apiConfig);
 
-    const { apiId = '', ...restConfig } = apiConfig
+    const { apiId = "", ...restConfig } = apiConfig;
 
     const defaultConfig = {
       // 默认列表查询配置
       headers: {
-        'X-List-Query': 'true'
+        "X-List-Query": "true"
       },
       timeout: 20000
-    }
+    };
     if (!params) {
-      params = {}
+      params = {};
     }
-    params.apiId = apiConfig.apiId
+    params.apiId = apiConfig.apiId;
     if (apiConfig.key) {
-      params.apiKey = apiConfig.key
+      params.apiKey = apiConfig.key;
     }
-    console.log('params', params)
+    console.log("params", params);
 
-    const config = { ...defaultConfig, ...restConfig }
-    return axiosInstance.post(url, params, config)
+    const config = { ...defaultConfig, ...restConfig };
+    return axiosInstance.post(url, params, config);
   },
 
   /**
@@ -208,55 +210,57 @@ const dataService = {
    * @param {Function} onProgress - 上传进度回调函数，参数为0-100的进度百分比
    * @returns {Promise<any>} 上传响应数据
    */
-  upload: (url = '', formData, onProgress = () => {}) => {
+  upload: (url = "", formData, onProgress = () => {}) => {
     // 如果没有指定URL，使用默认的文件上传URL
     if (!url) {
-      url = apiMap.FILE_UPLOAD
+      url = apiMap.FILE_UPLOAD;
     }
 
     // 确保FormData中的文件字段名是'file'
-    let fixedFormData = new FormData()
-    let fileFound = false
+    let fixedFormData = new FormData();
+    let fileFound = false;
 
     // 检查并修复FormData
     if (formData instanceof FormData) {
       // 由于FormData不能直接检查内容，我们使用迭代器
       try {
         // 在某些旧浏览器中可能不支持entries()
-        if (typeof formData.entries === 'function') {
+        if (typeof formData.entries === "function") {
           for (let pair of formData.entries()) {
-            const [key, value] = pair
+            const [key, value] = pair;
 
             if (value instanceof File || value instanceof Blob) {
               // 找到文件，使用正确的字段名
-              console.log(`Found file in field ${key}, adding as 'file'`)
-              fixedFormData.append('file', value)
-              fileFound = true
+              console.log(`Found file in field ${key}, adding as 'file'`);
+              fixedFormData.append("file", value);
+              fileFound = true;
             } else {
               // 保留其他字段
-              fixedFormData.append(key, value)
+              fixedFormData.append(key, value);
             }
           }
         } else {
           // 如果不支持entries()，假设formData已经是正确的，直接使用
-          console.log('FormData.entries() not supported, using original FormData')
-          fixedFormData = formData
-          fileFound = true
+          console.log(
+            "FormData.entries() not supported, using original FormData"
+          );
+          fixedFormData = formData;
+          fileFound = true;
         }
       } catch (e) {
-        console.error('Error processing FormData:', e)
+        console.error("Error processing FormData:", e);
         // 出错时使用原始FormData
-        fixedFormData = formData
+        fixedFormData = formData;
       }
     } else {
-      console.error('Invalid FormData:', formData)
-      return Promise.reject(new Error('FormData is required for file upload'))
+      console.error("Invalid FormData:", formData);
+      return Promise.reject(new Error("FormData is required for file upload"));
     }
 
     // 如果没有找到文件，返回错误
-    if (!fileFound && typeof formData.entries === 'function') {
-      console.error('No file found in FormData')
-      return Promise.reject(new Error('No file found in FormData'))
+    if (!fileFound && typeof formData.entries === "function") {
+      console.error("No file found in FormData");
+      return Promise.reject(new Error("No file found in FormData"));
     }
 
     // 上传配置
@@ -264,36 +268,45 @@ const dataService = {
       timeout: 60000, // 上传超时时间加长
       headers: {
         // 让浏览器自动设置Content-Type和boundary
-        'Content-Type': undefined
+        "Content-Type": undefined
       },
-      onUploadProgress: (progressEvent) => {
+      onUploadProgress: progressEvent => {
         // 计算上传进度百分比
-        const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
-        onProgress(percentCompleted)
+        const percentCompleted = Math.round(
+          progressEvent.loaded * 100 / progressEvent.total
+        );
+        onProgress(percentCompleted);
       }
-    }
+    };
 
     // 发起上传请求
-    console.log('Sending file upload request to:', url)
-    return axiosInstance.post(url, fixedFormData, config).then((response) => {
-      console.log('Upload server response:', response)
+    console.log("Sending file upload request to:", url);
+    return axiosInstance
+      .post(url, fixedFormData, config)
+      .then(response => {
+        console.log("Upload server response:", response);
 
-      // 处理文件路径
-      // 如果返回的是相对路径，转换为完整URL
-      if (typeof response === 'string' && !response.startsWith('http')) {
-        // 判断路径是否以斜杠开头
-        const baseUrl = API_BASE_URL.endsWith('/') ? API_BASE_URL.slice(0, -1) : API_BASE_URL
-        const filePath = response.startsWith('/') ? response : `/${response}`
+        // 处理文件路径
+        // 如果返回的是相对路径，转换为完整URL
+        if (typeof response === "string" && !response.startsWith("http")) {
+          // 判断路径是否以斜杠开头
+          const baseUrl = API_BASE_URL.endsWith("/")
+            ? API_BASE_URL.slice(0, -1)
+            : API_BASE_URL;
+          const filePath = response.startsWith("/") ? response : `/${response}`;
 
-        // 构建完整URL
-        const fullUrl = `${baseUrl}/files${filePath}`
-        console.log('Converted file path to full URL:', fullUrl)
-        return fullUrl
-      }
+          // 构建完整URL
+          const fullUrl = `${baseUrl}/files${filePath}`;
+          console.log("Converted file path to full URL:", fullUrl);
+          return fullUrl;
+        }
 
-      return response
-    })
+        return response;
+      })
+      .catch(e => {
+        console.log("上传失败：", e);
+      });
   }
-}
+};
 
-export default dataService
+export default dataService;