From 8aa44984efb100836300e55761d3d30fe2a94dfb Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 9 May 2022 05:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E7=BC=96=E5=86=99=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OauthClientDetailsController.java         |   7 +-
 .../src/views/system/client/ClientDrawer.vue  |  62 -------
 .../src/views/system/client/ClientModal.vue   | 102 ++++++++++++
 .../src/views/system/client/client.data.ts    | 105 ++++++++----
 kicc-ui/src/views/system/client/index.vue     | 153 ++++++++++++------
 .../src/views/system/tenant/TenantModal.vue   |   2 +-
 .../src/views/system/tenant/tenant.data.ts    |   4 +-
 7 files changed, 289 insertions(+), 146 deletions(-)
 delete mode 100644 kicc-ui/src/views/system/client/ClientDrawer.vue
 create mode 100644 kicc-ui/src/views/system/client/ClientModal.vue

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java
index d7589ee3..6fbb1221 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java
@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.controller;
 
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -35,7 +36,7 @@ public class OauthClientDetailsController {
 
 	private LambdaQueryWrapper<OauthClientDetails> getQueryWrapper(OauthClientDetails oauthClientDetails) {
 		return new LambdaQueryWrapper<OauthClientDetails>()
-				.like(StrUtil.isNotBlank(oauthClientDetails.getClientId()), OauthClientDetails::getClientId, oauthClientDetails.getClientId())
+				.eq(StrUtil.isNotBlank(oauthClientDetails.getClientId()), OauthClientDetails::getClientId, oauthClientDetails.getClientId())
 				.between(StrUtil.isNotBlank(oauthClientDetails.getBeginTime()) && StrUtil.isNotBlank(oauthClientDetails.getEndTime()),
 						OauthClientDetails::getCreateTime, oauthClientDetails.getBeginTime(), oauthClientDetails.getEndTime());
 	}
@@ -71,6 +72,10 @@ public class OauthClientDetailsController {
 	@DeleteMapping("/remove/{ids:[\\w,]+}")
 	@PreAuthorize("@pms.hasPermission('client_del')")
 	public R<Boolean> removeById(@PathVariable String[] ids) {
+		// todo: 防止客户端删除,暂时处理手段
+		if(ArrayUtil.containsAny(ids, "kicc", "kicc_lock", "test")){
+			return R.error("不允许删除核心客户端");
+		}
 		oauthClientDetailsService.removeClientDetailsByIds(Arrays.asList(ids));
 		return R.ok();
 	}
diff --git a/kicc-ui/src/views/system/client/ClientDrawer.vue b/kicc-ui/src/views/system/client/ClientDrawer.vue
deleted file mode 100644
index 55f29a8a..00000000
--- a/kicc-ui/src/views/system/client/ClientDrawer.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    showFooter
-    :title="getTitle"
-    width="500px"
-    @register="registerDrawer"
-    @ok="handleSubmit"
-  >
-    <BasicForm @register="registerForm"/>
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, unref } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema } from './client.data';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { TreeItem } from '/@/components/Tree';
-  //import { getMenuList } from '/@/api/system/role';
-  //import { set } from '/@/api/platform/system/controller/client';
-
-  const emit = defineEmits(['success', 'register']);
-  const isUpdate = ref(true);
-  const treeData = ref<TreeItem[]>([]);
-
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-    labelWidth: 100,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    baseColProps: { lg: 12, md: 24 },
-  });
-
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    resetFields();
-    setDrawerProps({ confirmLoading: false });
-    // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
-    if (unref(treeData).length === 0) {
-      //treeData.value = (await getMenuList()) as any as TreeItem[];
-    }
-    isUpdate.value = !!data?.isUpdate;
-
-    if (unref(isUpdate)) {
-      setFieldsValue({
-        ...data.record,
-      });
-    }
-  });
-
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增客户端' : '编辑客户端'));
-
-  async function handleSubmit() {
-    try {
-      const values = await validate();
-      setDrawerProps({ confirmLoading: true });
-      //await set(values);
-      closeDrawer();
-      emit('success');
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
-  }
-</script>
diff --git a/kicc-ui/src/views/system/client/ClientModal.vue b/kicc-ui/src/views/system/client/ClientModal.vue
new file mode 100644
index 00000000..57a9b0de
--- /dev/null
+++ b/kicc-ui/src/views/system/client/ClientModal.vue
@@ -0,0 +1,102 @@
+<template>
+  <BasicModal v-bind="$attrs"
+              width="720px"
+              @register="registerModal"
+              @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  /**
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+   * 采用vben-动态表格表单封装组件编写,采用 setup 写法
+   * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
+   * author entfrm开发团队-王翔
+   */
+  import { ref, unref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from './client.data';
+  import { addClient, editClient, getClient, listClient } from '/@/api/platform/system/controller/client';
+  import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
+  import { isEmpty } from '/@/utils/is';
+
+  /** 通用变量统一声明区域 */
+  const tag = ref<Nullable<string>>('');
+  /** https://v3.cn.vuejs.org/api/options-data.html#emits */
+  const emit = defineEmits(['success', 'register']);
+  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
+    labelWidth: 100,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+    baseColProps: { span: 24 }
+  });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
+    // 处理清除脏数据
+    await resetFields();
+    await clearValidate();
+    // 处理设置数据
+    tag.value = data._tag;
+    const clientId = data.record?.clientId;
+    const props: Partial<ModalProps> = { confirmLoading: false };
+    await updateSchema({
+      field: 'clientId',
+      componentProps: {
+        disabled: unref(tag) != 'add'
+      },
+      rules: [
+        {
+          required: true,
+          whitespace: true,
+          message: '请输入客户端编码'
+        },
+        {
+          validator: async (rule, value) => {
+            if (!isEmpty(value)) {
+              const result = await listClient({ clientId: value });
+              const list = result.data?.filter(item => item.clientId != clientId);
+              if(list?.length > 0) return Promise.reject('该客户端编码已存在');
+            }
+            return Promise.resolve();
+          },
+          validateTrigger: 'blur'
+        }]
+    });
+    // 采用tag标签区分操作
+    switch (unref(tag)) {
+      case 'add':
+        props.title = '新增客户端';
+        break;
+      case 'edit':
+        props.title = '编辑客户端';
+        await setFieldsValue(await getClient(clientId));
+        break;
+    }
+    // 尾部:设置处理后的最终配置数据
+    setModalProps(props);
+  });
+
+  /** 处理弹出框提交 */
+  async function handleSubmit() {
+    try {
+      // 提取验证数据
+      const formData = await validate();
+      // 处理提交之前逻辑
+      setModalProps({ confirmLoading: true });
+      // 采用tag标签区分操作
+      switch (unref(tag)) {
+        case 'add':
+          await addClient(formData);
+          break;
+        case 'edit':
+          await editClient(formData);
+          break;
+      }
+      // 处理提交完成之后逻辑
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/kicc-ui/src/views/system/client/client.data.ts b/kicc-ui/src/views/system/client/client.data.ts
index 6313f7bf..3667fb86 100644
--- a/kicc-ui/src/views/system/client/client.data.ts
+++ b/kicc-ui/src/views/system/client/client.data.ts
@@ -1,115 +1,164 @@
+/**
+ * @program: kicc-ui
+ * @description: 多租户模块动态渲染配置
+ * @author: entfrm开发团队-王翔
+ * @create: 2022/4/21
+ */
+
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 
+/** 表格列配置 */
 export const columns: BasicColumn[] = [
   {
     title: '客户端Id',
     dataIndex: 'clientId',
-    width: 100,
+    width: 100
   },
   {
     title: '客户端密钥',
     dataIndex: 'clientSecret',
-    width: 100,
+    width: 100
   },
   {
     title: '授权类型',
     dataIndex: 'authorizedGrantTypes',
-    width: 130,
+    width: 130
   },
   {
     title: '授权范围',
     dataIndex: 'scope',
-    width: 90,
+    width: 90
   },
   {
     title: '令牌过期秒数',
     dataIndex: 'accessTokenValidity',
-    width: 130,
+    width: 130
   },
   {
     title: '令牌过期秒数',
     dataIndex: 'refreshTokenValidity',
-    width: 130,
+    width: 130
   },
   {
     title: '创建时间',
     dataIndex: 'createTime',
-    width: 100,
-  },
+    width: 100
+  }
 ];
 
+/** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'keyword',
-    label: '关键字',
+    field: 'clientId',
+    label: '客户端编码',
     component: 'Input',
     componentProps: {
-      placeholder: '请输入客户端Id/编码',
+      placeholder: '请输入客户端编码',
     },
     colProps: { span: 8 },
   },
   {
-    field: 'startDate',
-    label: '起始时间',
-    component: 'DatePicker',
-    colProps: { span: 8 },
-  },
-  {
-    field: 'endDate',
-    label: '截止时间',
-    component: 'DatePicker',
-    colProps: { span: 8 },
-  },
+    field: 'dateRange',
+    label: '创建时间',
+    component: 'RangePicker',
+    componentProps: {
+      style: { width:'100%' },
+      valueFormat: 'YYYY-MM-DD',
+      placeholder: ['开始日期','结束日期']
+    },
+    colProps: { span: 8 }
+  }
 ];
 
+/** 表单配置 */
 export const formSchema: FormSchema[] = [
   {
     field: 'id',
     label: 'ID',
     component: 'Input',
-    show: false,
+    show: false
   },
   {
     field: 'clientId',
     label: '客户端Id',
     component: 'Input',
+    required: true,
+    colProps: {
+      span: 12
+    }
   },
   {
     field: 'clientSecret',
     label: '客户端密钥',
     component: 'Input',
+    required: true,
+    colProps: {
+      span: 12
+    }
   },
   {
     field: 'authorizedGrantTypes',
     label: '授权类型',
     component: 'InputTextArea',
-    colProps: { lg: 24, md: 24 },
+    required:true,
+    componentProps: {
+      rows: 3
+    },
+    colProps: {
+      span: 24
+    }
   },
   {
     field: 'scope',
     label: '授权范围',
     component: 'Input',
+    required:true,
+    colProps: {
+      span: 12
+    }
   },
   {
     field: 'accessTokenValidity',
     label: '过期秒数',
-    component: 'Input',
+    component: 'InputNumber',
+    componentProps: {
+      style: { width:'100%' },
+      min: 0
+    },
+    colProps: {
+      span: 12
+    }
   },
   {
     field: 'refreshTokenValidity',
     label: '刷新秒数',
-    component: 'Input',
+    component: 'InputNumber',
+    componentProps: {
+      style: { width:'100%' },
+      min: 0
+    },
+    colProps: {
+      span: 12
+    }
   },
   {
     field: 'webServerRedirectUri',
     label: '回调地址',
     component: 'Input',
+    colProps: {
+      span: 12
+    }
   },
   {
     field: 'additionalInformation',
     label: '附加说明',
     component: 'InputTextArea',
-    colProps: { lg: 24, md: 24 },
-  },
+    componentProps: {
+      rows: 6
+    },
+    colProps: {
+      span: 24
+    }
+  }
 ];
diff --git a/kicc-ui/src/views/system/client/index.vue b/kicc-ui/src/views/system/client/index.vue
index 17586a8f..520de351 100644
--- a/kicc-ui/src/views/system/client/index.vue
+++ b/kicc-ui/src/views/system/client/index.vue
@@ -1,89 +1,140 @@
 <template>
-  <PageWrapper dense
-               contentFullHeight
-               fixedHeight
-               contentClass="flex"
-  >
-    <BasicTable @register="registerTable">
+  <div>
+    <BasicTable @register="registerTable"
+                @selection-change="handleSelectionChange"
+    >
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate">新增客户端</a-button>
+        <a-button v-auth="['client_add']"
+                  type="primary"
+                  @click="handleAdd()"
+        >新增客户端</a-button>
+        <a-button v-auth="['client_edit']"
+                  type="primary"
+                  :disabled="state.single"
+                  @click="handleEdit()"
+        >修改客户端</a-button>
+        <a-button v-auth="['client_del']"
+                  type="primary"
+                  :disabled="state.multiple"
+                  @click="handleDel()"
+        >删除客户端</a-button>
       </template>
       <template #action="{ record }">
-        <TableAction
-          :actions="[
-            {
-              icon: 'clarity:note-edit-line',
-              onClick: handleEdit.bind(null, record),
-            },
-            {
-              icon: 'ant-design:delete-outlined',
-              color: 'error',
-              popConfirm: {
-                title: '是否确认删除',
-                confirm: handleDelete.bind(null, record),
-              },
-            },
-          ]"
+        <TableAction :actions="[
+          {
+            label: '编辑',
+            icon: 'fa6-regular:pen-to-square',
+            auth: ['client_edit'],
+            onClick: handleEdit.bind(null, record)
+          },
+          {
+            label: '删除',
+            icon: 'ant-design:delete-outlined',
+            color: 'error',
+            auth: ['client_del'],
+            onClick: handleDel.bind(null, record)
+          }]"
         />
       </template>
     </BasicTable>
-    <ClientDrawer @register="registerDrawer" @success="handleSuccess"/>
-  </PageWrapper>
+    <!--弹出窗体区域-->
+    <ClientModal @register="registerModal" @success="handleRefreshTable"/>
+  </div>
 </template>
+
 <script lang="ts" setup>
-  // 引入基础组件
-  import { PageWrapper } from '/@/components/Page';
+  /**
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+   * 采用vben-动态表格表单封装组件编写,采用 setup 写法
+   * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
+   * author entfrm开发团队-王翔
+   */
+  import { reactive, toRaw } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  // 插入数据内容
+  import { listClient, delClient } from '/@/api/platform/system/controller/client';
+  import { useModal } from '/@/components/Modal';
+  import ClientModal from './ClientModal.vue';
   import { columns, searchFormSchema } from './client.data';
-  // 通过API接口获取日志
-  //import { page, del } from '/@/api/platform/system/controller/client';
-  import { useDrawer } from '/@/components/Drawer';
-  import ClientDrawer from './ClientDrawer.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
 
-  const { createMessage } = useMessage();
-  const [registerDrawer, { openDrawer }] = useDrawer();
-  const [registerTable, { reload }] = useTable({
+  /** 类型规范统一声明定义区域 */
+  interface TableState {
+    single: boolean;
+    multiple: boolean;
+  }
+
+  /** 通用变量统一声明区域 */
+  const state = reactive<TableState>({
+    // 非单个禁用
+    single: true,
+    // 非多个禁用
+    multiple: true
+  });
+  const { createConfirm, createMessage } = useMessage();
+  const [registerModal, { openModal }] = useModal();
+  const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
     title: '客户端列表',
-    //api: page,
+    api: listClient,
+    rowKey: 'clientId',
     columns,
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
     },
+    rowSelection: { type: 'checkbox' },
     useSearchForm: true,
     showTableSetting: true,
     bordered: true,
+    clickToRowSelect: false,
     showIndexColumn: false,
     actionColumn: {
-      width: 80,
+      width: 220,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },
-      fixed: undefined,
+      fixed: false
     },
+    handleSearchInfoFn: () => clearSelectedRowKeys()
   });
 
-  function handleCreate() {
-    openDrawer(true, {
-      isUpdate: false,
-    });
+  /** 处理多选框选中数据 */
+  function handleSelectionChange(selection?: Recordable) {
+    const rowSelection = toRaw(selection?.keys) || [];
+    state.single = rowSelection.length != 1;
+    state.multiple = !rowSelection.length;
   }
-  function handleEdit(record: Recordable) {
-    openDrawer(true, {
-      record,
-      isUpdate: true,
-    });
+
+  /** 新增按钮操作,行内新增与工具栏局域新增通用 */
+  function handleAdd() {
+    openModal(true,{ _tag: 'add' });
   }
 
-  async function handleDelete(record: Recordable) {
-    //await del({ ids: record.id });
-    createMessage.success('删除成功!');
-    handleSuccess();
+  /** 编辑按钮操作,行内编辑 */
+  function handleEdit(record?: Recordable) {
+    record = record || { clientId: getSelectRowKeys() };
+    openModal(true, { _tag: 'edit', record });
+  }
+
+  /** 删除按钮操作,行内删除 */
+  async function handleDel(record?: Recordable) {
+    const clientIds = record?.clientId || getSelectRowKeys();
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: `是否确认删除客户端编号为${clientIds}客户端吗?`,
+      onOk: async () => {
+        await delClient(clientIds);
+        createMessage.success('删除成功!');
+        handleRefreshTable();
+      }
+    });
   }
 
-  function handleSuccess() {
+  /** 处理表格刷新 */
+  function handleRefreshTable() {
+    clearSelectedRowKeys();
     reload();
   }
 </script>
diff --git a/kicc-ui/src/views/system/tenant/TenantModal.vue b/kicc-ui/src/views/system/tenant/TenantModal.vue
index 9f92d229..fd71d0ef 100644
--- a/kicc-ui/src/views/system/tenant/TenantModal.vue
+++ b/kicc-ui/src/views/system/tenant/TenantModal.vue
@@ -19,7 +19,7 @@
   import { formSchema } from './tenant.data';
   import {addTenant, editTenant, getTenant, listTenant} from '/@/api/platform/system/controller/tenant';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
-  import {isEmpty} from "/@/utils/is";
+  import {isEmpty} from '/@/utils/is';
 
   /** 通用变量统一声明区域 */
   const tag = ref<Nullable<string>>('');
diff --git a/kicc-ui/src/views/system/tenant/tenant.data.ts b/kicc-ui/src/views/system/tenant/tenant.data.ts
index b2160962..e008f0c2 100644
--- a/kicc-ui/src/views/system/tenant/tenant.data.ts
+++ b/kicc-ui/src/views/system/tenant/tenant.data.ts
@@ -9,8 +9,6 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
-import { listTenant } from '/@/api/platform/system/controller/tenant';
-import { isEmpty } from '/@/utils/is';
 
 /** 表格列配置 */
 export const columns: BasicColumn[] = [
@@ -88,7 +86,7 @@ export const searchFormSchema: FormSchema[] = [
   }
 ];
 
-/** 用户表单配置 */
+/** 表单配置 */
 export const formSchema: FormSchema[] = [
   {
     field: 'id',