imatrix-ui 2.9.54-dw → 2.9.56-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.54-dw",
+  "version": "2.9.56-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/super-grid/src/dynamic-input.vue

@@ -13,6 +13,7 @@
       :select-options="options"
       :grid-data="gridData"
       :page-grid-data="pageGridData"
+      :additional-settings="controlConfig"
       @input="cellEvent('input',$event)"
     />
   </div>
@@ -397,7 +398,7 @@
 <script>
 import store from './store'
 import Vue from 'vue'
-import { isDisableEdit, isEditOptionFunction, analysisFileSetObj, otherFilesToStandard, getFileList, isDynamicDataSourceSource, getAdditionalParamMap } from './utils'
+import { isDisableEdit, isEditOptionFunction, analysisFileSetObj, otherFilesToStandard, getFileList, isDynamicDataSourceSource, getAdditionalParamMap, getControlConfig } from './utils'
 import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-select'
 import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
@@ -524,7 +525,8 @@ export default {
       fileInfo: { showName: null, serverPath: null },
       gridData: isSubTableShowPage ? subTableData : gridData,
       pageGridData: isSubTableShowPage ? gridData : null,
-      additionalParamMap
+      additionalParamMap,
+      controlConfig: getControlConfig(this.column)
 
     }
   },

package/packages/super-grid/src/normal-column.vue

@@ -88,7 +88,7 @@
           </span>
         </span>
         <span v-else-if="customFormatValue(scope.row, column.prop, customFormat, scope.$index)" class="cell--span">
-          <component :is="column.prop + scope.$index" :row="scope.row" :entity="scope.row" :prop="column.prop" :parent="parentFormData" :row-index="scope.$index" :show-value="$escapeHtml(getLabel(scope.row,scope.$index))" :value="getCellValue(scope.row)" :select-options="column.valueSet" />
+          <component :is="column.prop + scope.$index" :row="scope.row" :entity="scope.row" :prop="column.prop" :parent="parentFormData" :row-index="scope.$index" :additional-settings="controlConfig" :show-value="$escapeHtml(getLabel(scope.row,scope.$index))" :value="getCellValue(scope.row)" :select-options="column.valueSet" />
         </span>
         <!-- 自定义格式的时候 -->
         <span v-else-if="columnFormatter !== undefined && columnFormatter.type !== undefined && columnFormatter.type === 'customControl' && columnFormatter.options && columnFormatter.options.format && columnFormatter.options.format !== ''" class="cell--span">
@@ -110,6 +110,7 @@
             :grid-data="gridData"
             :page-grid-data="pageGridData"
             :current-page="currentPage"
+            :additional-settings="controlConfig"
             @prohibitToEdit="prohibitToEdit"
           /></span>
         <span v-else-if="columnFormatter !== undefined && columnFormatter.type !== undefined && columnFormatter.type === 'secretInfo'" :id="column.prop+'DomData'+scope.$index" class="cell--span">
@@ -318,7 +319,8 @@ export default {
       isEditable: this.column.editable,
       showRichEditorViewer: false,
       getFormData: gridParams.options.getFormData,
-      getTableGridData: gridParams.options.getGridData
+      getTableGridData: gridParams.options.getGridData,
+      controlConfig: this.getColumnCustomControlControlConfig(this.column.formatter)
 
     }
   },
@@ -763,6 +765,12 @@ export default {
     },
     closeRichEditorContent() {
       this.showRichEditorViewer = false
+    },
+    getColumnCustomControlControlConfig(columnFormatter) {
+      if (columnFormatter && columnFormatter.options && columnFormatter.options.controlConfig) {
+        const controlConfig = JSON.parse(columnFormatter.options.controlConfig)
+        return controlConfig
+      }
     }
   }
 }

package/packages/super-grid/src/search-form-advancedQuery.vue

@@ -218,6 +218,7 @@
               class="customComponent"
               :prop="scope.row.prop"
               :row="scope.row"
+              :additional-settings="controlConfig"
               @input="setValueToModelProp(scope.$index,$event,scope.row.componentName)"
               @focus="selectRow(scope.row)"
             />
@@ -278,7 +279,7 @@ import searchFormNumber from './search-form-number'
 import store from './store'
 import SearchConditionInput from './search-condition-input'
 import SearchConditionList from './search-condition-list'
-import { getDynamicDataSourceOptions, isDynamicDataSourceSource } from './utils'
+import { getDynamicDataSourceOptions, isDynamicDataSourceSource, getControlConfig } from './utils'
 import Vue from 'vue'
 export default {
   name: 'SearchForm',
@@ -327,7 +328,8 @@ export default {
       formFlag: true,
       operationArr: [],
       tableName,
-      isJoinTable: isHasJoinTable // 是否是关联表
+      isJoinTable: isHasJoinTable, // 是否是关联表
+      controlConfig: getControlConfig(this.column)
     }
   },
   computed: {

package/packages/super-grid/src/search-form-item.vue

@@ -14,6 +14,7 @@
         :value="getFormItemValue(column.prop)"
         :row="searchForm"
         :entity="searchForm"
+        :additional-settings="controlConfig"
         @input="setValueToModelProp(column.prop,$event,column.componentName)"
       />
     </span>
@@ -187,7 +188,7 @@
 import searchMethods from './search-methods'
 import searchFormNumber from './search-form-number'
 import store from './store'
-import { getDynamicDataSourceOptions, isDynamicDataSourceSource } from './utils'
+import { getDynamicDataSourceOptions, isDynamicDataSourceSource, getControlConfig } from './utils'
 import Vue from 'vue'
 export default {
   name: 'SearchFormItem',
@@ -238,7 +239,8 @@ export default {
     return {
       customComponentNames: customComponentNames,
       dateOne: null,
-      dataTwo: null
+      dataTwo: null,
+      controlConfig: getControlConfig(this.column)
     }
   },
   mounted() {

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

@@ -231,7 +231,8 @@ const superGridService = {
       columns.forEach(column => {
         if (column.hasOwnProperty('queryType') && 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) {
                 queryParameterSize++

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

@@ -780,3 +780,12 @@ export function getAdditionalParamMap(gridParams) {
   }
   return additionalParamMap
 }
+
+// 获得控件的配置信息，例如：自定义控件的附加配置等
+export function getControlConfig(column) {
+  let controlConfig
+  if (column && column.controlConfig) {
+    controlConfig = JSON.parse(column.controlConfig)
+  }
+  return controlConfig
+}