kz-ui-base 1.0.25 → 1.0.26

package/common/src/api/common/common.js

@@ -1,8 +1,6 @@
 import Vue from "vue";
 import request from "../../utils/request";
-import dict from "../../utils/dict";
 let that = new Vue();
-//import * as cache from '../..plugins/cache'
 
 //公共接口
 
@@ -49,118 +47,131 @@ export function ajaxUrl(options) {
 }
 
 // 查询数据列表
-export function listEntity(moduleName, serviceName, query, action) {
+export function listEntity(moduleName, serviceName, query, action,option) {
   if (!action) action = "list";
   return request({
     url: `${moduleName}/${serviceName}/${action}`,
-    method: "get",
+    method: option&&option.method || "get",
     params: query,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 查询数据详细
-export function getEntity(moduleName, serviceName, query) {
+export function getEntity(moduleName, serviceName, query,option) {
   return request({
     url: `${moduleName}/${serviceName}/byId`,
-    method: "get",
+    method: option&&option.method || "get",
     params: query,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 新增数据
-export function addEntity(moduleName, serviceName, data) {
+export function addEntity(moduleName, serviceName, data,option) {
   return request({
     url: `${moduleName}/${serviceName}`,
-    method: "post",
+    method: option&&option.method ||"post",
     data: data,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 修改数据
-export function updateEntity(moduleName, serviceName, data) {
+export function updateEntity(moduleName, serviceName, data,option) {
   return request({
     url: `${moduleName}/${serviceName}`,
-    method: "put",
+    method: option&&option.method ||"put",
     data: data,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 删除数据
-export function delEntity(moduleName, serviceName, data) {
+export function delEntity(moduleName, serviceName, data,option) {
   return request({
     url: `${moduleName}/${serviceName}`,
-    method: "delete",
+    method:  option&&option.method ||"delete",
     data: data,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 指定方法提交数据
-export function postEntity(moduleName, serviceName, action, data) {
+export function postEntity(moduleName, serviceName, action, data,option) {
   if (!action) action = "post";
   return request({
     url: `${moduleName}/${serviceName}/${action}`,
-    method: "post",
+    method: option&&option.method ||"post",
     data: data,
+    timeout: option&&option.timeout || null,
+    
   });
 }
 
 // 指定方法提交数据
-export function startWorkflow(moduleName, serviceName, data, wfKey) {
+export function startWorkflow(moduleName, serviceName, data, wfKey,option) {
   let action = "startAndSaveDraft";
   if (!wfKey) wfKey = serviceName;
   data["AppCode"] = "ruoyi";
   return request({
     url: `${moduleName}/${serviceName}/${action}/${wfKey}`,
-    method: "post",
+    method:option&&option.method || "post",
     data: data,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 根据Url查询数据
-export function getUrl(url, query, async) {
+export function getUrl(url, query, async,option) {
   if (async == "false") async = false;
   else async = true;
   return request({
     url: url,
-    method: "get",
+    method: option&&option.method ||"get",
     async: async,
     params: query,
+    timeout: option&&option.timeout || null,
   });
 }
 
 // 根据Url查询数据
-export function postUrl(url, data, async) {
+export function postUrl(url, data, async,option) {
   if (async == "false") async = false;
   else async = true;
   return request({
     url: url,
-    method: "post",
+    method: option&&option.method ||"post",
     async: async,
     data: data,
+    timeout: option&&option.timeout || null,
   });
 }
 // 查询下拉树结构
-export function treeSelect(moduleName, treeShapeName) {
+export function treeSelect(moduleName, treeShapeName,option) {
   return request({
     url: `${moduleName}/interfaceSetting/treeSelect`,
-    method: "get",
+    method: option&&option.method ||"get",
     params: treeShapeName,
+    timeout: option&&option.timeout || null,
   });
 }
 // 初始化字段
-export function initField(moduleName, data) {
+export function initField(moduleName, data,option) {
   return request({
     url: `${moduleName}/fieldDefinition/initField`,
-    method: "post",
+    method: option&&option.method ||"post",
     data: data,
+    timeout: option&&option.timeout || null,
   });
 }
 //初始化列表字段
-export function initTableField(data) {
+export function initTableField(data,option) {
   return request({
     url: `lowcode/listSetting/initTableField`,
-    method: "get",
+    method: option&&option.method ||"get",
     params: data,
+    timeout: option&&option.timeout || null,
   });
 }
 //根据entityName和moduleName   定位界面设置
@@ -172,19 +183,21 @@ export function selectInterfaceSetting(data) {
   });
 }
 //初始化编辑列表字段（查询列表编辑数据）
-export function initEditListColumns(data) {
+export function initEditListColumns(data,option) {
   return request({
     url: `lowcode/dataEditing/initEditListColumns`,
-    method: "get",
+    method: option&&option.method ||"get",
     params: data,
+    timeout: option&&option.timeout || null,
   });
 }
 //初始化搜素列表
-export function initSearchRules(data) {
+export function initSearchRules(data,option) {
   return request({
     url: `lowcode/search/initSearchRules`,
-    method: "get",
+    method: ption&&option.method ||"get",
     params: data,
+    timeout: option&&option.timeout || null,
   });
 }
 

package/common/src/api/common/material.js

@@ -1,71 +1,79 @@
 import request from '../../utils/request'
 
 // 素材上传
-export function uploadMaterial(data) {
+export function uploadMaterial(data,option) {
   return request({
     url: '/system/material/upload',
-    method: 'post',
-    data: data
+    method: option&&option.method ||'post',
+    data: data,
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 查询素材信息列表
-export function listMaterial(query) {
+export function listMaterial(query,option) {
   return request({
     url: '/system/material/list',
-    method: 'get',
-    params: query
+    method: option&&option.method ||'get',
+    params: query,
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 修改素材信息
-export function updateMaterial(data) {
+export function updateMaterial(data,option) {
   return request({
     url: '/system/material',
-    method: 'put',
-    data: data
+    method: option&&option.method ||'put',
+    data: data,
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 删除素材信息
-export function delMaterial(materialId) {
+export function delMaterial(materialId,option) {
   return request({
     url: '/system/material/' + materialId,
-    method: 'delete'
+    method: option&&option.method ||'delete',
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 查询父级分类信息
-export function parentFolder(query) {
+export function parentFolder(query,option) {
   return request({
     url: '/system/folder/parent',
-    method: 'get',
-    params: query
+    method: option&&option.method ||'get',
+    params: query,
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 新增素材分类
-export function addFolder(data) {
+export function addFolder(data,option) {
   return request({
     url: '/system/folder',
-    method: 'post',
-    data: data
+    method: option&&option.method ||'post',
+    data: data,
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 修改素材分类
-export function updateFolder(data) {
+export function updateFolder(data,option) {
   return request({
     url: '/system/folder',
-    method: 'put',
-    data: data
+    method: option&&option.method ||'put',
+    data: data,
+    timeout: option&&option.timeout || null,
   })
 }
 
 // 删除素材分类
-export function delFolder(folderId) {
+export function delFolder(folderId,option) {
   return request({
     url: '/system/folder/' + folderId,
-    method: 'delete'
+    method: option&&option.method ||'delete',
+    timeout: option&&option.timeout || null,
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "",
   "main": "index.js",
   "scripts": {