Commit eb3f397e9122894b3e1c81448b97d72dad616a26

Authored by sqy
1 parent 17aa7bb1

'fix:恢复租户角色roleType字段'

@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
46 "crypto-js": "^4.1.1", 46 "crypto-js": "^4.1.1",
47 "echarts": "^5.1.2", 47 "echarts": "^5.1.2",
48 "intro.js": "^4.1.0", 48 "intro.js": "^4.1.0",
  49 + "jsoneditor": "^9.7.2",
49 "jwt-decode": "^3.1.2", 50 "jwt-decode": "^3.1.2",
50 "lodash-es": "^4.17.21", 51 "lodash-es": "^4.17.21",
51 "mockjs": "^1.1.0", 52 "mockjs": "^1.1.0",
@@ -64,6 +65,7 @@ @@ -64,6 +65,7 @@
64 "vue-json-pretty": "^2.0.4", 65 "vue-json-pretty": "^2.0.4",
65 "vue-router": "^4.0.11", 66 "vue-router": "^4.0.11",
66 "vue-types": "^4.0.3", 67 "vue-types": "^4.0.3",
  68 + "vue3-ace-editor": "^2.2.2",
67 "xlsx": "^0.17.0" 69 "xlsx": "^0.17.0"
68 }, 70 },
69 "devDependencies": { 71 "devDependencies": {
@@ -4,6 +4,7 @@ import { h } from 'vue'; @@ -4,6 +4,7 @@ import { h } from 'vue';
4 import { Switch } from 'ant-design-vue'; 4 import { Switch } from 'ant-design-vue';
5 import { setRoleStatus } from '/@/api/system/system'; 5 import { setRoleStatus } from '/@/api/system/system';
6 import { useMessage } from '/@/hooks/web/useMessage'; 6 import { useMessage } from '/@/hooks/web/useMessage';
  7 +import { RoleEnum } from '/@/enums/roleEnum';
7 export const columns: BasicColumn[] = [ 8 export const columns: BasicColumn[] = [
8 { 9 {
9 title: '角色名称', 10 title: '角色名称',
@@ -73,6 +74,18 @@ export const searchFormSchema: FormSchema[] = [ @@ -73,6 +74,18 @@ export const searchFormSchema: FormSchema[] = [
73 }, 74 },
74 75
75 { 76 {
  77 + field: 'roleType',
  78 + label: '',
  79 + component: 'Input',
  80 + colProps: { span: 8 },
  81 + defaultValue: RoleEnum.TENANT_ADMIN,
  82 + ifShow: false,
  83 + componentProps: {
  84 + maxLength: 20,
  85 + },
  86 + },
  87 +
  88 + {
76 field: 'status', 89 field: 'status',
77 label: '状态', 90 label: '状态',
78 component: 'Select', 91 component: 'Select',