Browse Source

👣 制定开发规则

master
wangxiang 3 years ago
parent
commit
548fe6f0a0
  1. 4
      kicc-ui/src/api/platform/core/controller/user.ts
  2. 4
      kicc-ui/src/api/platform/core/entity/user.ts
  3. 2
      kicc-ui/src/api/platform/system/controller/user.ts
  4. 2
      kicc-ui/src/api/platform/system/entity/user.ts
  5. 2
      kicc-ui/src/components/Application/src/AppDarkModeToggle.vue
  6. 2
      kicc-ui/src/components/Application/src/AppLogo.vue
  7. 6
      kicc-ui/src/views/system/dict/DictDataModal.vue
  8. 8
      kicc-ui/src/views/system/dict/DictDataTable.vue
  9. 4
      kicc-ui/src/views/system/dict/DictModal.vue

4
kicc-ui/src/api/platform/core/controller/user.ts

@ -5,9 +5,9 @@
*/ */
import type { Captcha, User, LoginParams, TokenEnhancer } from '../entity/user'; import type { Captcha, User, LoginParams, TokenEnhancer } from '../entity/user';
import type { RequestOptions } from "/#/axios"; import type { RequestOptions } from '/#/axios';
import { encryptionLogin } from '/@/utils/cipher'; import { encryptionLogin } from '/@/utils/cipher';
import { useGlobSetting } from "/@/hooks/setting"; import { useGlobSetting } from '/@/hooks/setting';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import qs from 'qs'; import qs from 'qs';

4
kicc-ui/src/api/platform/core/entity/user.ts

@ -5,8 +5,8 @@
* @author: entfrm开发团队- * @author: entfrm开发团队-
* @create: 2022/4/8 * @create: 2022/4/8
*/ */
import type { CommonEntity } from "/@/api/common/data/entity"; import type { CommonEntity } from '/@/api/common/data/entity';
import type { KiccUser } from "/@/api/common/base/entity"; import type { KiccUser } from '/@/api/common/base/entity';
/** 登录参数对象 */ /** 登录参数对象 */
export interface LoginParams { export interface LoginParams {

2
kicc-ui/src/api/platform/system/controller/user.ts

@ -4,7 +4,7 @@
* author entfrm开发团队- * author entfrm开发团队-
*/ */
import type { UserParams, UserResult } from '/@/api/platform/system/entity/user'; import type { UserParams, UserResult } from '/@/api/platform/system/entity/user';
import type { User } from "/@/api/platform/core/entity/user"; import type { User } from '/@/api/platform/core/entity/user';
import type { ResultVo } from '/@/api/common/base/entity'; import type { ResultVo } from '/@/api/common/base/entity';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';

2
kicc-ui/src/api/platform/system/entity/user.ts

@ -7,7 +7,7 @@
*/ */
import type { R } from '/#/axios'; import type { R } from '/#/axios';
import type { Page } from '/@/api/common/data/entity'; import type { Page } from '/@/api/common/data/entity';
import type { User } from "/@/api/platform/core/entity/user"; import type { User } from '/@/api/platform/core/entity/user';
/** 用户查询参数 */ /** 用户查询参数 */
export type UserParams = Page & User; export type UserParams = Page & User;

2
kicc-ui/src/components/Application/src/AppDarkModeToggle.vue

@ -1,6 +1,6 @@
<template> <template>
<div v-if="getShowDarkModeToggle" :class="getClass" @click="toggleDarkMode"> <div v-if="getShowDarkModeToggle" :class="getClass" @click="toggleDarkMode">
<div :class="`${prefixCls}-inner`"> </div> <div :class="`${prefixCls}-inner`"/>
<SvgIcon size="14" name="sun" /> <SvgIcon size="14" name="sun" />
<SvgIcon size="14" name="moon" /> <SvgIcon size="14" name="moon" />
</div> </div>

2
kicc-ui/src/components/Application/src/AppLogo.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="anticon" :class="getAppLogoClass" @click="goHome"> <div class="anticon" :class="getAppLogoClass" @click="goHome">
<img src="../../../assets/images/logo.svg" /> <img src="../../../assets/images/logo.svg">
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle"> <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
{{ title }} {{ title }}
</div> </div>

6
kicc-ui/src/views/system/dict/DictDataModal.vue

@ -7,7 +7,7 @@
width="500px" width="500px"
@ok="handleSubmit" @ok="handleSubmit"
> >
<BasicForm @register="registerForm"/> <BasicForm @register="registerForm" />
</BasicModal> </BasicModal>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -15,7 +15,7 @@ import {ref, computed, unref} from 'vue';
import {BasicForm, useForm} from '/@/components/Form/index'; import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from './dictdata.data'; import {formSchema} from './dictdata.data';
//import {set} from '/@/api/platform/system/controller/dictdata'; //import {set} from '/@/api/platform/system/controller/dictdata';
import {BasicModal, useModalInner} from "/@/components/Modal"; import {BasicModal, useModalInner} from '/@/components/Modal';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const isUpdate = ref(true); const isUpdate = ref(true);
@ -43,7 +43,7 @@ async function handleSubmit() {
try { try {
const values = await validate(); const values = await validate();
setModalProps({confirmLoading: true}); setModalProps({confirmLoading: true});
await set(values); //await set(values);
closeModal(); closeModal();
emit('success'); emit('success');
} finally { } finally {

8
kicc-ui/src/views/system/dict/DictDataTable.vue

@ -1,5 +1,9 @@
<template> <template>
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex"> <PageWrapper dense
contentFullHeight
fixedHeight
contentClass="flex"
>
<BasicTable @register="registerTable"> <BasicTable @register="registerTable">
<template #toolbar> <template #toolbar>
<a-button type="primary" @click="handleCreate">新增字典</a-button> <a-button type="primary" @click="handleCreate">新增字典</a-button>
@ -94,7 +98,7 @@
} }
async function handleDelete(record: Recordable) { async function handleDelete(record: Recordable) {
await remove({ id: record.id }); //await remove({ id: record.id });
createMessage.success('删除成功!'); createMessage.success('删除成功!');
handleSuccess(); handleSuccess();
} }

4
kicc-ui/src/views/system/dict/DictModal.vue

@ -15,7 +15,7 @@
import { formSchema } from './dict.data'; import { formSchema } from './dict.data';
import { TreeItem } from '/@/components/Tree'; import { TreeItem } from '/@/components/Tree';
//import { set } from '/@/api/platform/system/controller/dict'; //import { set } from '/@/api/platform/system/controller/dict';
import {BasicModal, useModalInner} from "/@/components/Modal"; import {BasicModal, useModalInner} from '/@/components/Modal';
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const isUpdate = ref(true); const isUpdate = ref(true);
@ -46,7 +46,7 @@
try { try {
const values = await validate(); const values = await validate();
setModalProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
await set(values); //await set(values);
closeModal(); closeModal();
emit('success'); emit('success');
} finally { } finally {

Loading…
Cancel
Save