Merge branch 'sqy_dev' into 'main'

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

See merge request huang/yun-teng-iot-front!126

@@ -46,6 +46,7 @@
     "crypto-js": "^4.1.1",
     "crypto-js": "^4.1.1",
     "echarts": "^5.1.2",
     "echarts": "^5.1.2",
     "intro.js": "^4.1.0",
     "intro.js": "^4.1.0",
+    "jsoneditor": "^9.7.2",
     "jwt-decode": "^3.1.2",
     "jwt-decode": "^3.1.2",
     "lodash-es": "^4.17.21",
     "lodash-es": "^4.17.21",
     "mockjs": "^1.1.0",
     "mockjs": "^1.1.0",
@@ -64,6 +65,7 @@
     "vue-json-pretty": "^2.0.4",
     "vue-json-pretty": "^2.0.4",
     "vue-router": "^4.0.11",
     "vue-router": "^4.0.11",
     "vue-types": "^4.0.3",
     "vue-types": "^4.0.3",
+    "vue3-ace-editor": "^2.2.2",
     "xlsx": "^0.17.0"
     "xlsx": "^0.17.0"
   },
   },
   "devDependencies": {
   "devDependencies": {

@@ -4,6 +4,7 @@ import { h } from 'vue';
 import { Switch } from 'ant-design-vue';
 import { Switch } from 'ant-design-vue';
 import { setRoleStatus } from '/@/api/system/system';
 import { setRoleStatus } from '/@/api/system/system';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
+import { RoleEnum } from '/@/enums/roleEnum';
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
     title: '角色名称',
     title: '角色名称',
@@ -73,6 +74,18 @@ export const searchFormSchema: FormSchema[] = [
   },
   },
 
 
   {
   {
+    field: 'roleType',
+    label: '',
+    component: 'Input',
+    colProps: { span: 8 },
+    defaultValue: RoleEnum.TENANT_ADMIN,
+    ifShow: false,
+    componentProps: {
+      maxLength: 20,
+    },
+  },
+
+  {
     field: 'status',
     field: 'status',
     label: '状态',
     label: '状态',
     component: 'Select',
     component: 'Select',