@ebiz/designer-components 0.0.18-beta.3 → 0.0.18-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.0.18-beta.3",
+  "version": "0.0.18-beta.4",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/apiService/simpleDataService.js

@@ -4,11 +4,11 @@
  * 所有接口均使用POST方法提交
  */
 
-import axios from "axios";
-import { TinyNotify } from "@opentiny/vue";
+import axios from 'axios'
+import { TinyNotify } from '@opentiny/vue'
 
 // 从环境变量获取API基础URL
-const API_BASE_URL = "http://localhost:8090/api";
+const API_BASE_URL = 'http://localhost:8090/api'
 
 /**
  * 创建axios实例
@@ -17,10 +17,10 @@ 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'
+  }
+})
 
 /**
  * 请求拦截器
@@ -28,117 +28,117 @@ const axiosInstance = axios.create({
 axiosInstance.interceptors.request.use(
   (config) => {
     // 添加认证信息
-    const token = localStorage.getItem("token");
+    const token = localStorage.getItem('token')
     if (token) {
-      config.headers["Authorization"] = `Bearer ${token}`;
+      config.headers['Authorization'] = `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);
+    return Promise.reject(error)
   }
-);
+)
 
 /**
  * 响应拦截器
  */
 axiosInstance.interceptors.response.use(
   (response) => {
-    const { data } = response;
+    const { data } = response
 
     // 根据后端API的响应格式进行调整
     if (data.code === 0) {
-      return data.data;
+      return data.data
     } else {
       // message.error(data.message || '请求失败');
-      return Promise.reject(new Error(data.message || data.msg || "请求失败"));
+      return Promise.reject(new Error(data.message || data.msg || '请求失败'))
     }
   },
   (error) => {
     // 错误处理
     if (error.response) {
-      const { status } = error.response;
+      const { status } = error.response
 
       switch (status) {
         case 401:
           TinyNotify({
-            type: "warning",
-            title: "未授权",
-            message: "您无权限访问，请授权后重试",
-            position: "top-right",
-            duration: 2000,
-          });
-          break;
+            type: 'warning',
+            title: '未授权',
+            message: '您无权限访问，请授权后重试',
+            position: 'top-right',
+            duration: 2000
+          })
+          break
         case 403:
           TinyNotify({
-            type: "warning",
-            title: "权限不足",
-            message: "禁止访问，权限不足",
-            position: "top-right",
-            duration: 2000,
-          });
-          break;
+            type: 'warning',
+            title: '权限不足',
+            message: '禁止访问，权限不足',
+            position: 'top-right',
+            duration: 2000
+          })
+          break
         case 404:
           TinyNotify({
-            type: "warning",
-            title: "404",
-            message: "请求的资源不存在",
-            position: "top-right",
-            duration: 2000,
-          });
-          break;
+            type: 'warning',
+            title: '404',
+            message: '请求的资源不存在',
+            position: 'top-right',
+            duration: 2000
+          })
+          break
         case 500:
           TinyNotify({
-            type: "warning",
-            title: "错误",
-            message: "服务器内部错误",
-            position: "top-right",
-            duration: 2000,
-          });
-          break;
+            type: 'warning',
+            title: '错误',
+            message: '服务器内部错误',
+            position: 'top-right',
+            duration: 2000
+          })
+          break
         default:
           TinyNotify({
-            type: "warning",
-            title: "请求失败",
+            type: 'warning',
+            title: '请求失败',
             message: error.message,
-            position: "top-right",
-            duration: 2000,
-          });
+            position: 'top-right',
+            duration: 2000
+          })
       }
     } else {
       TinyNotify({
-        type: "error",
-        title: "网络错误",
+        type: 'error',
+        title: '网络错误',
         message: error.message,
-        position: "top-right",
-        duration: 2000,
-      });
+        position: 'top-right',
+        duration: 2000
+      })
       // message.error('网络错误，请检查您的网络连接');
     }
 
-    return Promise.reject(error);
+    return Promise.reject(error)
   }
-);
+)
 
 let apiMap = {
-  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: "/api/appdata/link/select",
-  FILE_UPLOAD: "/api/file/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: '/api/appdata/link/select',
+  FILE_UPLOAD: '/api/file/upload' // 文件上传API
+}
 
 /**
  * 数据服务
@@ -154,29 +154,32 @@ const dataService = {
    * @returns {Promise<any>} 响应数据
    * @example
    */
-  fetch: (params = {}, apiConfig = {}, url = "") => {
+  fetch: (params = {}, apiConfig = {}, url = '') => {
     if (!url) {
-      url = apiMap[apiConfig.apiType];
+      url = apiMap[apiConfig.apiType]
     }
 
-    const { apiId = "", ...restConfig } = apiConfig;
+    const { apiId = '', ...restConfig } = apiConfig
 
     const defaultConfig = {
       // 默认列表查询配置
       headers: {
-        "X-List-Query": "true",
+        'X-List-Query': 'true'
       },
-      timeout: 20000,
-    };
+      timeout: 20000
+    }
     if (!params) {
-      params = {};
+      params = {}
+    }
+    params.apiId = apiConfig.apiId
+    if (apiConfig.key) {
+      params.key = apiConfig.key
     }
-    params.apiId = apiConfig.apiId;
 
-    const config = { ...defaultConfig, ...restConfig };
-    return axiosInstance.post(url, params, config);
+    const config = { ...defaultConfig, ...restConfig }
+    return axiosInstance.post(url, params, config)
   },
-  
+
   /**
    * 文件上传
    * @param {string} url - 上传URL，默认使用apiMap中的FILE_UPLOAD
@@ -184,16 +187,16 @@ 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'
-    const fixedFormData = new FormData();
-    let fileFound = false;
-    
+    let fixedFormData = new FormData()
+    let fileFound = false
+
     // 检查并修复FormData
     if (formData instanceof FormData) {
       // 由于FormData不能直接检查内容，我们使用迭代器
@@ -201,40 +204,40 @@ const dataService = {
         // 在某些旧浏览器中可能不支持entries()
         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'));
+      console.error('No file found in FormData')
+      return Promise.reject(new Error('No file found in FormData'))
     }
-    
+
     // 上传配置
     const config = {
       timeout: 60000, // 上传超时时间加长
@@ -244,33 +247,32 @@ const dataService = {
       },
       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);
-        
-        // 处理文件路径
-        // 如果返回的是相对路径，转换为完整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;
-        }
-        
-        return 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
+        const fullUrl = `${baseUrl}/files${filePath}`
+        console.log('Converted file path to full URL:', fullUrl)
+        return fullUrl
+      }
+
+      return response
+    })
   }
-};
+}
 
-export default dataService;
+export default dataService

package/src/components/Button.vue

@@ -46,6 +46,7 @@ const props = defineProps({
     apiConfig: {//接口配置
         type: Object,
         default: {
+            key: null,
             apiId: null,
             apiType: ''
         }
@@ -91,7 +92,7 @@ const click = () => {
     props.onClick()
     if (!isNormal.value && apiConfig.value.apiId) {
         props.onPrepare()
-        dataService.fetch(data.value, { apiId: apiConfig.value.apiId, apiType: apiMap[apiConfig.value.apiType] }).then((res) => {
+        dataService.fetch(data.value, { key: apiConfig.value.key, apiId: apiConfig.value.apiId, apiType: apiMap[apiConfig.value.apiType] }).then((res) => {
             emit('click', res)
             props.onFinish()
         })

package/src/components/EbizRemoteSelect.vue

@@ -30,6 +30,7 @@ const props = defineProps({
         type: Object,
         required: true,
         default: () => ({
+            key: null,
             apiId: null,
             apiType: ''
         })
@@ -117,7 +118,7 @@ const handleRemoteSearch = async () => {
             const params = {
                 queryParams: queryParams.value
             };
-            const res = await dataService.fetch(params, { apiId: props.apiConfig.apiId, apiType: 'MULTIPLE_DATA_SEARCH' });
+            const res = await dataService.fetch(params, { key: props.apiConfig.key, apiId: props.apiConfig.apiId, apiType: 'MULTIPLE_DATA_SEARCH' });
             options.value = res.data.map(item => ({
                 label: item.label || item.name,
                 value: item.value || item.id

package/src/components/EbizTabHeader.vue

@@ -1,12 +1,7 @@
 <template>
   <tiny-tabs v-model="showTab" :tab-style="props.tabStyle" activeColor="#5e7ce0" @click="tabChange">
-    <tiny-tab-item 
-      activeColor="#5e7ce0" 
-      v-for="i in showTabs" 
-      :key="i.value" 
-      :title="i.label" 
-      :name="i.value.toString()"
-    />
+    <tiny-tab-item activeColor="#5e7ce0" v-for="i in showTabs" :key="i.value" :title="i.label"
+      :name="i.value.toString()" />
   </tiny-tabs>
 </template>
 
@@ -22,6 +17,7 @@ const props = defineProps({
   apiConfig: {
     type: Object,
     default: () => ({
+      key: null,
       apiId: null,
       apiType: 'MULTIPLE_DATA_SEARCH',
     }),
@@ -63,7 +59,7 @@ const remoteTabs = ref([])
 
 // 展示的tabs
 const showTabs = computed(() => {
-    console.log(props.tabs,66, 110)
+  console.log(props.tabs, 66, 110)
   if (remoteTabs.value.length) return [{ label: '全部', value: '0' }, ...remoteTabs.value];
   if (props.tabs.length) return props.tabs
   return [{ label: '全部', value: '0' }]
@@ -87,7 +83,7 @@ watch(() => showTabs.value, () => {
 
 watch(() => props.apiConfig, (nVal) => {
   if (!nVal?.apiId) return
-  dataService.fetch({ }, { apiId: nVal.apiId, apiType: 'MULTIPLE_DATA_SEARCH' }).then(res => {
+  dataService.fetch({}, { key: nVal.key, apiId: nVal.apiId, apiType: 'MULTIPLE_DATA_SEARCH' }).then(res => {
     remoteTabs.value = (res.data ?? []).map(i => ({
       label: i[props.labelKey],
       value: i[props.valueKey],
@@ -146,4 +142,4 @@ watch(() => props.apiConfig, (nVal) => {
   overflow: hidden;
   white-space: nowrap;
 }
-</style> 
+</style>

package/src/components/EbizTitle.vue

@@ -1,52 +1,51 @@
 <template>
     <div class="ebiz-title">
-        <!-- <div class="color-block" :style="{ backgroundColor: color, width: `${blockWidth}px` }"></div> -->
-        <!-- <div class="title-text">
+        <div class="color-block" :style="{ backgroundColor: color, width: `${blockWidth}px` }"></div>
+        <div class="title-text">
             <slot name="title">
                 {{ displayTitle }}
             </slot>
-        </div> -->
+        </div>
     </div>
 </template>
 
 <script setup>
+import { defineProps, computed } from 'vue';
 
-// import { defineProps, computed } from 'vue';
+/**
+ * EbizTitle 组件 - 带有色块的标题组件
+ * 支持自定义标题文本、色块颜色和色块宽度
+ * 包含一个按钮，点击时在标题后添加点号并触发事件
+ * 支持通过插槽自定义标题内容
+ */
+const props = defineProps({
+    /**
+     * 标题文本 (当不使用插槽时显示)
+     */
+    title: {
+        type: String,
+        default: '标题'
+    },
+    /**
+     * 色块颜色，支持任何有效的CSS颜色值
+     */
+    color: {
+        type: String,
+        default: '#1890ff'
+    },
+    /**
+     * 色块宽度，单位为像素
+     */
+    blockWidth: {
+        type: Number,
+        default: 10
+    }
+});
 
-// /**
-//  * EbizTitle 组件 - 带有色块的标题组件
-//  * 支持自定义标题文本、色块颜色和色块宽度
-//  * 包含一个按钮，点击时在标题后添加点号并触发事件
-//  * 支持通过插槽自定义标题内容
-//  */
-// const props = defineProps({
-//     /**
-//      * 标题文本 (当不使用插槽时显示)
-//      */
-//     title: {
-//         type: String,
-//         default: '标题'
-//     },
-//     /**
-//      * 色块颜色，支持任何有效的CSS颜色值
-//      */
-//     color: {
-//         type: String,
-//         default: '#1890ff'
-//     },
-//     /**
-//      * 色块宽度，单位为像素
-//      */
-//     blockWidth: {
-//         type: Number,
-//         default: 10
-//     }
-// });
 
-// // // 计算属性：根据点号数量生成显示的标题
-// const displayTitle = computed(() => {
-//     return props.title;
-// });
+const displayTitle = computed(() => {
+    return props.title;
+});
 </script>
 
 <style scoped>