修复页面内emits未添加register项导致的警告、minHeight值类型不正确的警告

vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue

@@ -5,7 +5,7 @@
     @register="register"
     :canFullscreen="false"
     @ok="submit"
-    minHeight="100"
+    :minHeight="100"
   >
     <BasicForm @register="registerForm" />
   </BasicModal>
@@ -78,7 +78,7 @@
           await _userServiceProxy.changePassword(request as ChangePasswordInput);
           changeOkLoading(false);
           closeModal();
-         await resetFields();
+          await resetFields();
         } catch (error) {
           changeOkLoading(false);
         }

vben271/src/views/admin/roles/CreateAbpRole.vue

@@ -11,58 +11,58 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+  import { defineComponent } 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 { createFormSchema, createRoleAsync } from "/@/views/admin/roles/AbpRole";
+  import { createFormSchema, createRoleAsync } from '/@/views/admin/roles/AbpRole';
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "CreateAbpRole",
+    name: 'CreateAbpRole',
-  components: {
+    components: {
-    BasicModal,
+      BasicModal,
-    BasicForm
+      BasicForm,
-  },
+    },
-  emits: ["reload"],
+    emits: ['reload', 'register'],
-  setup(_, { emit }) {
+    setup(_, { emit }) {
-    // 加载父组件方法
+      // 加载父组件方法
-    // defineEmit(['reload']);
+      // defineEmit(['reload']);
-    // const ctx = useContext();
+      // const ctx = useContext();
 
-    const { t } = useI18n();
+      const { t } = useI18n();
-    const [registerUserForm, { getFieldsValue, validate, resetFields }] = useForm({
+      const [registerUserForm, { getFieldsValue, validate, resetFields }] = useForm({
-      labelWidth: 120,
+        labelWidth: 120,
-      schemas: createFormSchema,
+        schemas: createFormSchema,
-      showActionButtonGroup: false
+        showActionButtonGroup: false,
-    });
+      });
 
-    const [registerModal, { changeOkLoading, closeModal }] = useModalInner();
+      const [registerModal, { changeOkLoading, closeModal }] = useModalInner();
 
-    // 保存角色
+      // 保存角色
-    const submit = async () => {
+      const submit = async () => {
-      try {
+        try {
-        const request = getFieldsValue();
+          const request = getFieldsValue();
-        await createRoleAsync({ request, changeOkLoading, validate, closeModal });
+          await createRoleAsync({ request, changeOkLoading, validate, closeModal });
-        await resetFields();
+          await resetFields();
-        emit("reload");
+          emit('reload');
-      } catch (error) {
+        } catch (error) {
-        changeOkLoading(false);
+          changeOkLoading(false);
-      }
+        }
-    };
+      };
 
-    const cancel = () => {
+      const cancel = () => {
-      resetFields();
+        resetFields();
-      closeModal();
+        closeModal();
-    };
+      };
-    return {
+      return {
-      t,
+        t,
-      registerModal,
+        registerModal,
-      registerUserForm,
+        registerUserForm,
-      submit,
+        submit,
-      cancel
+        cancel,
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 
 <style lang="less" scoped></style>

vben271/src/views/admin/roles/EditAbpRole.vue

@@ -10,70 +10,70 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+  import { defineComponent } 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 { editFormSchema, updateRoleAsync } from "/@/views/admin/roles/AbpRole";
+  import { editFormSchema, updateRoleAsync } from '/@/views/admin/roles/AbpRole';
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
-import {
+  import {
-  IdentityRoleDto,
+    IdentityRoleDto,
-  UpdateRoleInput,
+    UpdateRoleInput,
-  IdentityRoleUpdateDto
+    IdentityRoleUpdateDto,
-} from "/@/services/ServiceProxies";
+  } from '/@/services/ServiceProxies';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "EditAbpRole",
+    name: 'EditAbpRole',
-  components: {
+    components: {
-    BasicModal,
+      BasicModal,
-    BasicForm
+      BasicForm,
-  },
+    },
-  emits: ["reload"],
+    emits: ['reload', 'register'],
-  setup(_, { emit }) {
+    setup(_, { emit }) {
-    // 加载父组件方法
+      // 加载父组件方法
-    // defineEmit(['reload']);
+      // defineEmit(['reload']);
-    // const ctx = useContext();
+      // const ctx = useContext();
 
-    const { t } = useI18n();
+      const { t } = useI18n();
-    const [registerUserForm, { getFieldsValue, validate, setFieldsValue }] = useForm({
+      const [registerUserForm, { getFieldsValue, validate, setFieldsValue }] = useForm({
-      labelWidth: 120,
+        labelWidth: 120,
-      schemas: editFormSchema,
+        schemas: editFormSchema,
-      showActionButtonGroup: false
+        showActionButtonGroup: false,
-    });
+      });
-    let currentRoleInfo = new IdentityRoleDto();
+      let currentRoleInfo = new IdentityRoleDto();
-    const [registerModal, { changeOkLoading, closeModal }] = useModalInner((data) => {
+      const [registerModal, { changeOkLoading, closeModal }] = useModalInner((data) => {
-      currentRoleInfo = data.record;
+        currentRoleInfo = data.record;
-      setFieldsValue({
+        setFieldsValue({
-        name: data.record.name,
+          name: data.record.name,
-        isDefault: data.record.isDefault ? "1" : "0"
+          isDefault: data.record.isDefault ? '1' : '0',
+        });
       });
-    });
 
-    // 保存角色
+      // 保存角色
-    const submit = async () => {
+      const submit = async () => {
-      try {
+        try {
-        const request = getFieldsValue();
+          const request = getFieldsValue();
-        let role = new UpdateRoleInput();
+          let role = new UpdateRoleInput();
-        role.roleId = currentRoleInfo.id;
+          role.roleId = currentRoleInfo.id;
-        role.roleInfo = new IdentityRoleUpdateDto();
+          role.roleInfo = new IdentityRoleUpdateDto();
-        role.roleInfo.name = request.name;
+          role.roleInfo.name = request.name;
-        role.roleInfo.isDefault = request.isDefault == 1;
+          role.roleInfo.isDefault = request.isDefault == 1;
-        role.roleInfo.isPublic = currentRoleInfo.isPublic;
+          role.roleInfo.isPublic = currentRoleInfo.isPublic;
-        role.roleInfo.concurrencyStamp = currentRoleInfo.concurrencyStamp;
+          role.roleInfo.concurrencyStamp = currentRoleInfo.concurrencyStamp;
-        await updateRoleAsync({ request: role, changeOkLoading, validate, closeModal });
+          await updateRoleAsync({ request: role, changeOkLoading, validate, closeModal });
-        emit("reload");
+          emit('reload');
-      } catch (error) {
+        } catch (error) {
-        changeOkLoading(false);
+          changeOkLoading(false);
-      }
+        }
-    };
+      };
 
-    return {
+      return {
-      t,
+        t,
-      registerModal,
+        registerModal,
-      registerUserForm,
+        registerUserForm,
-      submit
+        submit,
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 
 <style lang="less" scoped></style>

vben271/src/views/admin/users/CreateAbpUser.vue

@@ -20,8 +20,12 @@
           <a-checkbox-group v-model:value="defaultRolesRef">
             <a-row justify="center">
               <a-col :span="24">
-                <a-checkbox style="width: 150px" v-for="(item, index) in itemRolesRef" :key="index"
+                <a-checkbox
-                            :value="item.name">{{ item.name }}
+                  style="width: 150px"
+                  v-for="(item, index) in itemRolesRef"
+                  :key="index"
+                  :value="item.name"
+                  >{{ item.name }}
                 </a-checkbox>
               </a-col>
             </a-row>
@@ -33,88 +37,88 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from "vue";
+  import { defineComponent, ref } from 'vue';
-import { BasicModal, useModalInner } from "/@/components/Modal";
+  import { BasicModal, useModalInner } from '/@/components/Modal';
-import { Tabs } from "ant-design-vue";
+  import { Tabs } from 'ant-design-vue';
-import { BasicForm, useForm } from "/@/components/Form/index";
+  import { BasicForm, useForm } from '/@/components/Form/index';
-import { createFormSchema, getAllRoleAsync, createUserAsync } from "/@/views/admin/users/AbpUser";
+  import { createFormSchema, getAllRoleAsync, createUserAsync } from '/@/views/admin/users/AbpUser';
-import { IdentityRoleDto, IdentityUserCreateDto } from "/@/services/ServiceProxies";
+  import { IdentityRoleDto, IdentityUserCreateDto } from '/@/services/ServiceProxies';
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "CreateAbpUser",
+    name: 'CreateAbpUser',
-  components: {
+    components: {
-    BasicModal,
+      BasicModal,
-    Tabs,
+      Tabs,
-    TabPane: Tabs.TabPane,
+      TabPane: Tabs.TabPane,
-    BasicForm
+      BasicForm,
-  },
+    },
-  emits: ["reload"],
+    emits: ['reload', 'register'],
-  setup(_, { emit }) {
+    setup(_, { emit }) {
-    const { t } = useI18n();
+      const { t } = useI18n();
-    const [registerModal, { changeOkLoading, closeModal }] = useModalInner();
+      const [registerModal, { changeOkLoading, closeModal }] = useModalInner();
-    const [registerUserForm, { getFieldsValue, validate, resetFields }] = useForm({
+      const [registerUserForm, { getFieldsValue, validate, resetFields }] = useForm({
-      labelWidth: 120,
+        labelWidth: 120,
-      schemas: createFormSchema,
+        schemas: createFormSchema,
-      showActionButtonGroup: false
+        showActionButtonGroup: false,
-    });
+      });
 
-    let itemRoles: IdentityRoleDto[] = [];
+      let itemRoles: IdentityRoleDto[] = [];
-    let defaultRoles: string[] = [];
+      let defaultRoles: string[] = [];
-    //选中数组
+      //选中数组
-    let defaultRolesRef = ref(defaultRoles);
+      let defaultRolesRef = ref(defaultRoles);
-    let itemRolesRef = ref(itemRoles);
+      let itemRolesRef = ref(itemRoles);
-    const visibleChange = async (visible: boolean) => {
+      const visibleChange = async (visible: boolean) => {
-      if (visible) {
+        if (visible) {
-        itemRolesRef.value.length = 0;
+          itemRolesRef.value.length = 0;
-        defaultRolesRef.value.splice(0, defaultRolesRef.value.length);
+          defaultRolesRef.value.splice(0, defaultRolesRef.value.length);
-        let roles = await getAllRoleAsync();
+          let roles = await getAllRoleAsync();
-        roles.items?.forEach((e) => {
+          roles.items?.forEach((e) => {
-          itemRolesRef.value.push(e);
+            itemRolesRef.value.push(e);
-        });
+          });
-      } else {
+        } else {
-        await resetFields();
+          await resetFields();
-        itemRolesRef.value.length = 0;
+          itemRolesRef.value.length = 0;
-        defaultRolesRef.value.length = 0;
+          defaultRolesRef.value.length = 0;
-      }
+        }
-    };
+      };
-    // 保存用户
+      // 保存用户
-    const submit = async () => {
+      const submit = async () => {
-      try {
+        try {
-        let request = getFieldsValue() as IdentityUserCreateDto;
+          let request = getFieldsValue() as IdentityUserCreateDto;
-        request.roleNames = defaultRolesRef.value;
+          request.roleNames = defaultRolesRef.value;
-        await createUserAsync({
+          await createUserAsync({
-          request,
+            request,
-          changeOkLoading,
+            changeOkLoading,
-          validate,
+            validate,
-          closeModal,
+            closeModal,
-          resetFields
+            resetFields,
-        });
+          });
-        defaultRolesRef.value.length = 0;
+          defaultRolesRef.value.length = 0;
-        emit("reload");
+          emit('reload');
-      } catch (error) {
+        } catch (error) {
-        changeOkLoading(false);
+          changeOkLoading(false);
-      }
+        }
-    };
+      };
-    const cancel = () => {
+      const cancel = () => {
-      resetFields();
+        resetFields();
-      closeModal();
+        closeModal();
-    };
+      };
-    return {
+      return {
-      t,
+        t,
-      cancel,
+        cancel,
-      registerModal,
+        registerModal,
-      registerUserForm,
+        registerUserForm,
-      submit,
+        submit,
-      visibleChange,
+        visibleChange,
-      defaultRolesRef,
+        defaultRolesRef,
-      itemRolesRef
+        itemRolesRef,
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 <style lang="less" scoped>
-.ant-checkbox-wrapper + .ant-checkbox-wrapper {
+  .ant-checkbox-wrapper + .ant-checkbox-wrapper {
-  margin-left: 0;
+    margin-left: 0;
-}
+  }
 </style>

vben271/src/views/admin/users/EditAbpUser.vue

@@ -46,7 +46,7 @@
     getAllRoleAsync,
     updateUserAsync,
     getRolesByUserIdAsync,
-  } from "/@/views/admin/users/AbpUser";
+  } from '/@/views/admin/users/AbpUser';
   import {
     IdentityRoleDto,
     IdentityUserDto,
@@ -63,7 +63,7 @@
       Tabs,
       TabPane: Tabs.TabPane,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const [registerUserForm, { getFieldsValue, validate, setFieldsValue, resetFields }] = useForm(
         {

vben271/src/views/identityServers/apiResources/CreateApiResource.vue

@@ -14,7 +14,10 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { createFormSchema, createApiResourceAsync } from "/@/views/identityServers/apiResources/ApiResources";
+  import {
+    createFormSchema,
+    createApiResourceAsync,
+  } from '/@/views/identityServers/apiResources/ApiResources';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +26,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [registerApiResourceForm, { getFieldsValue, validate, resetFields }] = useForm({

vben271/src/views/identityServers/apiResources/EditApiResources.vue

@@ -22,9 +22,8 @@
                   v-for="(item, index) in apiScopes"
                   :key="index"
                   :value="item.value"
-                >{{ item.label }}
+                  >{{ item.label }}
-                </a-checkbox
+                </a-checkbox>
-                >
               </a-col>
             </a-row>
           </a-checkbox-group>
@@ -35,81 +34,81 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs } from "vue";
+  import { defineComponent, reactive, toRefs } 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 { Tabs } from "ant-design-vue";
+  import { Tabs } from 'ant-design-vue';
-import {
+  import {
-  editFormSchema,
+    editFormSchema,
-  getAllApiScopeAsync,
+    getAllApiScopeAsync,
-  updateApiResourceAsync
+    updateApiResourceAsync,
-} from "/@/views/identityServers/apiResources/ApiResources";
+  } from '/@/views/identityServers/apiResources/ApiResources';
-import { StringStringFromSelector } from "/@/services/ServiceProxies";
+  import { StringStringFromSelector } from '/@/services/ServiceProxies';
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "EditApiResources",
+    name: 'EditApiResources',
-  components: {
+    components: {
-    BasicModal,
+      BasicModal,
-    BasicForm,
+      BasicForm,
-    Tabs,
+      Tabs,
-    TabPane: Tabs.TabPane
+      TabPane: Tabs.TabPane,
-  },
+    },
-  emits: ["reload"],
+    emits: ['reload', 'register'],
-  setup(_, { emit }) {
+    setup(_, { emit }) {
-    const { t } = useI18n();
+      const { t } = useI18n();
-    const [
+      const [
-      registerBasicInfoForm,
+        registerBasicInfoForm,
-      {
+        {
-        getFieldsValue: getFieldsBasicInfoValue,
+          getFieldsValue: getFieldsBasicInfoValue,
-        validate: basicInfoValidate,
+          validate: basicInfoValidate,
-        setFieldsValue: setBasicInfoFieldsValue
+          setFieldsValue: setBasicInfoFieldsValue,
-      }
+        },
-    ] = useForm({
+      ] = useForm({
-      labelWidth: 120,
+        labelWidth: 120,
-      schemas: editFormSchema,
+        schemas: editFormSchema,
-      showActionButtonGroup: false
+        showActionButtonGroup: false,
-    });
+      });
 
-    let apiScopes: StringStringFromSelector[] = [];
+      let apiScopes: StringStringFromSelector[] = [];
-    const state = reactive({
+      const state = reactive({
-      defaultApiScope: [],
+        defaultApiScope: [],
-      apiScopes
+        apiScopes,
-    });
-    const [registerModal, { changeOkLoading, closeModal }] = useModalInner(async (data) => {
-      await setBasicInfoFieldsValue({
-        name: data.record.name,
-        displayName: data.record.displayName,
-        secret: data.record.secrets.length > 0 ? data.record.secrets[0].value : "",
-        description: data.record.description,
-        enabled: data.record.enabled,
-        showInDiscoveryDocument: data.record.showInDiscoveryDocument
       });
+      const [registerModal, { changeOkLoading, closeModal }] = useModalInner(async (data) => {
+        await setBasicInfoFieldsValue({
+          name: data.record.name,
+          displayName: data.record.displayName,
+          secret: data.record.secrets.length > 0 ? data.record.secrets[0].value : '',
+          description: data.record.description,
+          enabled: data.record.enabled,
+          showInDiscoveryDocument: data.record.showInDiscoveryDocument,
+        });
 
-      state.apiScopes = await getAllApiScopeAsync();
+        state.apiScopes = await getAllApiScopeAsync();
-      state.defaultApiScope = data.record.scopes.map((e) => e.scope);
+        state.defaultApiScope = data.record.scopes.map((e) => e.scope);
-    });
+      });
 
-    const submit = async () => {
+      const submit = async () => {
-      await basicInfoValidate();
+        await basicInfoValidate();
-      const basicInfo = getFieldsBasicInfoValue();
+        const basicInfo = getFieldsBasicInfoValue();
-      const requestScope = { apiScopes: state.defaultApiScope };
+        const requestScope = { apiScopes: state.defaultApiScope };
-      const request = Object.assign(basicInfo, requestScope);
+        const request = Object.assign(basicInfo, requestScope);
-      await updateApiResourceAsync({ request, changeOkLoading, closeModal });
+        await updateApiResourceAsync({ request, changeOkLoading, closeModal });
-      emit("reload");
+        emit('reload');
-    };
+      };
-    return {
+      return {
-      registerModal,
+        registerModal,
-      registerBasicInfoForm,
+        registerBasicInfoForm,
-      submit,
+        submit,
-      t,
+        t,
-      ...toRefs(state)
+        ...toRefs(state),
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 <style lang="less" scoped>
-.ant-checkbox-wrapper + .ant-checkbox-wrapper {
+  .ant-checkbox-wrapper + .ant-checkbox-wrapper {
-  margin-left: 0;
+    margin-left: 0;
-}
+  }
 </style>

vben271/src/views/identityServers/apiScopes/CreateApiScope.vue

@@ -14,7 +14,10 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { createFormSchema, createApiScopeAsync } from "/@/views/identityServers/apiScopes/ApiScopes";
+  import {
+    createFormSchema,
+    createApiScopeAsync,
+  } from '/@/views/identityServers/apiScopes/ApiScopes';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +26,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [registerApiScopeForm, { getFieldsValue, validate, resetFields }] = useForm({

vben271/src/views/identityServers/apiScopes/EditApiScope.vue

@@ -14,7 +14,7 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { editFormSchema, editApiScopeAsync } from "/@/views/identityServers/apiScopes/ApiScopes";
+  import { editFormSchema, editApiScopeAsync } from '/@/views/identityServers/apiScopes/ApiScopes';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +23,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [registerApiScopeForm, { getFieldsValue, validate, resetFields, setFieldsValue }] =

vben271/src/views/identityServers/clients/ClientUri.vue

@@ -69,12 +69,12 @@
     removeLogoutRedirectUriAsync,
     addCorsAsync,
     removeCorsAsync,
-  } from "/@/views/identityServers/clients/Clients";
+  } from '/@/views/identityServers/clients/Clients';
   import { PagingClientListOutput } from '/@/services/ServiceProxies';
   export default defineComponent({
     name: 'ClientUri',
     components: { BasicDrawer, Tabs, TabPane: Tabs.TabPane },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       let currentClient: PagingClientListOutput = new PagingClientListOutput();

vben271/src/views/identityServers/clients/CreateClient.vue

@@ -14,7 +14,7 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { createFormSchema, createClientAsync } from "/@/views/identityServers/clients/Clients";
+  import { createFormSchema, createClientAsync } from '/@/views/identityServers/clients/Clients';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +23,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [registerClientForm, { getFieldsValue, validate, resetFields }] = useForm({

vben271/src/views/identityServers/clients/EditClientBasic.vue

@@ -39,7 +39,7 @@
     editBasicTokenSchema,
     editBasicSecretSchema,
     updateClientAsync,
-  } from "/@/views/identityServers/clients/Clients";
+  } from '/@/views/identityServers/clients/Clients';
 
   export default defineComponent({
     name: 'EditAbpUser',
@@ -49,7 +49,7 @@
       Tabs,
       TabPane: Tabs.TabPane,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [

vben271/src/views/identityServers/clients/EditClientIdentityResource.vue

@@ -38,13 +38,13 @@
 <script lang="ts">
   import { defineComponent, reactive, toRefs } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { getAllScopeAsync, updateScopesAsync } from "/@/views/identityServers/clients/Clients";
+  import { getAllScopeAsync, updateScopesAsync } from '/@/views/identityServers/clients/Clients';
   import { StringStringFromSelector } from '/@/services/ServiceProxies';
   import { useI18n } from '/@/hooks/web/useI18n';
   export default defineComponent({
     name: 'EditClientIdentityResource',
     components: { BasicDrawer },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       let scopes: StringStringFromSelector[] = [];

vben271/src/views/identityServers/identityResources/CreateIdentityResource.vue

@@ -14,7 +14,10 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { createFormSchema, createIdentityResourcesAsync } from "/@/views/identityServers/identityResources/IdentityResources";
+  import {
+    createFormSchema,
+    createIdentityResourcesAsync,
+  } from '/@/views/identityServers/identityResources/IdentityResources';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +26,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       // 加载父组件方法
       // defineEmit(['reload']);

vben271/src/views/identityServers/identityResources/EditIdentityResources.vue

@@ -14,7 +14,10 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { editFormSchema, editIdentityResourceAsync } from "/@/views/identityServers/identityResources/IdentityResources";
+  import {
+    editFormSchema,
+    editIdentityResourceAsync,
+  } from '/@/views/identityServers/identityResources/IdentityResources';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +26,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [

vben271/src/views/tenants/CreateTenant.vue

@@ -14,7 +14,7 @@
   import { defineComponent } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { createFormSchema, createTenantAsync } from "/@/views/tenants/Tenant";
+  import { createFormSchema, createTenantAsync } from '/@/views/tenants/Tenant';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   export default defineComponent({
@@ -23,7 +23,7 @@
       BasicModal,
       BasicForm,
     },
-    emits: ['reload'],
+    emits: ['reload', 'register'],
     setup(_, { emit }) {
       const { t } = useI18n();
       const [registerTenantForm, { getFieldsValue, validate, resetFields }] = useForm({
@@ -38,7 +38,7 @@
         try {
           const request = getFieldsValue();
           await createTenantAsync({ request, changeOkLoading, validate, closeModal });
-          await  resetFields();
+          await resetFields();
           emit('reload');
         } catch (error) {
           changeOkLoading(false);

vben271/src/views/tenants/EditConnectionString.vue

@@ -5,72 +5,72 @@
     @ok="submit"
     @cancel="cancel"
     @register="registerModal"
-    minHeight="100"
+    :minHeight="100"
   >
     <BasicForm @register="registerApiScopeForm" />
   </BasicModal>
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+  import { defineComponent } 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 {
+  import {
-  updateConnectionStringFormSchema,
+    updateConnectionStringFormSchema,
-  updateConnectionStringAsync,
+    updateConnectionStringAsync,
-  getConnectionStringAsync
+    getConnectionStringAsync,
-} from "/@/views/tenants/Tenant";
+  } from '/@/views/tenants/Tenant';
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "EditConnectionString",
+    name: 'EditConnectionString',
-  components: {
+    components: {
-    BasicModal,
+      BasicModal,
-    BasicForm
+      BasicForm,
-  },
+    },
-  emits: ["reload"],
+    emits: ['reload', 'register'],
-  setup(_, { emit }) {
+    setup(_, { emit }) {
-    const { t } = useI18n();
+      const { t } = useI18n();
-    const [registerApiScopeForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
+      const [registerApiScopeForm, { getFieldsValue, resetFields, setFieldsValue }] = useForm({
-      labelWidth: 120,
+        labelWidth: 120,
-      schemas: updateConnectionStringFormSchema,
+        schemas: updateConnectionStringFormSchema,
-      showActionButtonGroup: false
+        showActionButtonGroup: false,
-    });
+      });
 
-    const [registerModal, { changeOkLoading, closeModal }] = useModalInner(async (data) => {
+      const [registerModal, { changeOkLoading, closeModal }] = useModalInner(async (data) => {
-      const connectionString = await getConnectionStringAsync({ id: data.record.id });
+        const connectionString = await getConnectionStringAsync({ id: data.record.id });
-      await setFieldsValue({
+        await setFieldsValue({
-        id: data.record.id,
+          id: data.record.id,
-        connectionString: connectionString
+          connectionString: connectionString,
+        });
       });
-    });
 
-    const submit = async () => {
+      const submit = async () => {
-      try {
+        try {
-        const request = getFieldsValue();
+          const request = getFieldsValue();
-        changeOkLoading(true);
+          changeOkLoading(true);
-        await updateConnectionStringAsync({ request });
+          await updateConnectionStringAsync({ request });
-        await resetFields();
+          await resetFields();
-        emit("reload");
+          emit('reload');
-      } finally {
+        } finally {
-        changeOkLoading(false);
+          changeOkLoading(false);
-        closeModal();
+          closeModal();
-      }
+        }
-    };
+      };
 
-    const cancel = () => {
+      const cancel = () => {
-      resetFields();
+        resetFields();
-      closeModal();
+        closeModal();
-    };
+      };
-    return {
+      return {
-      t,
+        t,
-      registerModal,
+        registerModal,
-      registerApiScopeForm,
+        registerApiScopeForm,
-      submit,
+        submit,
-      cancel
+        cancel,
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 
 <style lang="less" scoped></style>

vben271/src/views/tenants/EditTenant.vue

@@ -5,66 +5,66 @@
     @ok="submit"
     @cancel="cancel"
     @register="registerModal"
-    minHeight="100"
+    :minHeight="100"
   >
     <BasicForm @register="registerApiScopeForm" />
   </BasicModal>
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+  import { defineComponent } 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 { editFormSchema, updateTenantAsync } from "/@/views/tenants/Tenant";
+  import { editFormSchema, updateTenantAsync } from '/@/views/tenants/Tenant';
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "EditTenant",
+    name: 'EditTenant',
-  components: {
+    components: {
-    BasicModal,
+      BasicModal,
-    BasicForm
+      BasicForm,
-  },
+    },
-  emits: ["reload"],
+    emits: ['reload', 'register'],
-  setup(_, { emit }) {
+    setup(_, { emit }) {
-    const { t } = useI18n();
+      const { t } = useI18n();
-    const [registerApiScopeForm, { getFieldsValue, validate, resetFields, setFieldsValue }] =
+      const [registerApiScopeForm, { getFieldsValue, validate, resetFields, setFieldsValue }] =
-      useForm({
+        useForm({
-        labelWidth: 120,
+          labelWidth: 120,
-        schemas: editFormSchema,
+          schemas: editFormSchema,
-        showActionButtonGroup: false
+          showActionButtonGroup: false,
-      });
+        });
 
-    const [registerModal, { changeOkLoading, closeModal }] = useModalInner((data) => {
+      const [registerModal, { changeOkLoading, closeModal }] = useModalInner((data) => {
-      setFieldsValue({
+        setFieldsValue({
-        name: data.record.name,
+          name: data.record.name,
-        id: data.record.id
+          id: data.record.id,
+        });
       });
-    });
 
-    const submit = async () => {
+      const submit = async () => {
-      try {
+        try {
-        const request = getFieldsValue();
+          const request = getFieldsValue();
-        await updateTenantAsync({ request, changeOkLoading, validate, closeModal });
+          await updateTenantAsync({ request, changeOkLoading, validate, closeModal });
-        await resetFields();
+          await resetFields();
-        emit("reload");
+          emit('reload');
-      } finally {
+        } finally {
-        changeOkLoading(false);
+          changeOkLoading(false);
-      }
+        }
-    };
+      };
 
-    const cancel = () => {
+      const cancel = () => {
-      resetFields();
+        resetFields();
-      closeModal();
+        closeModal();
-    };
+      };
-    return {
+      return {
-      t,
+        t,
-      registerModal,
+        registerModal,
-      registerApiScopeForm,
+        registerApiScopeForm,
-      submit,
+        submit,
-      cancel
+        cancel,
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 
 <style lang="less" scoped></style>