Commit 4e24d169d773b5bcb0ce281df1b141ca40d429ff

Authored by xp.Huang
2 parents f8607ab0 024b5115

Merge branch 'local_dev_ft_fix_teambition_issue' into 'main_dev'

fix: 修改修改密码根据权限标识来显示隐藏

See merge request yunteng/thingskit-front!959
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
17 icon="ion:document-text-outline" 17 icon="ion:document-text-outline"
18 /> 18 />
19 <MenuItem 19 <MenuItem
  20 + v-if="hasPermission('system:password:view')"
20 key="changePassword" 21 key="changePassword"
21 :text="t('layout.header.dropdownItemChangePassword')" 22 :text="t('layout.header.dropdownItemChangePassword')"
22 icon="ant-design:unlock-twotone" 23 icon="ant-design:unlock-twotone"
@@ -106,7 +106,7 @@ export const defaultSchemas: FormSchema[] = [ @@ -106,7 +106,7 @@ export const defaultSchemas: FormSchema[] = [
106 getPopupContainer: () => document.body, 106 getPopupContainer: () => document.body,
107 }; 107 };
108 }, 108 },
109 - colProps: useGridLayout(2, 2, 2, 2, 2, 2) as unknown as ColEx, 109 + colProps: useGridLayout(1.5, 1.5, 1.5, 1.5, 1.5, 1.5) as unknown as ColEx,
110 }, 110 },
111 { 111 {
112 field: SchemaFiled.AGG, 112 field: SchemaFiled.AGG,
@@ -148,6 +148,7 @@ @@ -148,6 +148,7 @@
148 { value: 'DEFAULT', label: '默认' }, 148 { value: 'DEFAULT', label: '默认' },
149 { value: 'SYSTEM', label: '系统' }, 149 { value: 'SYSTEM', label: '系统' },
150 { value: 'REPORT', label: '报表' }, 150 { value: 'REPORT', label: '报表' },
  151 + { value: 'TASK_CENTER', label: '任务中心' },
151 ]); 152 ]);
152 const optionStatus: any = ref([ 153 const optionStatus: any = ref([
153 { value: '1 ', label: '成功' }, 154 { value: '1 ', label: '成功' },