Merge branch 'ft_local_dev' into 'main'

fix：修改Teambition上的问题

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

@@ -21,7 +21,7 @@ export type OtherParams = {
 };
 };
 
 
 enum Api {
 enum Api {
-  userPage = '/user/page',
+  userPage = '/user/tenant/page',
   tenantPage = '/admin/tenant/page',
   tenantPage = '/admin/tenant/page',
   saveTenantAdmin = '/user/save_tenant_admin',
   saveTenantAdmin = '/user/save_tenant_admin',
   updateOrCreateTenant = '/admin/tenant/updateOrCreateTenant',
   updateOrCreateTenant = '/admin/tenant/updateOrCreateTenant',
@@ -92,9 +92,17 @@ export function getTenantPage(params: TenantPageRequestParams) {
   return getPageData<TenantDTO>(params, Api.tenantPage);
   return getPageData<TenantDTO>(params, Api.tenantPage);
 }
 }
 
 
-export function getTenantAdminPage(params: TenantAdminPageRequestParams) {
-  return getPageData<UserDTO>(params, Api.userPage);
-}
+// export function getTenantAdminPage(params: TenantAdminPageRequestParams) {
+//   return getPageData<UserDTO>(params, Api.userPage);
+// }
+
+//分页
+export const getTenantAdminPage = (params: TenantAdminPageRequestParams) => {
+  return defHttp.get<TenantAdminPageRequestParams>({
+    url: Api.userPage,
+    params,
+  });
+};
 
 
 export async function saveTenantAdmin(params: UserDTO) {
 export async function saveTenantAdmin(params: UserDTO) {
   await defHttp.post({
   await defHttp.post({

@@ -40,9 +40,9 @@ export interface TenantPageRequestParams extends BaseQueryParams {
 
 
 export interface TenantAdminPageRequestParams extends BaseQueryParams {
 export interface TenantAdminPageRequestParams extends BaseQueryParams {
   realName?: string;
   realName?: string;
-  tenantCode: string;
+  // tenantCode: string;
   tenantId?: string;
   tenantId?: string;
-  roleType?: string;
+  // roleType?: string;
 }
 }
 
 
 export interface tenantProfileDTO {
 export interface tenantProfileDTO {

@@ -29,18 +29,21 @@
               icon: 'ant-design:font-size-outlined',
               icon: 'ant-design:font-size-outlined',
               auth: 'api:yt:js:test',
               auth: 'api:yt:js:test',
               onClick: handleBindTest.bind(null, record),
               onClick: handleBindTest.bind(null, record),
+              ifShow: record.status == 0,
             },
             },
             {
             {
               label: '编辑',
               label: '编辑',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               auth: 'api:yt:js:update',
               auth: 'api:yt:js:update',
               onClick: handleCreateOrEdit.bind(null, record),
               onClick: handleCreateOrEdit.bind(null, record),
+              ifShow: record.status == 0,
             },
             },
             {
             {
               label: '删除',
               label: '删除',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               auth: 'api:yt:js:delete',
               auth: 'api:yt:js:delete',
               color: 'error',
               color: 'error',
+              ifShow: record.status == 0,
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -50,16 +53,16 @@
         />
         />
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Authority value="api:yt:js:update:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
       </template>
       </template>
-      <!-- <Authority value="api:yt:js:update:status">
-      </Authority> -->
     </BasicTable>
     </BasicTable>
     <ConverScriptModal @register="registerModal" @success="handleSuccess" />
     <ConverScriptModal @register="registerModal" @success="handleSuccess" />
   </div>
   </div>

@@ -20,27 +20,64 @@
             toolbar
             toolbar
           />
           />
         </template>
         </template>
+        <template #roleSlot="{ model, field }">
+          <a-select
+            mode="multiple"
+            allowClear
+            placeholder="请选择角色"
+            v-model:value="model[field]"
+            :options="roleOptions.map((item) => ({ value: item.value, label: item.label }))"
+          >
+            <template #dropdownRender="{ menuNode: menu }">
+              <v-nodes :vnodes="menu" />
+              <a-divider style="margin: 4px 0" />
+              <div @click="handleOpenRole" style="padding: 4px 0; cursor: pointer">
+                <plus-outlined />
+                新增角色
+              </div>
+            </template>
+          </a-select>
+        </template>
       </BasicForm>
       </BasicForm>
     </div>
     </div>
   </BasicModal>
   </BasicModal>
+  <RoleDrawer @register="registerRoleDrawer" @success="handleSuccess" />
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, reactive } from 'vue';
+  import { defineComponent, ref, computed, unref, reactive, onMounted } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { accountFormSchema } from './account.data';
   import { accountFormSchema } from './account.data';
-  import { findCurrentUserRelation, SaveOrUpdateUserInfo } from '/@/api/system/system';
+  import {
+    findCurrentUserRelation,
+    SaveOrUpdateUserInfo,
+    filterRoleList,
+  } from '/@/api/system/system';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { BasicTree, TreeItem } from '/@/components/Tree';
   import { findCurrentUserGroups } from '/@/api/system/group';
   import { findCurrentUserGroups } from '/@/api/system/group';
   import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
   import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { copyTransTreeFun } from '/@/utils/fnUtils';
   import { copyTransTreeFun } from '/@/utils/fnUtils';
+  import { TOption } from '/@/views/rule/linkedge/config/config.data';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import RoleDrawer from '../role/RoleDrawer.vue';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'AccountModal',
     name: 'AccountModal',
-    components: { BasicModal, BasicForm, BasicTree },
+    components: {
+      BasicModal,
+      BasicForm,
+      BasicTree,
+      PlusOutlined,
+      RoleDrawer,
+      VNodes: (_, { attrs }) => {
+        return attrs.vnodes;
+      },
+    },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup(_, { emit }) {
     setup(_, { emit }) {
+      const roleOptions = ref<TOption[]>([]);
       const isUpdate = ref(true);
       const isUpdate = ref(true);
       const rowId = ref('');
       const rowId = ref('');
       const organizationTreeData = ref<TreeItem[]>([]);
       const organizationTreeData = ref<TreeItem[]>([]);
@@ -52,7 +89,29 @@
       const singleEditPostPhoneNumber = reactive({
       const singleEditPostPhoneNumber = reactive({
         phoneNumber: '',
         phoneNumber: '',
       });
       });
+      const getRoleList = async () => {
+        const res = await filterRoleList();
+        console.log(res);
+        roleOptions.value = res.map((m) => {
+          return {
+            label: m.name,
+            value: m.id,
+          };
+        });
+      };
+      onMounted(async () => {
+        await getRoleList();
+      });
+      const [registerRoleDrawer, { openDrawer }] = useDrawer();
 
 
+      const handleOpenRole = () => {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      };
+      const handleSuccess = async () => {
+        await getRoleList();
+      };
       const [
       const [
         registerForm,
         registerForm,
         { setFieldsValue, updateSchema, resetFields, validate, getFieldsValue },
         { setFieldsValue, updateSchema, resetFields, validate, getFieldsValue },
@@ -163,6 +222,10 @@
         checkGroup,
         checkGroup,
         basicTreeRef,
         basicTreeRef,
         treeExpandData,
         treeExpandData,
+        roleOptions,
+        registerRoleDrawer,
+        handleOpenRole,
+        handleSuccess,
       };
       };
     },
     },
   });
   });
@@ -171,9 +234,11 @@
   :deep(.vben-basic-tree) {
   :deep(.vben-basic-tree) {
     width: 100% !important;
     width: 100% !important;
   }
   }
+
   :deep(.is-unflod) {
   :deep(.is-unflod) {
     display: none !important;
     display: none !important;
   }
   }
+
   :deep(.is-flod) {
   :deep(.is-flod) {
     display: none !important;
     display: none !important;
   }
   }

-import { filterRoleList, isAccountExist, IsPhoneExist } from '/@/api/system/system';
+import { isAccountExist, IsPhoneExist } from '/@/api/system/system';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { emailRule, ChineseRegexp, EmailRegexp, phoneRegexp } from '/@/utils/rules';
 import { emailRule, ChineseRegexp, EmailRegexp, phoneRegexp } from '/@/utils/rules';
@@ -133,14 +133,9 @@ export const accountFormSchema: FormSchema[] = [
   {
   {
     label: '角色',
     label: '角色',
     field: 'roleIds',
     field: 'roleIds',
-    component: 'ApiSelect',
+    component: 'Select',
     colProps: { span: 12 },
     colProps: { span: 12 },
-    componentProps: {
-      mode: 'multiple',
-      api: filterRoleList,
-      labelField: 'name',
-      valueField: 'id',
-    },
+    slot: 'roleSlot',
     rules: [
     rules: [
       {
       {
         required: true,
         required: true,

@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
 
 
 export const searchFormSchema: FormSchema[] = [
 export const searchFormSchema: FormSchema[] = [
   {
   {
-    field: 'textSearch',
+    field: 'name',
     label: '租户配置名称',
     label: '租户配置名称',
     colProps: { span: 6 },
     colProps: { span: 6 },
     component: 'Input',
     component: 'Input',

@@ -46,7 +46,7 @@
               label: '删除',
               label: '删除',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               tooltip: '删除',
               tooltip: '删除',
-              auth: 'api:yt:user:saveTenantAdmin:delete',
+              auth: 'api:yt:admin:user:deleteTenantAdmin:delete',
               color: 'error',
               color: 'error',
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
@@ -192,7 +192,7 @@
         showIndexColumn: false,
         showIndexColumn: false,
         searchInfo: {
         searchInfo: {
           tenantId,
           tenantId,
-          roleType: RoleEnum.TENANT_ADMIN,
+          // roleType: RoleEnum.TENANT_ADMIN,
         },
         },
         actionColumn: {
         actionColumn: {
           width: 100,
           width: 100,

@@ -17,7 +17,6 @@
   import { saveTenantAdmin } from '/@/api/tenant/tenantApi';
   import { saveTenantAdmin } from '/@/api/tenant/tenantApi';
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
-  // import { isAccountExist } from '/@/api/system/system';
   import { chineseAndEnlishRule } from '/@/utils/rules';
   import { chineseAndEnlishRule } from '/@/utils/rules';
 
 
   export default defineComponent({
   export default defineComponent({
@@ -57,13 +56,11 @@
                   return f.username == values.username;
                   return f.username == values.username;
                 }
                 }
               });
               });
-              console.log(findUserName);
               return [
               return [
                 {
                 {
                   required: true,
                   required: true,
                   validator(_, value) {
                   validator(_, value) {
                     return new Promise((resolve, reject) => {
                     return new Promise((resolve, reject) => {
-                      console.log(value);
                       if (value == '' || value === undefined) {
                       if (value == '' || value === undefined) {
                         reject('请输入账号');
                         reject('请输入账号');
                       } else if (ChineseRegexp.test(value)) {
                       } else if (ChineseRegexp.test(value)) {
@@ -133,7 +130,6 @@
           await resetFields();
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
           isUpdate.value = !!data?.isUpdate;
           tenantId.value = data?.tenantId;
           tenantId.value = data?.tenantId;
-          console.log(data.judgeExistUserName);
           isJudgeUserNameExist.value = data.judgeExistUserName;
           isJudgeUserNameExist.value = data.judgeExistUserName;
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await updateSchema({ field: 'username', componentProps: { disabled: true } });

@@ -120,8 +120,8 @@
 
 
       //提交按钮
       //提交按钮
       async function handleSubmit() {
       async function handleSubmit() {
-        setDrawerProps({ confirmLoading: true });
         try {
         try {
+          setDrawerProps({ confirmLoading: true });
           const values = await validate();
           const values = await validate();
           const req = {
           const req = {
             id: values.id,
             id: values.id,
@@ -153,16 +153,9 @@
               const { createMessage } = useMessage();
               const { createMessage } = useMessage();
               createMessage.error(`${e.message}`);
               createMessage.error(`${e.message}`);
             })
             })
-            .finally(() => {
-              setTimeout(() => {
-                setDrawerProps({ confirmLoading: false });
-              }, 300);
-            });
+            .finally(() => {});
         } catch (e) {
         } catch (e) {
         } finally {
         } finally {
-          setTimeout(() => {
-            setDrawerProps({ confirmLoading: false });
-          }, 300);
         }
         }
       }
       }
       return {
       return {