Browse Source

👣 强制使用单引号

master
wangxiang 3 years ago
parent
commit
f7994cd6cb
  1. 6
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java
  2. 7
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictService.java
  3. 17
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictServiceImpl.java
  4. 6
      kicc-ui/.eslintrc.js
  5. 79
      kicc-ui/src/views/system/dict/dict.data.ts
  6. 162
      kicc-ui/src/views/system/dict/index.vue

6
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java

@ -68,10 +68,10 @@ public class DictController { @@ -68,10 +68,10 @@ public class DictController {
}
@SysLog("字典删除")
@DeleteMapping("/remove/{ids:[\\w,]+}")
@DeleteMapping("/remove/{types:[\\w,]+}")
@PreAuthorize("@pms.hasPermission('dict_del')")
public R remove(@PathVariable String[] ids) {
dictService.removeByIds(Arrays.asList(ids));
public R remove(@PathVariable String[] types) {
dictService.deleteByTypes(types);
return R.ok();
}

7
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictService.java

@ -13,4 +13,11 @@ import com.cloud.kicc.system.api.entity.Dict; @@ -13,4 +13,11 @@ import com.cloud.kicc.system.api.entity.Dict;
*/
public interface DictService extends IService<Dict> {
/**
* 删除字典,包括字典数据
* @param types 多个字典类型
* @return void
*/
void deleteByTypes(String[] types);
}

17
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictServiceImpl.java

@ -1,10 +1,15 @@ @@ -1,10 +1,15 @@
package com.cloud.kicc.system.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.system.api.entity.Dict;
import com.cloud.kicc.system.api.entity.DictData;
import com.cloud.kicc.system.mapper.DictMapper;
import com.cloud.kicc.system.service.DictDataService;
import com.cloud.kicc.system.service.DictService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
*<p>
@ -15,6 +20,18 @@ import org.springframework.stereotype.Service; @@ -15,6 +20,18 @@ import org.springframework.stereotype.Service;
* @Date: 2022/2/24
*/
@Service
@RequiredArgsConstructor
public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
private final DictDataService dictDataService;
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteByTypes(String[] types) {
for (int i = 0; i < types.length; ++i) {
this.remove(Wrappers.<Dict>lambdaUpdate().eq(Dict::getType, types[i]));
dictDataService.remove(Wrappers.<DictData>lambdaUpdate().eq(DictData::getDictType, types[i]));
}
}
}

6
kicc-ui/.eslintrc.js

@ -44,13 +44,14 @@ module.exports = defineConfig({ @@ -44,13 +44,14 @@ module.exports = defineConfig({
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/quotes': ['error', 'single'],
/** ----------eslint配置----------- */
'no-use-before-define': 'off',
'no-unused-vars': 'off',
'space-before-function-paren': 'off',
'semi': ['error', 'always',],
"prefer-const": 'off',
'semi': ['error', 'always'],
'prefer-const': 'off',
/** ----------vue配置----------- */
'vue/script-setup-uses-vars': 'error',
@ -75,5 +76,6 @@ module.exports = defineConfig({ @@ -75,5 +76,6 @@ module.exports = defineConfig({
math: 'always',
},
],
'vue/html-quotes': [ 'error', 'double', { 'avoidEscape': false } ]
},
});

79
kicc-ui/src/views/system/dict/dict.data.ts

@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import {h} from "vue";
import {Tag} from "ant-design-vue";
/**
* @program: kicc-ui
* @description:
* @author: entfrm开发团队-
* @create: 2022/5/8
*/
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { h } from 'vue';
import { Tag } from 'ant-design-vue';
/** 表格列配置 */
export const columns: BasicColumn[] = [
{
title: '字典ID',
dataIndex: 'id',
width: 100,
},
{
title: '字典名称',
dataIndex: 'name',
width: 100,
dataIndex: 'name'
},
{
title: '字典类型',
dataIndex: 'type',
width: 130,
dataIndex: 'type'
},
{
title: '系统内置',
@ -25,8 +26,8 @@ export const columns: BasicColumn[] = [ @@ -25,8 +26,8 @@ export const columns: BasicColumn[] = [
width: 90,
customRender: ({ record }) => {
const status = record.status;
const enable = status === '0';
const color = 'gray';
const enable = ~~status === 0;
const color = enable ? 'green' : 'red';
const text = enable ? '是' : '否';
return h(Tag, { color: color }, () => text);
}
@ -34,10 +35,10 @@ export const columns: BasicColumn[] = [ @@ -34,10 +35,10 @@ export const columns: BasicColumn[] = [
{
title: '状态',
dataIndex: 'status',
width: 90,
width: 130,
customRender: ({ record }) => {
const status = record.status;
const enable = status === '0';
const enable = ~~status === 0;
const color = enable ? 'green' : 'red';
const text = enable ? '启用' : '禁用';
return h(Tag, { color: color }, () => text);
@ -45,7 +46,17 @@ export const columns: BasicColumn[] = [ @@ -45,7 +46,17 @@ export const columns: BasicColumn[] = [
}
];
/** 搜索表单配置 */
export const searchFormSchema: FormSchema[] = [
{
field: 'name',
label: '字典名称',
component: 'Input',
componentProps: {
placeholder: '请输入字典名称',
},
colProps: { span: 8 }
},
{
field: 'type',
label: '字典类型',
@ -53,33 +64,41 @@ export const searchFormSchema: FormSchema[] = [ @@ -53,33 +64,41 @@ export const searchFormSchema: FormSchema[] = [
componentProps: {
placeholder: '请输入字典类型',
},
colProps: {span: 16},
colProps: { span: 8 }
},
{
field: 'status',
label: '状态',
component: 'Select',
componentProps: {
options: [
{ label: '正常', value: '0' },
{ label: '停用', value: '1' }
]
},
colProps: { span: 8 }
}
];
/** 表单配置 */
export const formSchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
component: 'Input',
show: false,
show: false
},
{
field: 'name',
label: '字典名称',
component: 'Input',
colProps:{
span: 12
}
colProps:{ span: 12 }
},
{
field: 'type',
label: '字典类型',
component: 'Input',
colProps:{
span: 12
}
colProps:{ span: 12 }
},
{
field: 'isSys',
@ -92,9 +111,7 @@ export const formSchema: FormSchema[] = [ @@ -92,9 +111,7 @@ export const formSchema: FormSchema[] = [
{ label: '否', value: '1' }
]
},
colProps:{
span: 12
}
colProps:{ span: 12 }
},
{
field: 'status',
@ -107,9 +124,7 @@ export const formSchema: FormSchema[] = [ @@ -107,9 +124,7 @@ export const formSchema: FormSchema[] = [
{ label: '禁用', value: '1' }
]
},
colProps:{
span: 12
}
colProps:{ span: 12 }
},
{
field: 'remarks',

162
kicc-ui/src/views/system/dict/index.vue

@ -1,109 +1,177 @@ @@ -1,109 +1,177 @@
<template>
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
<BasicTable @register="registerTable" @row-click="clickSubTable" class="w-2/4 xl:w-2/4">
<PageWrapper dense
fixedHeight
contentFullHeight
contentClass="flex"
>
<BasicTable class="w-2/4 xl:w-2/4"
@register="registerTable"
@selection-change="handleSelectionChange"
@row-click="handleClickSubTable"
>
<template #toolbar>
<a-button type="primary" @click="handleCreate">新增字典</a-button>
<a-button v-auth="['dict_add']"
type="primary"
@click="handleAdd()"
>新增字典</a-button>
<a-button v-auth="['dict_edit']"
type="primary"
:disabled="state.single"
@click="handleEdit()"
>修改字典</a-button>
<a-button v-auth="['dict_del']"
type="primary"
:disabled="state.multiple"
@click="handleDel()"
>删除字典</a-button>
</template>
<template #action="{ record }">
<TableAction
:actions="[
<TableAction :actions="[
{
icon: 'clarity:note-edit-line',
onClick: handleEdit.bind(null, record),
label: '编辑',
icon: 'fa6-regular:pen-to-square',
auth: ['dict_edit'],
onClick: handleEdit.bind(null, record)
},
{
label: '删除',
icon: 'ant-design:delete-outlined',
auth: ['dict_del'],
color: 'error',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
]"
onClick: handleDel.bind(null, record)
}]"
/>
</template>
</BasicTable>
<DictDataTable ref="dictSubRef" class="w-2/4 xl:w-2/4" />
<DictModal @register="registerModal" @success="handleSuccess" />
<DictDataTable ref="dictSubRef" class="w-2/4 xl:w-2/4"/>
<!--弹出窗体区域-->
<DictModal @register="registerModal" @success="handleRefreshTable"/>
</PageWrapper>
</template>
<script lang="ts">
import { defineComponent, ref } from 'vue';
//
/**
* 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
* 采用vben-动态表格表单封装组件编写,不采用 setup 写法
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* author entfrm开发团队-王翔
*/
import { defineComponent, reactive, ref, toRaw } from 'vue';
import { PageWrapper } from '/@/components/Page';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
//
import { columns, searchFormSchema} from './dict.data';
// API
//import { list, remove } from '/@/api/platform/system/controller/dict';
import { listDict, delDict } from '/@/api/platform/system/controller/dict';
import { useModal } from '/@/components/Modal';
import { useMessage } from '/@/hooks/web/useMessage';
import DictModal from './DictModal.vue';
import DictDataTable from './DictDataTable.vue';
import { useMessage } from '/@/hooks/web/useMessage';
import {delRole} from "/@/api/platform/system/controller/role";
/** 类型规范统一声明定义区域 */
interface TableState {
ids: string[];
single: boolean;
multiple: boolean;
}
export default defineComponent({
name: 'DictManagement',
components: { BasicTable, PageWrapper, DictModal, DictDataTable, TableAction },
setup() {
const { createMessage } = useMessage();
/** 通用变量统一声明区域 */
const dictSubRef = ref();
const state = reactive<TableState>({
//
ids: [],
//
single: true,
//
multiple: true
});
const { createConfirm, createMessage } = useMessage();
const [registerModal, { openModal }] = useModal();
const [registerTable, { reload }] = useTable({
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '字典列表',
//api: list,
api: listDict,
rowKey: 'id',
columns,
formConfig: {
labelWidth: 100,
labelWidth: 80,
schemas: searchFormSchema,
autoSubmitOnEnter: true
},
rowSelection: { type: 'checkbox' },
useSearchForm: true,
showTableSetting: true,
bordered: true,
showIndexColumn: false,
actionColumn: {
width: 80,
width: 220,
title: '操作',
dataIndex: 'action',
slots: { customRender: 'action' },
fixed: undefined,
fixed: false
},
handleSearchInfoFn: () => clearSelectedRowKeys()
});
function handleCreate() {
openModal(true, {
isUpdate: false,
});
/** 处理多选框选中数据 */
function handleSelectionChange(selection?: Recordable) {
const rowSelection = toRaw(selection?.keys) || [];
state.ids = rowSelection;
state.single = rowSelection.length != 1;
state.multiple = !rowSelection.length;
}
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
});
/** 新增按钮操作,行内新增与工具栏局域新增通用 */
function handleAdd() {
openModal(true,{ _tag: 'add' });
}
/** 编辑按钮操作,行内编辑 */
function handleEdit(record?: Recordable) {
record = record || { id: toRaw(state.ids) };
openModal(true, { _tag: 'edit', record });
}
async function handleDelete(record: Recordable) {
await remove({ id: record.id });
/** 删除按钮操作,行内删除 */
async function handleDel(record?: Recordable) {
const ids = record?.id || toRaw(state.ids);
createConfirm({
iconType: 'warning',
title: '警告',
content: `是否确认删除角色编号为${ids}角色吗?`,
onOk: async () => {
await delRole(ids);
createMessage.success('删除成功!');
handleSuccess();
handleRefreshTable();
}
});
}
function clickSubTable(record: Recordable) {
/** 处理点击字典子表 */
function handleClickSubTable(record: Recordable) {
dictSubRef.value.filterByDictType(record);
}
function handleSuccess() {
/** 处理表格刷新 */
function handleRefreshTable() {
clearSelectedRowKeys();
reload();
}
return {
state,
registerTable,
registerModal,
clickSubTable,
handleCreate,
handleEdit,
handleDelete,
handleSuccess,
dictSubRef,
handleClickSubTable,
handleAdd,
handleEdit,
handleDel,
handleRefreshTable,
handleSelectionChange
};
},
}
});
</script>

Loading…
Cancel
Save