ocpview-plus 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/editgridcard.vue

@@ -108,12 +108,11 @@ export default {
     },
     computed: {
         tableHeight() {
-            let currentHeight = this.currentHeight - this.extraHeight - this.outsideHeight;
             if(this.isFull) {
-                currentHeight = this.clientHeight - this.$refs.table.$el.offsetTop;
+                return this.clientHeight - this.$refs.table.$el.offsetTop;
             } else {
                 if (!this.myConfig.dynamicHeight) {
-                    currentHeight = this.currentHeight;
+                    let currentHeight = this.currentHeight;
                     if (this.extraHeight) {
                         currentHeight =  currentHeight - Number(this.extraHeight);
                     }
@@ -123,22 +122,27 @@ export default {
                     if (this.myConfig.showSummary) {
                         currentHeight = currentHeight  - 50; 
                     }
-                } 
+                    return currentHeight;
+                } else {
+                    return null;
+                }
+                 
             }
-            return currentHeight;
         },
         tableMaxHeight() {
-            let currentHeight = this.currentHeight - this.extraHeight - this.outsideHeight;
             if(this.isFull) {
-                currentHeight = this.clientHeight - this.$refs.table.$el.offsetTop;
+                return this.clientHeight - this.$refs.table.$el.offsetTop;
             } else {
                 if (this.myConfig.dynamicHeight) {
+                    let currentHeight = this.currentHeight - this.extraHeight - this.outsideHeight;
                     if (this.myConfig.showSummary) {
                         currentHeight = currentHeight  - 50; 
                     }
+                    return currentHeight;
+                } else {
+                    return null;
                 }
             }
-            return currentHeight;
         }
     },
     methods: {

package/src/components/upload/billimport.vue

@@ -46,12 +46,12 @@
                     <template #content>
                     <div>{{filename}}</div>
                     </template>
-                </Poptip>   
+                </Poptip>
             </Col>
             <Col>
                  <Upload ref="upload"
                     :before-upload="handleUpload"
-                    accept=".xlsx,.xls" 
+                    accept=".xlsx,.xls"
                     :format="myConfig.fileType"
                     :on-format-error="handleFormatError"
                     :on-success="handleSuccess"
@@ -77,7 +77,7 @@
         </RadioGroup>
     </Modal>
     </template>
-      
+
   </div>
 </template>
 <script>
@@ -168,7 +168,22 @@
                 } else {
                     let temp  = this.url +'&param=' +encodeURI(JSON.stringify(param));
                     window.open(temp,'_self');
-                } 
+                }
+            },
+            setExportDownUrl(url,param) {
+                /*if (url) {
+                    url = url.replace('rest', 'exportTemplate');
+                }*/
+                let self = this;
+                this.url = this.getResturl(url,null,{},self);
+                if (this.myConfig.typeData.length > 1) {
+                    this.param = param;
+                    this.type = this.myConfig.typeData[0].code;
+                    this.showUpload = true;
+                } else {
+                    let temp  = this.url +'&param=' +encodeURI(JSON.stringify(param));
+                    window.open(temp,'_self');
+                }
             },
             handleUpload (file) {
                 if (!this.checkFormat(file)) {
@@ -214,7 +229,7 @@
                     this.$emit('importSuccess',res);
                 }
                 this.loading = false;
-               
+
             },
             downTemplate() {
                 if (this.type) {
@@ -225,7 +240,7 @@
                         window.open(temp,'_self');
                         this.showUpload = false;
                     }
-                    
+
                 }
             }
         }

package/src/method/case/case.js

@@ -1173,7 +1173,7 @@ function buildFilename(postObj, xhr) {
     ].join('');
 
     const billmoduleid = postObj.billmoduleid || 'export';
-    return `${t}${billmoduleid}.xlsx`;
+    return `${t}${billmoduleid}.xls`;
 }
 
 caseMethod.getFilesInfo = function(billno, billmoduleid,notdelfile,scenetype, callBackMethod) {