diff --git a/package.json b/package.json index 5ba8cef..0f761da 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "element-resize-detector": "^1.2.4", "font-awesome": "^4.7.0", "gm-crypto": "^0.1.12", + "gm-crypto-wasm": "^0.1.5", "html2canvas": "^1.4.1", "install": "^0.13.0", "js-beautify": "^1.14.8", diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts index d4f0aa7..c1e6fa6 100644 --- a/src/api/DesignForm/type.ts +++ b/src/api/DesignForm/type.ts @@ -6,6 +6,9 @@ export interface SearchForm extends PageQuery{ } //自定义表单列表内容 export interface customerFormCont{ + signCodeStr: any; + isEdit: any; + describe: any; id: number, name: string, tablename: string, diff --git a/src/api/date/type.ts b/src/api/date/type.ts index 0ea87af..f641eab 100644 --- a/src/api/date/type.ts +++ b/src/api/date/type.ts @@ -95,7 +95,8 @@ export interface appSetInfo { appName:string; appSvg:string; state:number; - uuid:string; + uuid:string; + describe?:string; } /** @ 作者: 秦东 diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 7afa6a1..59275ec 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -1151,11 +1151,19 @@ let asfQueryParams: any[] = []; @ 功能: 获取数据 */ const getPageData = () => { + + // by han2015: 处理排序字段信息 + let arr:string[]=[]; + columnSortData.forEach((value, key) => { + arr.push(`${key} ${value}`) + }); + let sendData = { formId: props.formId, page: state.currentPage, pagesize: state.pageSize, searchData: json2string(props.searchData), + sortData: arr.join(", "), }; // console.log("获取列表详细信息",sendData) @@ -1185,6 +1193,7 @@ const getPageData = () => { break; default: state.loading = true; + //by han2015, 抽成独立部分,方便其他功能调用 doGainFormPageListCont(sendData) .then((datas) => { @@ -1782,6 +1791,32 @@ const lookPageInfoIsShow = ref(false); const asflookPageInfoIsShow = ref(false); const pageInfoCont = ref(); +//------------------ by han2015: 支持表单排序功能---------------------- +const columnSortData = new Map(); +const setHeaderClass=(params:any)=>{ + if(columnSortData.has(params.column.property)){ + if(columnSortData.get(params.column.property)=="DESC"){ + params.column.order="descending" + return + }else{ + params.column.order="ascending" + return + } + } +} +// by han2015: 列表支持表头排序 +const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" | null }) => { + if (data.order === "descending") { + columnSortData.set(data.prop, "DESC"); + } else if (data.order === "ascending") { + columnSortData.set(data.prop, "ASC"); + } else { + columnSortData.delete(data.prop); + } + getPageData() +} + + const lookPageInfo = (val: any) => { console.log("查看详细内容--------------------------->"); console.log(val); @@ -2331,13 +2366,14 @@ const getNonValue = () => { - @@ -2370,12 +2406,14 @@ const getNonValue = () => { {{ writeListTitle(scope.row, viewPage.list) }} + - + { config="" min-width="220" header-align="center" + sortable="custom" align="center" >