doway-coms 2.10.35 → 2.10.37

package/package.json

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

package/packages/BaseForm/src/index.vue

@@ -260,6 +260,7 @@
         :api="col.api"
         :tooltip="col.tooltip"
         :optBtns="col.optBtns"
+        :linkData="col.linkData"
         :popupAddName="col.popupAddName"
         :popupAddPath="col.popupAddPath"
         @pulldownBtnClick="pulldownBtnClick"

package/packages/BaseGrid/src/index.vue

@@ -311,6 +311,7 @@
             :row="scope.row"
             :api="scope.column.params.api"
             :isLocalData="scope.column.params.isLocalData"
+            :linkData="scope.column.params.linkData"
             :localDataSource="scope.column.params.localDataSource"
             :isMultiSelect="scope.column.params.isMultiSelect"
             :defaultExpression="scope.column.params.defaultExpression"
@@ -2026,6 +2027,7 @@ export default {
       }
       if (originCol.controlType === controlType.pulldown) {
         colParams['selectedSorts'] = originCol.selectedSorts
+        colParams['linkData'] = originCol.linkData
         colParams['api'] = originCol.api
         colParams['defaultExpression'] = originCol.defaultExpression
         colParams['pageSize'] = originCol.pageSize

package/packages/BasePulldown/src/index.vue

@@ -390,6 +390,12 @@ export default {
         return ''
       },
     },
+    linkData: {
+      type: String,
+      default: function () {
+        return ''
+      },
+    },
     propTableData: {
       type: Array,
       default: function () {
@@ -1006,6 +1012,18 @@ export default {
         sorts: this.sorts,
         extendParams: postExpression.extendParams,
       }
+      if (this.linkData) {
+          postData = {
+            moduleCode: this.$route.meta.moduleCode,
+            dataCodes: [
+              {
+                dataCode: this.linkData,
+                searchParam: postData,
+              },
+            ],
+          };
+        }
+
       // console.log(postData.sorts);
       let tempApi = this.getPostApi(postData)
 
@@ -1032,13 +1050,18 @@ export default {
         data: postData,
       })
         .then((responseData) => {
-          if (vm.isOld === true) {
-            vm.searchRows = responseData.data
-            vm.gridPagerConfig.total = responseData.extData.totalRows
-          } else {
-            vm.searchRows = responseData.content
-            vm.$refs.pupupGridView.loadData(vm.searchRows)
-            vm.gridPagerConfig.total = responseData.otherContent.totalRows
+          if(vm.linkData){
+            vm.searchRows = responseData.content[this.linkData].rows
+            vm.gridPagerConfig.total = XEUtils.toNumber(responseData.content[this.linkData].totalRows);
+          }else{
+            if (vm.isOld === true) {
+              vm.searchRows = responseData.data
+              vm.gridPagerConfig.total = responseData.extData.totalRows
+            } else {
+              vm.searchRows = responseData.content
+              vm.$refs.pupupGridView.loadData(vm.searchRows)
+              vm.gridPagerConfig.total = responseData.otherContent.totalRows
+            }
           }
           //本身结果集会返回sysRepeat为true的数据，所以处理数据的时候不能默认设置成false，会把后台返回的数据重置掉
           //查询下拉显示列配置成sysRepeat的列字段名称

package/packages/utils/store.js

@@ -71,14 +71,20 @@ export default new Vuex.Store({
                 tempDataInfo[loopData.code].code = loopData.code
                 tempDataInfo[loopData.code].name = loopData.name
                 tempDataInfo[loopData.code].extraInfo = loopData.extraInfo
+                if (loopData.extraInfo && Object.keys(loopData.extraInfo).length) {
+                    tempDataInfo[loopData.code] = XEUtils.assign(
+                      loopData.extraInfo,
+                      tempDataInfo[loopData.code],
+                    );
+                  }
                 let operationFields = []
                 XEUtils.arrayEach(loopData.fields, loopField => {
                     let tempField = {
-                        field: loopField.boundField,
+                        field:loopField.code, // loopField.boundField,
                         title: loopField.name,
                         width: loopField.width,
                         visible: !loopField.hidden,
-                        filters: loopField.isFilter,
+                        filter: loopField.isFilter,
                         sortable: loopField.isSortable,
                         controlType: loopField.controlType,
                         edit: loopField.edit,