agilebuilder-ui 1.0.621 → 1.0.962

package/packages/super-grid/src/super-grid-service.js

@@ -176,6 +176,7 @@ const superGridService = {
                 gridParams.pagination = this.pagination
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
+                gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用
                   this.pageSize = this.pagination.pageSize
@@ -192,6 +193,7 @@ const superGridService = {
                   ? this.isShowPage
                   : false
                 gridParams.isSubTableShowPage = this.isSubTableShowPage
+                this.getDetailColumn()
                 this.hasLoadedColumns = true
                 let canFetchData = true
                 if (isHasOptionFunction('loadBeforeSend', this.code)) {
@@ -203,6 +205,7 @@ const superGridService = {
                     configureObj: this.configureObj
                   })
                 }
+                // console.log('fetchData-----this.options.initSearch=', this.options.initSearch,'gridParams.basicInfo.initializationQuery=', gridParams.basicInfo.initializationQuery, '0000000')
                 if (canFetchData === undefined || canFetchData === true) {
                   // 表示初始化时查询记录
                   if (this.options.isPageInfo) {
@@ -213,6 +216,7 @@ const superGridService = {
                       'undefined' ||
                       gridParams.basicInfo.initializationQuery
                     ) {
+                      // console.log('fetchData-----this.loadCompleteQuery=', this.loadCompleteQuery, '1111111')
                       // 判断是否初始化完查询条件后再查询数据
                       if (this.loadCompleteQuery) {
                         this.isLoading = false
@@ -220,7 +224,7 @@ const superGridService = {
                         this.fetchData()
                       }
                     }
-                  } else if (this.options.initSearch !== false) {
+                  } else if (this.options.initSearch) {
                     // 判断是否初始化完查询条件后再查询数据
                     if (this.loadCompleteQuery) {
                       this.isLoading = false
@@ -230,9 +234,9 @@ const superGridService = {
                   }
                 }
                 this.createBackgroundColorMap()
-                const p2 = new Date().getTime()
-                console.log('拿到共享数据并存储p2-p1=', p2 - p1)
-                console.log('拿到共享数据并存储p2-b=', p2 - b)
+                // const p2 = new Date().getTime()
+                // console.log('拿到共享数据并存储p2-p1=', p2 - p1)
+                // console.log('拿到共享数据并存储p2-b=', p2 - b)
                 resolve()
               })
               .catch((error) => {
@@ -247,6 +251,45 @@ const superGridService = {
       console.log('初始化所耗时间', a1 - a)
     })
   },
+  getDetailColumn() {
+    if (this.isFormSubTable && this.options.showRowForm) {
+      // 显示详情列
+      const detailColumn = {
+        "prop": "$detail",
+        "orgProp": "$detail",
+        "label": "详情",
+        "dataType": "TEXT",
+        "width": 80,
+        "show": true,
+        "exportable": false,
+        "sortable": "false",
+        "filterable": false,
+        "fixed": "left",
+        "span": false,
+        "queryType": "no",
+        "querySetting": "{}",
+        "editable": false,
+        "componentType": "input",
+        "titleAlign": "center",
+        "contAlign": "center",
+        "showType": "default",
+        "exportType": "default",
+        "displayOrderType": "default",
+        "displayOrder": 5,
+        "widthType": "default",
+        "ifMultiData": true,
+        "dynamic": false,
+        "total": false,
+        "custom": true,
+        "remoteEnum": false,
+        "fuzzy": true,
+        "groupHeader": false
+      }
+      detailColumn.label = this.$t('superGrid.detail')
+      this.detailColumn = detailColumn
+      console.log('getDetailColumn----this.detailColumn=', this.detailColumn)
+    }
+  },
   getListViewSetting(additionalParams) {
     return new Promise((resolve, reject) => {
       console.log('getListViewSetting--this.settings====', this.settings)
@@ -295,9 +338,10 @@ const superGridService = {
           column.hasOwnProperty('prop')
         ) {
           if (column.prop !== '$index' && column.prop !== '$selection') {
-            if (column.queryType && column.queryType !== 'no') {
+            if (column.queryType && column.queryType !== 'no' && column.componentType && (column.componentType === 'date' || column.componentType === 'dateSection' ||
+              column.componentType === 'timePicker' || column.componentType === 'dateTimePicker')) {
               // 配置了默认值
-              if (column.controlConfig) {
+              if (column.controlConfig && column.controlConfig.timeDefaultQueryRange) {
                 queryParameterSize++
               }
             }
@@ -307,6 +351,7 @@ const superGridService = {
       if (queryParameterSize > 0) {
         this.loadCompleteQuery = true
       }
+      // console.log('isLoadCompleteQuery-----this.loadCompleteQuery=', this.loadCompleteQuery)
     }
   },
   packageColumnOptionMap(gridParams) {