Commit 99d3eac4 authored by 田翔's avatar 田翔

fix: 台账选择器和关联表单支持默认排序

parent fb8e2feb
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "6.0.16", "version": "6.0.17",
"description": "6.0.16 补充提交", "description": "6.0.17 台账选择器和关联表单支持默认排序",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -179,11 +179,12 @@ const RelationForm = (props) => { ...@@ -179,11 +179,12 @@ const RelationForm = (props) => {
user: userID, user: userID,
condition: sql ? window.btoa(encodeURIComponent(sql)) : '', condition: sql ? window.btoa(encodeURIComponent(sql)) : '',
accountName: accountName, accountName: accountName,
direction: 'desc', sortFields: config?.defaultSortFields || '录入时间',
direction: config?.sortOrder || 'desc',
timeField: '录入时间', timeField: '录入时间',
pageIndex: 0, pageIndex: 0,
pageSize: 0, pageSize: 0,
queryWheres queryWheres,
} }
if (queryWheres.every(v => !v.value)) return if (queryWheres.every(v => !v.value)) return
const { code, data, msg } = await GetAccountPageList(params) const { code, data, msg } = await GetAccountPageList(params)
......
...@@ -19,6 +19,11 @@ const initConfig = { ...@@ -19,6 +19,11 @@ const initConfig = {
enableTimeFilter: 0, //时间筛选 enableTimeFilter: 0, //时间筛选
} }
let defaultParams = {
sortFields: '录入时间',
direction: 'desc',
}
const AccountSelector = (props) => { const AccountSelector = (props) => {
const userID = window?.globalConfig?.userInfo?.OID || 1 const userID = window?.globalConfig?.userInfo?.OID || 1
...@@ -31,12 +36,11 @@ const AccountSelector = (props) => { ...@@ -31,12 +36,11 @@ const AccountSelector = (props) => {
extendQuery: { extendQuery: {
caseNo: codes['工单编号'] caseNo: codes['工单编号']
}, },
sortFields: '录入时间',
direction: 'desc',
total: 0, total: 0,
pageIndex: 1, pageIndex: 1,
pageSize: 100, pageSize: 100,
siteFilter siteFilter,
...defaultParams,
} }
const [params, setParams] = useState(initParams) const [params, setParams] = useState(initParams)
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
...@@ -63,7 +67,16 @@ const AccountSelector = (props) => { ...@@ -63,7 +67,16 @@ const AccountSelector = (props) => {
const { code, data } = await GetAccountConfigInfo(accountName); const { code, data } = await GetAccountConfigInfo(accountName);
if (code == 0) { if (code == 0) {
setConfig({ ...data, formJson: isJson(data.formJson) ? JSON.parse(data.formJson) : {} }) setConfig({ ...data, formJson: isJson(data.formJson) ? JSON.parse(data.formJson) : {} })
getDataSource({ condition: data?.sqlFilter ? window.btoa(encodeURIComponent(data?.sqlFilter)) : '', }) defaultParams = {
sortFields: data?.defaultSortFields || '录入时间',
direction: data?.sortOrder || 'desc',
}
let param = {
condition: data?.sqlFilter ? window.btoa(encodeURIComponent(data?.sqlFilter)) : '',
pageSize: data.pageSize || 20,
...defaultParams,
}
getDataSource(param)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment