diff --git a/src/components/LowDesign/src/LowTable/index.vue b/src/components/LowDesign/src/LowTable/index.vue
index 33d856d..70458d2 100644
--- a/src/components/LowDesign/src/LowTable/index.vue
+++ b/src/components/LowDesign/src/LowTable/index.vue
@@ -12,7 +12,7 @@
>
@@ -28,7 +28,7 @@
show_fixed_bar: isShowFixedBar,
[`low-table-grid__${tableInfo.singleCardSpan}`]: tableOption.grid
}"
- :style="{ paddingTop: summaryTop.height + 'px' }"
+ :style="{ paddingTop: tableId!=='2049373858120613889'?summaryTop.height:'0' + 'px' }"
>
+
+
+
+
+
+
{
isPermi: props.isPermi,
useFun
})
+ searchDefaultValue.value = {...searchDefaultValue.value,...optionData.defaultSearch}
if (isDicTable.value && props.dicRowKey) optionData.tableOption.rowKey = props.dicRowKey
if (
['treeTable', 'treeAround'].includes(optionData.tableInfo.tableType) &&
@@ -710,7 +724,7 @@ const initTable = async () => {
}
try {
if (jsEnhanceObj.value.initOption) jsEnhanceObj.value.initOption()
- searchDefaultValue.value =JSON.parse(JSON.stringify(tableSearch.value))
+ searchDefaultValue.value = {...searchDefaultValue.value,...JSON.parse(JSON.stringify(tableSearch.value))}
} catch (error) {
enhanceErrorTip('js增强【initOption】方法执行异常,请检查', error)
diff --git a/src/components/LowDesign/src/utils/tableUtil.ts b/src/components/LowDesign/src/utils/tableUtil.ts
index d4af366..15b9f45 100644
--- a/src/components/LowDesign/src/utils/tableUtil.ts
+++ b/src/components/LowDesign/src/utils/tableUtil.ts
@@ -123,6 +123,7 @@ const initColumn = (data, componentData, columnParams) => {
const ruleObj = {}
const summaryBottom = {}
const tableDic = {}
+ const defaultSearch = {}
data.forEach(item => {
const { dictEntity, webEntity, queryEntity, exportEntity, summaryEntity, fieldCode, fieldName, fieldType, fieldLen, fieldPointLen, fieldDefaultVal } = item
const { cellWidthType, cellWidth, controlsConfig, verifyConfig, isShowForm, isShowList, isDbSelect, isShowColumn, isShowSort, isRequired } = webEntity
@@ -139,6 +140,8 @@ const initColumn = (data, componentData, columnParams) => {
label: t(`${tableId}.${fieldCode}`),
prop: fieldCode,
type: controlType,
+ searchType: fieldName == '年'?'year' : controlType,
+ valueFormat: fieldName == '年'?'YYYY' : undefined,
span,
display: isShowForm == 'Y',
hide,
@@ -166,7 +169,10 @@ const initColumn = (data, componentData, columnParams) => {
if (isDbSelect == 'Y') column[fieldCode].value = fieldDefaultVal
else column[fieldCode].addValue = fieldDefaultVal
}
- if (queryDefaultVal !== '' && fieldDefaultVal !== null) column[fieldCode].searchValue = queryDefaultVal
+ if (queryDefaultVal !== '' && fieldDefaultVal !== null) {
+ column[fieldCode].searchValue = queryDefaultVal
+ defaultSearch[fieldCode] = queryDefaultVal
+ }
//字典处理
if (dictTable) tableDic[fieldCode] = true
else if (dictCode) {
@@ -547,7 +553,7 @@ const initColumn = (data, componentData, columnParams) => {
summaryBottom[fieldCode] = true
}
})
- return { column, control, ruleObj, summaryBottom }
+ return { column, control, ruleObj, summaryBottom ,defaultSearch}
}
//按钮初始化
@@ -709,7 +715,7 @@ export const initTableOption = (data, context) => {
}
//字段处理
- const { column, control, ruleObj, summaryBottom } = initColumn(fieldList, componentData, columnParams)
+ const { column, control, ruleObj, summaryBottom ,defaultSearch } = initColumn(fieldList, componentData, columnParams)
tableOption.column = column
if (subDbFormIdList && subDbFormIdList.length) {
@@ -825,6 +831,7 @@ export const initTableOption = (data, context) => {
tableInfo,
jsEnhanceStr,
scssEnhanceStr,
+ defaultSearch
}
}