doway-coms 2.1.9 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.1.9",
+  "version": "2.2.0",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -289,7 +289,7 @@
             :popupAddName="scope.column.params.popupAddName"
             :popupAddPath="scope.column.params.popupAddPath"
             :allowAutoClear="scope.column.params.allowAutoClear"
-            @preSearch="(searchInfo) => preSearch(searchInfo, scope)"
+            @preSearch="(searchInfo,repeatRowInfo,row,api) => preSearch(searchInfo, scope,null,api)"
             @selectChanged="cellValueChange(scope)"
             @confirmMultiSelect="
               (pulldownView, selectRows) =>
@@ -2603,8 +2603,8 @@ export default {
 
       return errorMsgList
     },
-    preSearch(searchInfo, scope, scopeRow) {
-      this.$emit('preSearch', searchInfo, scope, scopeRow)
+    preSearch(searchInfo, scope, scopeRow,api) {
+      this.$emit('preSearch', searchInfo, scope, scopeRow,api)
     },
     pulldownBtnClick(btn) {
       this.$emit('pulldownBtnClick', btn)

package/packages/BasePulldown/src/index.vue

@@ -237,6 +237,9 @@ export default {
         operator: 'and',
         expressions: [],
       },
+      newApiObj:{
+        newApi:''
+      }
     }
   },
   props: {
@@ -844,7 +847,7 @@ export default {
         values: [],
       }
       //查询之前从外部组件构造其他的条件
-      this.$emit('preSearch', postExpression, repeatRowInfo, this.row)
+      this.$emit('preSearch', postExpression, repeatRowInfo, this.row,this,newApiObj)
       let postData = {
         fields: this.fetchFields,
         begin:
@@ -993,6 +996,9 @@ export default {
     },
     getPostApi(postData) {
       let tempApi = this.api
+      if(this.newApiObj){
+        tempApi=this.newApiObj.newApi
+      }
       if (this.api.indexOf('?') > 0) {
         tempApi = this.api.substring(0, this.api.indexOf('?'))
         let tempExtenParams = this.api.substring(this.api.indexOf('?') + 1)