Merge branch 'master' of http://gitlab.essenptl.com/purplevin/component

api/convertApi.js

@@ -3,7 +3,7 @@ import service from '@utils/GraphApiService'
 export function fetchCnToCpc(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/CN2CPC',
+    url: 'api/v1.0/Word/CN2CPC',
     method: 'POST',
     data
   })
@@ -12,7 +12,7 @@ export function fetchCnToCpc(baseURL, data) {
 export function fetchCntToPct(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/CN2PCT',
+    url: 'api/v1.0/Word/CN2PCT',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function fetchCntToPct(baseURL, data) {
 export function fetchPctToCn(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/PCT2CN',
+    url: 'api/v1.0/Word/PCT2CN',
     method: 'POST',
     data
   })
@@ -30,7 +30,7 @@ export function fetchPctToCn(baseURL, data) {
 export function fetchConvertEquations(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/ConvertEquations',
+    url: 'api/v1.0/Word/ConvertEquations',
     method: 'POST',
     data
   })
@@ -39,7 +39,7 @@ export function fetchConvertEquations(baseURL, data) {
 export function fetchDownloadFile(baseURL, params) {
   return service({
     baseURL: baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'get',
     responseType: 'blob',
     params

api/fileApi.js

-import service from '@utils/requestService'
+import service from '@utils/RequestService'
 
 export function SplitRevisionDoc(baseURL, data) {
   return service({

api/graphApi.js

@@ -3,7 +3,7 @@ import service from '@utils/GraphApiService'
 export function splitDocxByBookMark(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByBookMark',
+    url: 'api/v1.0/Word/SplitDocxByBookMark',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function splitDocxByBookMark(baseURL, data) {
 export function splitDocxByRange(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByRange',
+    url: 'api/v1.0/Word/SplitDocxByRange',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function splitDocxByRange(baseURL, data) {
 export function splitDocx(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocx',
+    url: 'api/v1.0/Word/SplitDocx',
     method: 'post',
     data
   })
@@ -31,8 +31,18 @@ export function splitDocx(baseURL, data) {
 export function splitDocxByPageBreak(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByPageBreak',
+    url: 'api/v1.0/Word/SplitDocxByPageBreak',
     method: 'post',
     data
   })
 }
+
+export function downloadFile(baseURL, data){
+  return service({
+    baseURL: baseURL,
+    url:'api/v1.0/Word/DownloadFile',
+    method: 'post',
+    data,
+    responseType: 'blob' 
+  })
+}
\ No newline at end of file

api/uploadApi.js

-import service from '@utils/requestService'
+import service from '@utils/RequestService'
 
 export function createHxRequestPaymentVerticalTotal(baseURL, data) {
   return service({

api/uploadExcelApi.js

@@ -3,7 +3,7 @@ import service from '@utils/GraphApiService'
 export function fetchEhrEmployeeByName(baseURL, params) {
   return service({
     baseURL: baseURL,
-    url: 'Wade/GetEhrEmployeeByName',
+    url: 'api/v1.0/Wade/GetEhrEmployeeByName',
     method: 'get',
     params
   })
@@ -11,7 +11,7 @@ export function fetchEhrEmployeeByName(baseURL, params) {
 export function fetchCaseLevelList(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Wade/CreateCaseLevelList',
+    url: 'api/v1.0/Wade/CreateCaseLevelList',
     method: 'post',
     data
   })

example/App.vue

@@ -2,11 +2,11 @@
   <div id="app">
     Hi app
     <pLink type="primary">Test</pLink>
-    <splitTool baseUrl="https://dev.essenptl.com/graphAPITest/api/v1.0/"></splitTool>
-    <convertTool baseUrl="https://dev.essenptl.com/graphAPITest/api/v1.0/"></convertTool>
+    <splitTool baseUrl="https://dev.essenptl.com/graphAPITest/"></splitTool>
+    <convertTool baseUrl="https://dev.essenptl.com/graphAPITest/"></convertTool>
     <fileSplit baseUrl="https://dev.essenptl.com/dev2/wade_ext/"></fileSplit>
     <upload baseUrl="https://dev.essenptl.com/dev2/wade_ext/"></upload>
-    <uploadExcel baseUrl="https://dev.essenptl.com/graphAPITest/api/v1.0/"></uploadExcel>
+    <uploadExcel baseUrl="https://dev.essenptl.com/graphAPITest/"></uploadExcel>
 
   </div>
 </template>

lib/demo.html

-<meta charset="utf-8">
-<title>index demo</title>
-<script src="./index.umd.js"></script>
-
-<link rel="stylesheet" href="./index.css">
-
-
-<script>
-console.log(index)
-</script>

lib/index.css

-.p-link-default[data-v-30dd6ef1]{color:#606266}.p-link-primary[data-v-30dd6ef1]{color:#409eff}.el-form .el-form-item[data-v-00c636ef]{margin:10px 0}.el-form .el-form-item .el-radio-group[data-v-00c636ef]{margin-left:20px}.el-form .el-form-item input[data-v-00c636ef]{width:126px;margin-left:10px;outline:none;border:0;background:#c6c6c6}.choose-box[data-v-00c636ef]{margin-left:200px;border:1px solid #000;width:220px}.choose-box div>span[data-v-00c636ef]{display:inline-block;width:56px;text-align:center;margin:10px 5px;border:1px solid #000}input[data-v-00c636ef]::-webkit-input-placeholder{font-size:12px;opacity:.8}[data-v-00c636ef] .el-form-item__content{line-height:1.5!important}.excel-upload-input[data-v-77bf1e84]{display:none;z-index:-9999}.drop[data-v-77bf1e84]{border:2px dashed #bbb;width:600px;height:160px;line-height:160px;margin:0 auto;font-size:24px;border-radius:5px;text-align:center;color:#bbb;position:relative}
\ No newline at end of file

package.json

 {
   "name": "@purplevin/component",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "private": false,
   "main": "lib/index.umd.min.js",
   "scripts": {

packages/convertTool/src/index.vue

@@ -24,7 +24,8 @@ export default {
   props:{
     baseUrl:{
       type: String,
-      default: 'prod_sz'
+      require: true,
+      default: 'https://dev.essenptl.com/graphAPITest/'
     }
   },
   components: {

packages/fileSplit/src/components/SplitWordForm.vue

@@ -77,10 +77,9 @@
 </template>
 <script>
 import { SplitRevisionDoc} from '@api/fileApi'
-import { mixins } from "../mixin/toolMixin";
+import { downloadFile } from '@api/graphApi'
 export default {
   name: 'SplitWordForm',
-  mixins:["mixins"],
   props:{
     baseUrl:{
       type: String
@@ -252,6 +251,28 @@ export default {
       this.$set(fileList[0], 'name', files[0].name)
       this.$refs['rebateUpload'].clearFiles()// 清除文件
       this.$refs['rebateUpload'].handleStart(files[0])// 选择文件后的赋值方法
+    },
+    async downloadFile(zipFileName) {
+      try {
+        const formData = new FormData()
+        formData.append('fileName', zipFileName)
+        const response = await downloadFile(baseUrl, formData)
+        if (response) {
+          const blob = new Blob([response])
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)
+          downloadElement.href = href
+          downloadElement.download = zipFileName.split('\\').pop().split('/').pop()
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement)
+          window.URL.revokeObjectURL(href)
+        }
+      } catch (error) {
+        console.log('error', error)
+        this.$refs.upload.abort()
+        this.$message.error('下载档案失败!')
+      }
     }
   }
 }

packages/fileSplit/src/index.vue

@@ -12,7 +12,8 @@ export default {
   props:{
     baseUrl:{
       type: String,
-      default: 'prod_sz'
+      require: true,
+      default: 'https://dev.essenptl.com/graphAPITest/'
     }
   }
 }

packages/fileSplit/src/mixin/toolMixin.js

-import service from '@utils/requestService'
-import Vue from 'vue'
-
-Vue.mixin({
-  methods: {
-    async downloadFile(zipFileName) {
-      try {
-        const formData = new FormData()
-        formData.append('fileName', zipFileName)
-        const response = await service.post('api/v1.0/Word/DownloadFile', formData, { responseType: 'blob' })
-        if (response) {
-          const blob = new Blob([response])
-          const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)
-          downloadElement.href = href
-          downloadElement.download = zipFileName.split('\\').pop().split('/').pop()
-          document.body.appendChild(downloadElement)
-          downloadElement.click()
-          document.body.removeChild(downloadElement)
-          window.URL.revokeObjectURL(href)
-        }
-      } catch (error) {
-        console.log('error', error)
-        this.$refs.upload.abort()
-        this.$message.error('下载档案失败!')
-      }
-    }
-  }
-})

packages/splitTool/src/components/SplitBookMarkWordForm.vue

@@ -48,8 +48,10 @@
 </template>
 <script>
 import { splitDocxByBookMark } from '@api/graphApi'
+import mixin from '../mixin/toolMixin'
 export default {
   name: 'SplitWordForm',
+  mixins:[mixin],
   props:{
     baseUrl:{
       type: String
@@ -78,7 +80,7 @@ export default {
         this.fileList = []
         this.$refs.upload.clearFiles()
         const excelFileName = response.data
-        this.downloadFile(excelFileName)
+        this.downloadFile(this.baseUrl, excelFileName)
       } else {
         this.$refs.upload.abort()
         this.$message.error('下载档案失败!')

packages/splitTool/src/components/SplitPageBreakWordForm.vue

@@ -48,8 +48,10 @@
 </template>
 <script>
 import { splitDocxByPageBreak } from '@api/graphApi'
+import mixin from '../mixin/toolMixin'
 export default {
   name: 'SplitWordForm',
+  mixins:[mixin],
   props:{
     baseUrl:{
       type: String
@@ -78,7 +80,7 @@ export default {
         this.fileList = []
         this.$refs.upload.clearFiles()
         const excelFileName = response.data
-        this.downloadFile(excelFileName)
+        this.downloadFile(this.baseUrl, excelFileName)
       } else {
         this.$refs.upload.abort()
         this.$message.error('下载档案失败!')

packages/splitTool/src/components/SplitRangeWordForm.vue

@@ -54,8 +54,10 @@
 </template>
 <script>
 import { splitDocxByRange } from '@api/graphApi'
+import mixin from '../mixin/toolMixin'
 export default {
   name: 'SplitRangeWordForm',
+  mixins:[mixin],
   props:{
     baseUrl:{
       type: String
@@ -90,7 +92,7 @@ export default {
         this.fileList = []
         this.$refs.upload.clearFiles()
         const excelFileName = response.data
-        this.downloadFile(excelFileName)
+        this.downloadFile(this.baseUrl, excelFileName)
       } else {
         this.$refs.upload.abort()
         this.$message.error('下载档案失败!')

packages/splitTool/src/components/SplitWordForm.vue

@@ -48,8 +48,10 @@
 </template>
 <script>
 import { splitDocx } from '@api/graphApi'
+import mixin from '../mixin/toolMixin'
 export default {
   name: 'SplitWordForm',
+  mixins:[mixin],
   props:{
     baseUrl:{
       type: String
@@ -78,7 +80,7 @@ export default {
         this.fileList = []
         this.$refs.upload.clearFiles()
         const excelFileName = response.data
-        this.downloadFile(excelFileName)
+        this.downloadFile(this.baseUrl, excelFileName)
       } else {
         this.$refs.upload.abort()
         this.$message.error('下载档案失败!')

packages/splitTool/src/index.vue

@@ -26,7 +26,8 @@ export default {
   props:{
     baseUrl:{
       type: String,
-      default: 'prod_sz'
+      require:true,
+      default: 'https://dev.essenptl.com/graphAPITest/'
     }
   },
   components: {

packages/splitTool/src/mixin/toolMixin.js

-import graphRequest from '@utils/GraphApiService'
-import Vue from 'vue'
+import { downloadFile } from '@api/graphApi'
 
-Vue.mixin({
+export default{
   methods: {
-    async downloadFile(excelFileName) {
+    async downloadFile(BaseUrl, excelFileName) {
       try {
         const formData = new FormData()
         formData.append('fileName', excelFileName)
-        const response = await graphRequest.post('Word/DownloadFile', formData, { responseType: 'blob' })
+        const response = await downloadFile(BaseUrl, formData)
         if (response) {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')
@@ -26,4 +25,4 @@ Vue.mixin({
       }
     }
   }
-})
+}

packages/upload/src/index.vue

@@ -136,7 +136,8 @@ export default {
   props:{
     baseUrl:{
       type: String,
-      default: 'prod_sz'
+      require: true,
+      default: 'https://dev.essenptl.com/graphAPITest/'
     }
   },
   data: function() {

packages/upload_excel/src/index.vue

@@ -32,7 +32,8 @@ export default {
   props:{
     baseUrl:{
       type: String,
-      default: 'prod_sz'
+      require: true,
+      default: 'https://dev.essenptl.com/graphAPITest/'
     }
   },
   data() {