From 56fcd8ebb0a3987efb1dc8d47c59fa46ff573fbd Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 24 Sep 2022 22:39:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=20=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=BC=98=E5=8C=96,=20=E5=A2=9E=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/develop/dynamicDataSource.js          |  66 +++++++
 .../modules/develop/codegen/CodeGenForm.vue   |   2 +-
 .../dynamicsource/DynamicDataSourceEdit.vue   | 166 ++++++++++++++++++
 .../dynamicsource/DynamicDataSourceList.vue   | 121 +++++++++++++
 .../modules/notice/template/TemplateEdit.vue  |   2 +-
 5 files changed, 355 insertions(+), 2 deletions(-)
 create mode 100644 src/api/develop/dynamicDataSource.js
 create mode 100644 src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
 create mode 100644 src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue

diff --git a/src/api/develop/dynamicDataSource.js b/src/api/develop/dynamicDataSource.js
new file mode 100644
index 0000000..3a3e008
--- /dev/null
+++ b/src/api/develop/dynamicDataSource.js
@@ -0,0 +1,66 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 分页
+ */
+export function page (params) {
+  return axios({
+    url: '/dynamic/source/page',
+    method: 'GET',
+    params: params
+  })
+}
+
+/**
+ * 查询全部
+ */
+export function list () {
+    return axios({
+        url: '/dynamic/source/findAll',
+        method: 'GET'
+    })
+}
+
+/**
+ * 获取单条
+ */
+export function get (id) {
+  return axios({
+    url: '/dynamic/source/findById',
+    method: 'GET',
+    params: { id }
+  })
+}
+
+/**
+ * 添加
+ */
+export function add (obj) {
+  return axios({
+    url: '/dynamic/source/add',
+    method: 'POST',
+    data: obj
+  })
+}
+
+/**
+ * 更新
+ */
+export function update (obj) {
+  return axios({
+    url: '/dynamic/source/update',
+    method: 'POST',
+    data: obj
+  })
+}
+
+/**
+ * 删除
+ */
+export function del (id) {
+  return axios({
+    url: '/dynamic/source/delete',
+    params: { id },
+    method: 'DELETE'
+  })
+}
diff --git a/src/views/modules/develop/codegen/CodeGenForm.vue b/src/views/modules/develop/codegen/CodeGenForm.vue
index 6809e24..550a714 100644
--- a/src/views/modules/develop/codegen/CodeGenForm.vue
+++ b/src/views/modules/develop/codegen/CodeGenForm.vue
@@ -171,7 +171,7 @@ export default {
       this.form.controllerPack = `${basePack}.controller`
 
       this.form.requestPath = `/${module}`
-      this.form.vueApiPath = `/api/${module}/`
+      this.form.vueApiPath = `/api/${module}`
       this.genPackFlag = true
     },
     handleCancel () {
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
new file mode 100644
index 0000000..d3b58e1
--- /dev/null
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
@@ -0,0 +1,166 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="modalWidth"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form-model
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-model-item label="主键" prop="id" hidden="true" >
+          <a-input v-model="form.id" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="数据源编码"
+          prop="code"
+        >
+          <a-input v-model="form.code" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="数据源名称"
+          prop="name"
+        >
+          <a-input v-model="form.name" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="数据库类型"
+          prop="databaseType"
+        >
+          <a-input v-model="form.databaseType" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="驱动类"
+          prop="dbDriver"
+        >
+          <a-input v-model="form.dbDriver" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="数据库地址"
+          prop="dbUrl"
+        >
+          <a-input v-model="form.dbUrl" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="数据库名称"
+          prop="dbName"
+        >
+          <a-input v-model="form.dbName" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="用户名"
+          prop="dbUsername"
+        >
+          <a-input v-model="form.dbUsername" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="密码"
+          prop="dbPassword"
+        >
+          <a-input v-model="form.dbPassword" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="备注"
+          prop="remark"
+        >
+          <a-input v-model="form.remark" :disabled="showable"/>
+        </a-form-model-item>
+      </a-form-model>
+    </a-spin>
+    <template #footer>
+      <a-button key="cancel" @click="handleCancel">取消</a-button>
+      <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { FormMixin } from '@/mixins/FormMixin'
+import { get, add, update } from '@/api/develop/dynamicDataSource'
+export default {
+  name: 'DynamicDataSourceEdit',
+  mixins: [FormMixin],
+  data () {
+    return {
+      form: {
+        id: null,
+        code: null,
+        name: null,
+        databaseType: null,
+        dbDriver: null,
+        dbUrl: null,
+        dbName: null,
+        dbUsername: null,
+        dbPassword: null,
+        remark: null,
+      },
+      rules: {
+        code: [],
+        name: [],
+        databaseType: [],
+        dbDriver: [],
+        dbUrl: [],
+        dbName: [],
+        dbUsername: [],
+        dbPassword: [],
+        remark: [],
+      }
+    }
+  },
+  methods: {
+    /**
+     * 编辑
+     */
+    edit (id, type) {
+      if (['edit', 'show'].includes(type)) {
+        this.confirmLoading = true
+        get(id).then(res => {
+          this.form = res.data
+          this.confirmLoading = false
+        })
+      } else {
+        this.confirmLoading = false
+      }
+    },
+    /**
+     * 提交
+     */
+    handleOk () {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          this.confirmLoading = true
+          if (this.type === 'add') {
+            await add(this.form)
+          } else if (this.type === 'edit') {
+            await update(this.form)
+          }
+          this.confirmLoading = false
+          this.$emit('ok')
+          this.visible = false
+        } else {
+          return false
+        }
+      })
+    },
+    /**
+     * 重置表单
+     */
+    resetForm () {
+      this.$nextTick(() => {
+        this.$refs.form.resetFields()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
new file mode 100644
index 0000000..fe40f72
--- /dev/null
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
@@ -0,0 +1,121 @@
+<template>
+  <a-card :bordered="false">
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
+    <vxe-toolbar
+      custom
+      zoom
+      :refresh="{query: init}"
+    >
+      <template v-slot:buttons>
+        <a-button type="primary" icon="plus" @click="add">新建</a-button>
+      </template>
+    </vxe-toolbar>
+    <vxe-table
+      row-id="id"
+      :loading="loading"
+      :data="tableData"
+    >
+      <vxe-table-column type="seq" title="序号" width="60" />
+      <vxe-table-column field="code" title="数据源编码"/>
+      <vxe-table-column field="name" title="数据源名称"/>
+      <vxe-table-column field="databaseType" title="数据库类型"/>
+      <vxe-table-column field="dbDriver" title="驱动类"/>
+      <vxe-table-column field="dbUrl" title="数据库地址"/>
+      <vxe-table-column field="dbName" title="数据库名称"/>
+      <vxe-table-column field="dbUsername" title="用户名"/>
+      <vxe-table-column field="dbPassword" title="密码"/>
+      <vxe-table-column field="remark" title="备注"/>
+      <vxe-table-column field="createTime" title="创建时间" />
+      <vxe-table-column fixed="right" width="150" :showOverflow="false" title="操作">
+        <template v-slot="{row}">
+          <span>
+            <a href="javascript:" @click="show(row)">查看</a>
+          </span>
+          <a-divider type="vertical"/>
+          <span>
+            <a href="javascript:" @click="edit(row)">编辑</a>
+          </span>
+          <a-divider type="vertical"/>
+          <a-popconfirm
+            title="是否删除"
+            @confirm="remove(row)"
+            okText="是"
+            cancelText="否">
+            <a href="javascript:" style="color: red">删除</a>
+          </a-popconfirm>
+        </template>
+      </vxe-table-column>
+    </vxe-table>
+    <vxe-pager
+      size="medium"
+      :loading="loading"
+      :current-page="pagination.current"
+      :page-size="pagination.size"
+      :total="pagination.total"
+      @page-change="handleTableChange"/>
+    <dynamic-data-source-edit
+      ref="dynamicDataSourceEdit"
+      @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+  import { page, del } from '@/api/develop/dynamicDataSource'
+  import DynamicDataSourceEdit from './DynamicDataSourceEdit'
+  import { TableMixin } from '@/mixins/TableMixin'
+  import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
+  export default {
+    name: 'DynamicDataSourceList',
+    components: {
+      DynamicDataSourceEdit
+    },
+    mixins: [TableMixin],
+    data () {
+      return {
+        fields: [
+          { field: 'code', type: STRING, name: '编码', placeholder: '请输入数据源编码' },
+          { field: 'name', type: STRING, name: '名称', placeholder: '请输入数据源名称' }
+        ]
+      }
+    },
+    methods: {
+      init () {
+        this.loading = true
+        page({
+          ...this.queryParam,
+          ...this.pages
+        }).then(res => {
+          this.pageQueryResHandel(res, this)
+        })
+      },
+      add () {
+        this.$refs.dynamicDataSourceEdit.init('', 'add')
+      },
+      edit (record) {
+        this.$refs.dynamicDataSourceEdit.init(record.id, 'edit')
+      },
+      show (record) {
+        this.$refs.dynamicDataSourceEdit.init(record.id, 'show')
+      },
+      remove (record) {
+        del(record.id).then(_ => {
+          this.$message.info('删除成功')
+          this.init()
+        })
+      }
+    },
+    created () {
+      this.init()
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/notice/template/TemplateEdit.vue b/src/views/modules/notice/template/TemplateEdit.vue
index a7a8ca0..1effc24 100644
--- a/src/views/modules/notice/template/TemplateEdit.vue
+++ b/src/views/modules/notice/template/TemplateEdit.vue
@@ -81,7 +81,7 @@ export default {
         name: '',
         date: '',
         remark: '',
-        type: 1
+        type: 0
       },
       rules: {
         code: [
-- 
Gitee


From 44a6a183d446749e38c363fc76c66120f1b9160b Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 25 Sep 2022 17:11:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style=20=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoticeIcon/NoticeIcon.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/NoticeIcon/NoticeIcon.vue b/src/components/NoticeIcon/NoticeIcon.vue
index f37f430..2a525dc 100644
--- a/src/components/NoticeIcon/NoticeIcon.vue
+++ b/src/components/NoticeIcon/NoticeIcon.vue
@@ -16,7 +16,9 @@
               <a-list-item-meta :description="o.senderTime">
                 <template #title>
                   <a-tag color="red">未读</a-tag>
-                  {{ o.title }}
+                  <ellipsis :length="25" tooltip>
+                    {{ o.title }}
+                  </ellipsis>
                 </template>
               </a-list-item-meta>
             </a>
@@ -40,9 +42,11 @@
 
 import { countByReceiveNotRead, pageByReceive, read } from '@/api/notice/siteMessage'
 import { NOTICE_MESSAGE_UPDATE, NOTICE_SHOW_MESSAGE } from '@/assets/code/VueBusCode'
+import Ellipsis from '@/components/Ellipsis'
 
 export default {
   name: 'HeaderNotice',
+  components: { Ellipsis },
   data () {
     return {
       // 事件标示
-- 
Gitee


From 0bbd1e651dbc775c525413e0e238bbd88a26f24b Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 1 Oct 2022 19:37:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E7=B3=BB=E7=BB=9F=E5=86=85=E7=BD=AE?=
 =?UTF-8?q?=E7=BB=88=E7=AB=AF=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/system/client/ClientList.vue    | 3 ++-
 src/views/modules/system/client/LoginTypeList.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/system/client/ClientList.vue b/src/views/modules/system/client/ClientList.vue
index 2c70de4..413fca9 100644
--- a/src/views/modules/system/client/ClientList.vue
+++ b/src/views/modules/system/client/ClientList.vue
@@ -65,10 +65,11 @@
           <a-divider type="vertical"/>
           <a-popconfirm
             title="是否删除"
+            :disabled="row.system"
             @confirm="remove(row)"
             okText="是"
             cancelText="否">
-            <a href="javascript:" style="color: red">删除</a>
+            <a href="javascript:" :disabled="row.system" :style="{color: row.system?'grey':'red'}">删除</a>
           </a-popconfirm>
         </template>
       </vxe-table-column>
diff --git a/src/views/modules/system/client/LoginTypeList.vue b/src/views/modules/system/client/LoginTypeList.vue
index f5c9e70..a602f71 100644
--- a/src/views/modules/system/client/LoginTypeList.vue
+++ b/src/views/modules/system/client/LoginTypeList.vue
@@ -72,7 +72,7 @@
           <a-divider type="vertical"/>
           <a-popconfirm
             :disabled="row.system"
-            title="是否删除终端"
+            title="是否删除登录方式"
             @confirm="remove(row)"
             okText="是"
             cancelText="否">
-- 
Gitee