Commit ba8c52e1b2d0b344589d25dee49d7a14f0acfff4

Authored by xp.Huang
2 parents 3c854a17 e214350e

Merge branch 'ft_local_dev' into 'main'

pref:优化租户配置时间排序

See merge request huang/yun-teng-iot-front!412
@@ -48,9 +48,13 @@ export async function deleteTenantProfileApi(ids: string) { @@ -48,9 +48,13 @@ export async function deleteTenantProfileApi(ids: string) {
48 } 48 }
49 49
50 export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => { 50 export const getTableTenantProfileApi = (params?: QueryTenantProfilesParam) => {
  51 + const param = {
  52 + ...params,
  53 + orderFiled: 'createdTime',
  54 + };
51 return defHttp.get<PaginationResult>({ 55 return defHttp.get<PaginationResult>({
52 url: Api.getTenantProfile, 56 url: Api.getTenantProfile,
53 - params, 57 + params: param,
54 }); 58 });
55 }; 59 };
56 60
@@ -257,7 +257,6 @@ @@ -257,7 +257,6 @@
257 }); 257 });
258 258
259 const userStore = useUserStore(); 259 const userStore = useUserStore();
260 - console.log(userStore.getUserInfo);  
261 const defaultAvatar = (uid) => { 260 const defaultAvatar = (uid) => {
262 if (uid === userStore.getUserInfo?.userId) { 261 if (uid === userStore.getUserInfo?.userId) {
263 return userStore.getUserInfo?.avatar || headerImg; 262 return userStore.getUserInfo?.avatar || headerImg;
@@ -206,11 +206,7 @@ @@ -206,11 +206,7 @@
206 closeModal(); 206 closeModal();
207 handleCancel(); 207 handleCancel();
208 }) 208 })
209 - .catch((e) => {  
210 - if (e?.message) {  
211 - createMessage.error(e?.message);  
212 - }  
213 - }); 209 + .catch(() => {});
214 }; 210 };
215 return { 211 return {
216 registerModal, 212 registerModal,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [ @@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
33 33
34 export const searchFormSchema: FormSchema[] = [ 34 export const searchFormSchema: FormSchema[] = [
35 { 35 {
36 - field: 'name', 36 + field: 'textSearch',
37 label: '租户配置名称', 37 label: '租户配置名称',
38 colProps: { span: 6 }, 38 colProps: { span: 6 },
39 component: 'Input', 39 component: 'Input',