vue2-client 1.8.65 → 1.8.67

package/src/services/api/common.js

@@ -109,68 +109,108 @@ export function parseConfig (configContent, configType, serviceName = process.en
 /**
  * 通用执行业务逻辑
  */
-export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/logic/' + logicName, parameter)
+export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/logic/' + logicName, parameter)
 }
 
 /**
  * 通用查询
  */
-export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
+export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.query, parameter, null)
 }
 
 /**
  * 通用表单查询
  */
-export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
+export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.queryWithResource, parameter, null)
 }
 
 /**
  * 通用新增/修改
  */
-export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
+export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.addOrModify, parameter, null)
 }
 
 /**
  * 通用删除
  */
-export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
+export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.delete, parameter, null)
 }
 
 /**
  * 通用导入
  */
-export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
+export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.importData, parameter, null)
 }
 
 /**
  * 通用导出
  */
-export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
+export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.exportData, parameter, null)
 }
 
 /**
  * 通用上传
  */
-export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config) {
-  return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
+export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
 /**
  * 通用导入模板下载
  */
-export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
+export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
 }
 
 // 通用下载
-export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
+export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
   const notificationKey = 'download'
   notification.open({
     key: notificationKey,
@@ -187,7 +227,7 @@ export function download (parameter, filename, serviceName = process.env.VUE_APP
       )
     }
   })
-  return post('/api/' + serviceName + '/' + commonApi.download, parameter, {
+  return post(apiPre + serviceName + '/' + commonApi.download, parameter, {
     responseType: 'blob'
   }).then(async (data) => {
     const isLogin = await blobValidate(data)
@@ -210,8 +250,12 @@ export function download (parameter, filename, serviceName = process.env.VUE_APP
 }
 
 // 文件删除
-export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.fileEntity, parameter)
+export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.fileEntity, parameter)
 }
 
 export { commonApi }

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}