From bbd5a681e2e2505d7c046f0b3ada99a8e3026558 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Mon, 20 Feb 2023 17:44:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?style=20=E6=96=87=E6=9C=AC=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/demo/notice/email/SimpleEmailSender.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/demo/notice/email/SimpleEmailSender.vue b/src/views/modules/demo/notice/email/SimpleEmailSender.vue
index c5e2695..81e89c4 100644
--- a/src/views/modules/demo/notice/email/SimpleEmailSender.vue
+++ b/src/views/modules/demo/notice/email/SimpleEmailSender.vue
@@ -9,8 +9,8 @@
       <a-form-model-item label="标题" prop="subject">
         <a-input v-model="form.subject" placeholder="请输入邮件名称"/>
       </a-form-model-item>
-      <a-form-model-item label="发送人" prop="email">
-        <a-input v-model="form.email" placeholder="请输入用户账号"/>
+      <a-form-model-item label="邮箱" prop="email">
+        <a-input v-model="form.email" placeholder="请输入用户邮箱"/>
       </a-form-model-item>
       <a-form-model-item ref="message" label="内容" prop="message">
         <div style="border: 1px solid #ccc">
-- 
Gitee


From 153156755709008f0d01c5a9fe9a9fbfae245bae Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Fri, 10 Mar 2023 16:55:26 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat=20=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/develop/dynamicDataSource.js          | 117 +++++++++++
 src/mixins/FormMixin.js                       |   1 -
 .../develop/dynamicsource/DataSourceList.vue  |  78 +++++++
 .../dynamicsource/DynamicDataSourceEdit.vue   | 121 +++++++----
 .../dynamicsource/DynamicDataSourceList.vue   | 198 ++++++++++++------
 5 files changed, 404 insertions(+), 111 deletions(-)
 create mode 100644 src/views/modules/develop/dynamicsource/DataSourceList.vue

diff --git a/src/api/develop/dynamicDataSource.js b/src/api/develop/dynamicDataSource.js
index 3a3e008..8ecd9b6 100644
--- a/src/api/develop/dynamicDataSource.js
+++ b/src/api/develop/dynamicDataSource.js
@@ -64,3 +64,120 @@ export function del (id) {
     method: 'DELETE'
   })
 }
+
+/**
+ * 测试连接
+ */
+export const testConnection = (obj) => {
+  return axios({
+    url: '/dynamic/source/testConnection',
+    data: obj,
+    method: 'POST'
+  })
+}
+
+/**
+ * 测试连接
+ */
+export const testConnectionById = (id) => {
+  return axios({
+    url: '/dynamic/source/testConnectionById',
+    params: { id },
+    method: 'GET'
+  })
+}
+
+/**
+ * 根据id进行添加到连接池中
+ */
+export const addDynamicDataSourceById = (id) => {
+  return axios({
+    url: '/dynamic/source/addDynamicDataSourceById',
+    params: { id },
+    method: 'POST'
+  })
+}
+
+/**
+ * 判断编码是否被使用
+ */
+export const existsByCode = (code) => {
+  return axios({
+    url: '/dynamic/source/existsByCode',
+    params: { code },
+    method: 'GET'
+  })
+}
+
+/**
+ * 判断编码是否被使用
+ */
+export const existsByCodeNotId = (code, id) => {
+  return axios({
+    url: '/dynamic/source/existsByCodeNotId',
+    params: { code, id },
+    method: 'GET'
+  })
+}
+/**
+ * 判断是否已经添加到连接池中
+ */
+export const existsByDataSourceKey = (code) => {
+  return axios({
+    url: '/dynamic/source/existsByDataSourceKey',
+    params: { code },
+    method: 'GET'
+  })
+}
+
+/**
+ * 查询当前数据源列表
+ */
+export const findAllDataSource = () => {
+  return axios({
+    url: '/dynamic/source/findAllDataSource',
+    method: 'GET'
+  })
+}
+
+/**
+ * 从数据源列表中删除指定数据源
+ */
+export const removeDataSourceByKey = (key) => {
+  return axios({
+    url: '/dynamic/source/removeDataSourceByKey',
+    params: { key },
+    method: 'DELETE'
+  })
+}
+
+/**
+ * 数据类型列表
+ */
+export const databaseTypes = [
+  { value: 'mysql', label: 'MySQL' },
+  { value: 'oracle', label: 'Oracle' },
+  { value: 'mssql', label: 'SQLServer' },
+]
+
+/**
+ * 数据类型关联信息列表
+ */
+export // 数据列表
+const databaseTypeMap = {
+  mysql: {
+    dbDriver: 'com.mysql.cj.jdbc.Driver',
+    dbUrl:
+      'jdbc:mysql://127.0.0.1:3306/bootx?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai',
+  },
+  oracle: {
+    dbDriver: 'oracle.jdbc.OracleDriver',
+    dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:BOOTX',
+  },
+  mssql: {
+    dbDriver: 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
+    dbUrl: 'jdbc:mysql://127.0.0.1:3306/bootx?characterEncoding=UTF-8&useUnicode=true&useSSL=false',
+  },
+}
+
+
diff --git a/src/mixins/FormMixin.js b/src/mixins/FormMixin.js
index e8553b4..65ac787 100644
--- a/src/mixins/FormMixin.js
+++ b/src/mixins/FormMixin.js
@@ -3,7 +3,6 @@ import {
   getDictItemsAsync,
   getDictItemsByNumber, getDictItemsByNumberAsync
 } from '@/components/Bootx/Dict/DictUtils'
-import { findByParamKey } from '@/api/system/param'
 
 export const FormMixin = {
   data () {
diff --git a/src/views/modules/develop/dynamicsource/DataSourceList.vue b/src/views/modules/develop/dynamicsource/DataSourceList.vue
new file mode 100644
index 0000000..3163eb3
--- /dev/null
+++ b/src/views/modules/develop/dynamicsource/DataSourceList.vue
@@ -0,0 +1,78 @@
+<template>
+  <a-drawer
+    :visible="visible"
+    width="35%"
+    title="数据源列表"
+    :maskClosable="true"
+    placement="right"
+    :closable="true"
+    @close="visible = false"
+  >
+    <vxe-toolbar
+      custom
+      zoom
+      :refresh="{query: query}"
+    >
+    </vxe-toolbar>
+    <vxe-table
+      row-id="id"
+      size="medium"
+      :loading="loading"
+      :data="records"
+    >
+      <vxe-column type="seq" title="序号" width="60"/>
+      <vxe-column type="seq" width="60" />
+      <vxe-column field="key" title="数据源" />
+      <vxe-column title="操作" fixed="right" width="50" :showOverflow="false">
+        <template v-slot="{row}">
+          <a href="javascript:" @click="remove(row)" style="color: red">删除</a>
+        </template>
+      </vxe-column>
+    </vxe-table>
+  </a-drawer>
+</template>
+
+<script>
+import { findAllDataSource, removeDataSourceByKey } from '@/api/develop/dynamicDataSource'
+
+export default {
+  name: 'DataSourceList',
+  data () {
+    return {
+      visible: false,
+      loading: false,
+      records: []
+    }
+  },
+  methods: {
+    show () {
+      this.visible = true
+      this.query()
+    },
+    query () {
+      this.loading = true
+      findAllDataSource().then(({ data }) => {
+        this.records = data
+        this.loading = false
+      })
+    },
+    remove (record) {
+      this.$confirm({
+        title: '移除',
+        content: '是否将该数据源从系统中移除!',
+        onOk: () => {
+          this.loading = true
+          removeDataSourceByKey(record.key).then(() => {
+            this.$message.success('移除成功')
+            this.query()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
index 564242a..4b8e994 100644
--- a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
@@ -1,12 +1,11 @@
 <template>
-  <a-modal
-    :title="title"
-    :width="modalWidth"
+  <a-drawer
+    title="数据源管理"
+    width="40%"
     :visible="visible"
-    :confirmLoading="confirmLoading"
+    :destroyOnClose="true"
     :maskClosable="false"
-    @cancel="handleCancel"
-  >
+    @close="handleCancel">
     <a-spin :spinning="confirmLoading">
       <a-form-model
         ref="form"
@@ -34,15 +33,19 @@
           label="数据库类型"
           prop="databaseType"
         >
-          <a-select v-model="form.databaseType" :disabled="showable">
-            <a-select-option key="mysql">MySQL</a-select-option>
-          </a-select>
+          <a-select
+            v-model="form.databaseType"
+            :disabled="showable"
+            :options="databaseTypes"
+            @change="changeDatabaseType"
+            placeholder="请选择数据库类型"
+          />
         </a-form-model-item>
         <a-form-model-item
           label="驱动类"
           prop="dbDriver"
         >
-          <a-input v-model="form.dbDriver" disabled/>
+          <a-input v-model="form.dbDriver" placeholder="请输入驱动类"/>
         </a-form-model-item>
         <a-form-model-item
           label="数据库地址"
@@ -50,12 +53,6 @@
         >
           <a-input v-model="form.dbUrl" :disabled="showable" placeholder="请输入数据库地址"/>
         </a-form-model-item>
-        <a-form-model-item
-          label="数据库名称"
-          prop="dbName"
-        >
-          <a-input v-model="form.dbName" :disabled="showable" placeholder="请输入数据库名称"/>
-        </a-form-model-item>
         <a-form-model-item
           label="用户名"
           prop="dbUsername"
@@ -66,7 +63,7 @@
           label="密码"
           prop="dbPassword"
         >
-          <a-input v-model="form.dbPassword" :disabled="showable" placeholder="请输入数据库密码"/>
+          <a-input-password v-model="form.dbPassword" :disabled="showable" placeholder="请输入数据库密码"/>
         </a-form-model-item>
         <a-form-model-item
           label="备注"
@@ -76,16 +73,25 @@
         </a-form-model-item>
       </a-form-model>
     </a-spin>
-    <template #footer>
+    <div class="drawer-button" >
       <a-button key="cancel" @click="handleCancel">取消</a-button>
+      <a-button v-if="addable" preIcon="ant-design:api-outlined" @click="testConnectionInfo">测试连接</a-button>
       <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
-    </template>
-  </a-modal>
+    </div>
+  </a-drawer>
 </template>
 
 <script>
 import { FormMixin } from '@/mixins/FormMixin'
-import { get, add, update } from '@/api/develop/dynamicDataSource'
+import {
+  get,
+  add,
+  update,
+  databaseTypeMap,
+  databaseTypes,
+  existsByCodeNotId,
+  existsByCode, testConnection
+} from '@/api/develop/dynamicDataSource'
 export default {
   name: 'DynamicDataSourceEdit',
   mixins: [FormMixin],
@@ -95,38 +101,27 @@ export default {
         id: null,
         code: null,
         name: null,
-        databaseType: 'mysql',
-        dbDriver: 'com.mysql.cj.jdbc.Driver',
+        databaseType: undefined,
+        dbDriver: undefined,
         dbUrl: null,
         dbName: null,
         dbUsername: null,
         dbPassword: null,
         remark: null
       },
+      databaseTypes,
+      databaseTypeMap,
       rules: {
-        code: [ { required: true, message: '请输入' } ],
-        name: [ { required: true, message: '请输入' } ],
-        databaseType: [ { required: true, message: '请选择' } ],
-        dbDriver: [ { required: true, message: '请输入' } ],
-        dbUrl: [ { required: true, message: '请输入' } ],
-        dbName: [ { required: true, message: '请输入' } ],
-        dbUsername: [ { required: true, message: '请输入' } ],
-        dbPassword: [ { required: true, message: '请输入' } ],
-        remark: []
-      }
-    }
-  },
-  watch: {
-    'form.databaseType': function (val) {
-      console.log(val)
-      switch (val) {
-        case 'mysql': {
-          this.form.dbDriver = 'com.mysql.cj.jdbc.Driver'
-          break
-        }
-        default: {
-          this.form.dbDriver = ''
-        }
+        code: [
+          { required: true, message: '编码不可为空' },
+          { validator: this.validateCode, trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '名称不可为空' }],
+        databaseType: [{ required: true, message: '请选择数据库类型' }],
+        dbDriver: [{ required: true, message: '驱动不可为空' }],
+        dbUrl: [{ required: true, message: '数据源地址不可为空' }],
+        dbUsername: [{ required: true, message: '用户名不可为空' }],
+        dbPassword: [{ required: true, message: '密码不可为空' }]
       }
     }
   },
@@ -166,6 +161,40 @@ export default {
         }
       })
     },
+    // 验证编码
+    async validateCode (rule, value, callback) {
+      const { code, id } = this.form
+      let res
+      if (this.type === 'edit') {
+        res = await existsByCodeNotId(code, id)
+      } else {
+        res = await existsByCode(code)
+      }
+      if (!res.data) {
+        callback()
+      } else {
+        callback('该编码已存在!')
+      }
+    },
+    // 测试连接
+    async testConnectionInfo () {
+      this.$refs.form.validateField(['dbDriver', 'dbUrl', 'dbUsername', 'dbPassword'])
+      const { dbDriver, dbUrl, dbUsername, dbPassword } = this.form
+      if (dbDriver && dbUrl && dbUsername && dbPassword) {
+        const { data } = await testConnection(this.form)
+        if (data) {
+          this.$message.warn(data)
+        } else {
+          this.$message.success('连接成功')
+        }
+      }
+    },
+    // 数据源类型变换回调
+    changeDatabaseType () {
+      const e = this.form.databaseType
+      this.form.dbDriver = databaseTypeMap[e]?.dbDriver
+      this.form.dbUrl = databaseTypeMap[e]?.dbUrl
+    },
     /**
      * 重置表单
      */
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
index 2feb18c..0572366 100644
--- a/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
@@ -3,7 +3,8 @@
     <b-query
       v-model="queryParam"
       :fields="fields"
-      :default-item-md="8"
+      :default-item-count="3"
+      :default-item-md="6"
       @query="query"
       @reset="() => queryParam = {}"
     />
@@ -13,7 +14,10 @@
       :refresh="{query: init}"
     >
       <template v-slot:buttons>
-        <a-button type="primary" icon="plus" @click="add">新建</a-button>
+        <a-space>
+          <a-button type="primary" icon="plus" @click="add">新建</a-button>
+          <a-button @click="showDatabaseList">数据源列表</a-button>
+        </a-space>
       </template>
     </vxe-toolbar>
     <vxe-table
@@ -22,30 +26,42 @@
       :data="tableData"
     >
       <vxe-column type="seq" title="序号" width="60" />
-      <vxe-column field="code" title="编码"/>
-      <vxe-column field="name" title="名称"/>
-      <vxe-column field="databaseType" title="类型"/>
-      <vxe-column field="dbDriver" title="驱动类"/>
-      <vxe-column field="dbName" title="数据库名称"/>
-      <vxe-column field="remark" title="备注"/>
+      <vxe-column field="code" title="编码" />
+      <vxe-column field="name" title="名称" />
+      <vxe-column field="databaseType" title="数据库类型">
+        <template #default="{ row }">
+          <a-tag> {{ dictConvert('DatabaseType', row.databaseType) }} </a-tag>
+        </template>
+      </vxe-column>
+      <vxe-column field="dbDriver" title="驱动类" />
+      <vxe-column field="dbUrl" title="连接地址" />
+      <vxe-column field="dbUsername" title="用户名" />
+      <vxe-column field="remark" title="备注" />
       <vxe-column field="createTime" title="创建时间" />
-      <vxe-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>
+      <vxe-column fixed="right" width="160" :showOverflow="false" title="操作">
+        <template #default="{ row }">
+          <a href="javascript:" @click="show(row)">查看</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" @click="edit(row)">编辑</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down" />
+            </a>
+            <template #overlay>
+              <a-menu>
+                <a-menu-item>
+                  <a href="javascript:" @click="testConnectionInfo(row)">测试连接</a>
+                </a-menu-item>
+                <a-menu-item>
+                  <a href="javascript:" @click="addDynamicDataSource(row)">应用</a>
+                </a-menu-item>
+                <a-menu-item>
+                  <a href="javascript:" style="color: red" @click="remove(row)">删除</a>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
         </template>
       </vxe-column>
     </vxe-table>
@@ -59,58 +75,112 @@
     <dynamic-data-source-edit
       ref="dynamicDataSourceEdit"
       @ok="handleOk"/>
+    <data-source-list ref="dataSourceList"/>
   </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
+import {
+  page,
+  del,
+  testConnectionById,
+  existsByDataSourceKey,
+  addDynamicDataSourceById, databaseTypes
+} from '@/api/develop/dynamicDataSource'
+import DataSourceList from './DataSourceList'
+import DynamicDataSourceEdit from './DynamicDataSourceEdit'
+import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
+export default {
+  name: 'DynamicDataSourceList',
+  components: {
+    DynamicDataSourceEdit,
+    DataSourceList
+  },
+  mixins: [TableMixin],
+  data () {
+    return {
+      fields: [
+        { field: 'code', type: STRING, name: '编码', placeholder: '请输入数据源编码' },
+        { field: 'name', type: STRING, name: '名称', placeholder: '请输入数据源名称' },
+        {
+          field: 'databaseType',
+          type: 'list',
+          name: '数据库类型',
+          selectList: databaseTypes,
+          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')
+    },
+    // 查看数据源列表
+    showDatabaseList () {
+      this.$refs.dataSourceList.show()
     },
-    mixins: [TableMixin],
-    data () {
-      return {
-        fields: [
-          { field: 'code', type: STRING, name: '编码', placeholder: '请输入数据源编码' },
-          { field: 'name', type: STRING, name: '名称', placeholder: '请输入数据源名称' }
-        ]
+    // 测试连接
+    async testConnectionInfo(record) {
+      const { data } = await testConnectionById(record.id)
+      if (data) {
+        this.$message.warn(data)
+      } else {
+        this.$message.success('连接成功')
       }
     },
-    methods: {
-      init () {
-        this.loading = true
-        page({
-          ...this.queryParam,
-          ...this.pages
-        }).then(res => {
-          this.pageQueryResHandel(res, this)
+    // 应用到系统中
+    async addDynamicDataSource(record) {
+      const { data } = await existsByDataSourceKey(record.code)
+      if (data) {
+        this.$confirm({
+          title: '重新添加',
+          content: '该数据源配置已经应用，是否进行更新',
+          onOk: () => {
+            addDynamicDataSourceById(record.id).then(() => {
+              this.$message.success('更新成功')
+            })
+          }
         })
-      },
-      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()
+      } else {
+        this.$confirm({
+          title: '添加',
+          content: '是否将该数据源配置应用到系统中',
+          onOk: () => {
+            addDynamicDataSourceById(record.id).then(() => {
+              this.$message.success('应用成功')
+            })
+          },
         })
       }
     },
-    created () {
-      this.init()
+    remove (record) {
+      del(record.id).then(_ => {
+        this.$message.info('删除成功')
+        this.init()
+      })
     }
+  },
+  created () {
+    this.init()
   }
+}
 </script>
 
 <style scoped>
-- 
Gitee


From ac1dba4c41d283d3d9e9af57c579b345aef423d9 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Mar 2023 22:39:14 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat=20=E5=A4=A7=E5=B1=8F=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../develop/report/ProjectInfoList.vue        | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
index 8c3fdfa..db65039 100644
--- a/src/views/modules/develop/report/ProjectInfoList.vue
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -13,7 +13,10 @@
       :refresh="{query: init}"
     >
       <template v-slot:buttons>
-        <a-button type="primary" icon="plus" @click="add">新建</a-button>
+        <a-space>
+          <a-button type="primary" icon="plus" @click="add">新建</a-button>
+          <a-button icon="sync" @click="loginGoView">一键登录大屏</a-button>
+        </a-space>
       </template>
     </vxe-toolbar>
     <vxe-table
@@ -108,6 +111,8 @@ import {
 } from '@/api/develop/projectInfo'
 import ProjectInfoEdit from './ProjectInfoEdit'
 import { TableMixin } from '@/mixins/TableMixin'
+import storage from 'store'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 export default {
   name: 'ProjectInfoList',
   components: {
@@ -248,6 +253,18 @@ export default {
           })
         }
       })
+    },
+    // 删除
+    loginGoView (record) {
+      this.$confirm({
+        title: '一键登录',
+        content: '是否一键登录可视化大屏平台?',
+        okText: '登录',
+        onOk: () => {
+          const token = storage.get(ACCESS_TOKEN)
+          this.$message.info('等待下一个版本实装')
+        }
+      })
     }
   },
   created () {
-- 
Gitee


From 05868b3f8727099efa763bc035a4693f219b7af5 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Mar 2023 22:40:04 +0800
Subject: [PATCH 4/7] =?UTF-8?q?style=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/bpm/model/BpmModelList.vue                | 2 +-
 src/views/modules/bpm/model/{ => node}/BpmModelNodeCode.js  | 0
 src/views/modules/bpm/model/{ => node}/BpmModelNodeEdit.vue | 4 ++--
 src/views/modules/bpm/model/{ => node}/BpmModelNodeList.vue | 2 +-
 src/views/modules/office/applyshow/TaskOperate.vue          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/views/modules/bpm/model/{ => node}/BpmModelNodeCode.js (100%)
 rename src/views/modules/bpm/model/{ => node}/BpmModelNodeEdit.vue (99%)
 rename src/views/modules/bpm/model/{ => node}/BpmModelNodeList.vue (98%)

diff --git a/src/views/modules/bpm/model/BpmModelList.vue b/src/views/modules/bpm/model/BpmModelList.vue
index 1c8d0a6..fd78b6e 100644
--- a/src/views/modules/bpm/model/BpmModelList.vue
+++ b/src/views/modules/bpm/model/BpmModelList.vue
@@ -103,7 +103,7 @@ import { TableMixin } from '@/mixins/TableMixin'
 import { copy, del, page, publish, verifyModel } from '@/api/bpm/model'
 import BpmModelEdit from './BpmModelEdit'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
-import BpmModelNodeList from './BpmModelNodeList'
+import BpmModelNodeList from './node/BpmModelNodeList.vue'
 import BpmModeler from './BpmModeler'
 
 export default {
diff --git a/src/views/modules/bpm/model/BpmModelNodeCode.js b/src/views/modules/bpm/model/node/BpmModelNodeCode.js
similarity index 100%
rename from src/views/modules/bpm/model/BpmModelNodeCode.js
rename to src/views/modules/bpm/model/node/BpmModelNodeCode.js
diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/node/BpmModelNodeEdit.vue
similarity index 99%
rename from src/views/modules/bpm/model/BpmModelNodeEdit.vue
rename to src/views/modules/bpm/model/node/BpmModelNodeEdit.vue
index 19882e5..2962103 100644
--- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue
+++ b/src/views/modules/bpm/model/node/BpmModelNodeEdit.vue
@@ -160,8 +160,8 @@
 <script>
 import { FormMixin } from '@/mixins/FormMixin'
 import { get, add, update } from '@/api/bpm/modelNode'
-import BUserSelectModal from '@/components/Bootx/UserSelectModal/BUserSelectModal'
-import BRoleSelectModal from '@/components/Bootx/RoleSelectModal/BRoleSelectModal'
+import BUserSelectModal from '@/components/Bootx/UserSelectModal/BUserSelectModal.vue'
+import BRoleSelectModal from '@/components/Bootx/RoleSelectModal/BRoleSelectModal.vue'
 import {
   DEPT_LEADER,
   DEPT_LEADER_OPTION,
diff --git a/src/views/modules/bpm/model/BpmModelNodeList.vue b/src/views/modules/bpm/model/node/BpmModelNodeList.vue
similarity index 98%
rename from src/views/modules/bpm/model/BpmModelNodeList.vue
rename to src/views/modules/bpm/model/node/BpmModelNodeList.vue
index 8888cb2..89d8599 100644
--- a/src/views/modules/bpm/model/BpmModelNodeList.vue
+++ b/src/views/modules/bpm/model/node/BpmModelNodeList.vue
@@ -77,7 +77,7 @@
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
 import { listByModelId, del, sync } from '@/api/bpm/modelNode'
-import BpmModelNodeEdit from './BpmModelNodeEdit'
+import BpmModelNodeEdit from './BpmModelNodeEdit.vue'
 
 export default {
   name: 'BpmModelNodeList',
diff --git a/src/views/modules/office/applyshow/TaskOperate.vue b/src/views/modules/office/applyshow/TaskOperate.vue
index 24f2ce7..b09ff22 100644
--- a/src/views/modules/office/applyshow/TaskOperate.vue
+++ b/src/views/modules/office/applyshow/TaskOperate.vue
@@ -119,7 +119,7 @@
 import { FormMixin } from '@/mixins/FormMixin'
 import { approve } from '@/api/bpm/task'
 import { getNextNodes, listByModelId } from '@/api/bpm/modelNode'
-import { SELECT } from '@/views/modules/bpm/model/BpmModelNodeCode'
+import { SELECT } from '@/views/modules/bpm/model/node/BpmModelNodeCode'
 import BUserSelectModal from '@/components/Bootx/UserSelectModal/BUserSelectModal'
 import { getBackNodes } from '@/api/bpm/instance'
 
-- 
Gitee


From bdcaaae8540ae833bf7746e6b1c1e84bc960de4d Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Fri, 17 Mar 2023 17:51:02 +0800
Subject: [PATCH 5/7] =?UTF-8?q?perf=20=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |  2 +-
 src/assets/css/components.less              |  2 +-
 src/components/Bpmn/BpmData.js              |  6 +--
 src/components/Bpmn/WorkflowBpmnModeler.vue |  1 -
 src/views/modules/bpm/model/BpmModeler.vue  |  8 +--
 yarn.lock                                   | 60 ++++++++++-----------
 6 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index d57618d..404f581 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@wangeditor/plugin-md": "^1.0.0",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
-    "bpmn-js": "^7.5.0",
+    "bpmn-js": "^8.9.0",
     "core-js": "^3.24.0",
     "cron-parser": "^4.5.0",
     "echarts": "^5.3.3",
diff --git a/src/assets/css/components.less b/src/assets/css/components.less
index dd003d1..f4a5c6d 100644
--- a/src/assets/css/components.less
+++ b/src/assets/css/components.less
@@ -53,7 +53,7 @@
 }
 /* wangEditor end */
 
-/* vxe end */
+/* vxe start */
 // vxe模态框样式
 .vxe-modal--wrapper{
   // 层级与保持antdv一致
diff --git a/src/components/Bpmn/BpmData.js b/src/components/Bpmn/BpmData.js
index 6900fa0..e634b32 100644
--- a/src/components/Bpmn/BpmData.js
+++ b/src/components/Bpmn/BpmData.js
@@ -2,12 +2,12 @@
  * 存储流程设计相关参数
  */
 export default class BpmData {
-  constructor() {
+  constructor () {
     this.controls = [] // 设计器控件
     this.init()
   }
 
-  init() {
+  init () {
     this.controls = [
       {
         action: 'hand-tool',
@@ -78,7 +78,7 @@ export default class BpmData {
   }
 
   //  获取控件配置信息
-  getControl(action) {
+  getControl (action) {
     const result = this.controls.filter(item => item.action === action)
     return result[0] || {}
   }
diff --git a/src/components/Bpmn/WorkflowBpmnModeler.vue b/src/components/Bpmn/WorkflowBpmnModeler.vue
index 47aee63..dff7f14 100644
--- a/src/components/Bpmn/WorkflowBpmnModeler.vue
+++ b/src/components/Bpmn/WorkflowBpmnModeler.vue
@@ -135,7 +135,6 @@
       </template>
 
     </a-modal>
-
   </div>
 </template>
 
diff --git a/src/views/modules/bpm/model/BpmModeler.vue b/src/views/modules/bpm/model/BpmModeler.vue
index 4423ec6..d2ee3ec 100644
--- a/src/views/modules/bpm/model/BpmModeler.vue
+++ b/src/views/modules/bpm/model/BpmModeler.vue
@@ -6,7 +6,6 @@
     :esc-closable="false"
     :show-footer="false"
     :show-header="isView"
-    @close="handleCancel"
   >
     <workflow-bpmn-modeler
       :xml="modelEditorXml"
@@ -45,7 +44,6 @@ export default {
         this.modelEditorXml = this.bpmModel.modelEditorXml
         this.isEdit = this.bpmModel.publish !== this.PUBLISHED
         this.title = `查看 ${this.bpmModel.name} 流程图`
-        this.confirmLoading = false
       })
     },
     /**
@@ -58,16 +56,14 @@ export default {
         okText: '确定',
         cancelText: '取消',
         onOk: async () => {
-          this.confirmLoading = true
           await uploadBpmn(this.bpmModel.id, data.xml)
-          this.confirmLoading = false
-          this.$emit('ok')
+          this.$message.success('保存成功')
           this.visible = false
         }
       })
     },
     cancel () {
-      if (this.isEdit){
+      if (this.isEdit) {
         this.$confirm({
           title: '警告',
           content: '关闭后后将不对编辑的内容进行保存',
diff --git a/yarn.lock b/yarn.lock
index 16c5153..23b139e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2463,15 +2463,15 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bpmn-js@^7.5.0:
-  version "7.5.0"
-  resolved "https://registry.npmmirror.com/bpmn-js/-/bpmn-js-7.5.0.tgz#0e4675acdbdff676db859f8cb7ec395d20e7bbd8"
-  integrity sha512-0ANaE6Bikg1GmkcvO7RK0MQPX+EKYKBc+q7OWk39/16NcCdNZ/4UiRcCr9n0u1VUCIDsSU/jJ79TIZFnV5CNjw==
+bpmn-js@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.npmmirror.com/bpmn-js/-/bpmn-js-8.10.0.tgz#e8500a0610abc691b47334afbad355df34533bf7"
+  integrity sha512-NozeOi01qL0ZdVq8+5hWZcikyEvgrP1yzCBqlhSufJdHFsnEMBCwn2bJJ0B/6JgX+IBwy1sk/Uw+Ds8rQ8vfrw==
   dependencies:
-    bpmn-moddle "^7.0.4"
+    bpmn-moddle "^7.1.2"
     css.escape "^1.5.1"
-    diagram-js "^6.8.2"
-    diagram-js-direct-editing "^1.6.1"
+    diagram-js "^7.8.2"
+    diagram-js-direct-editing "^1.6.3"
     ids "^1.0.0"
     inherits "^2.0.4"
     min-dash "^3.5.2"
@@ -2479,7 +2479,7 @@ bpmn-js@^7.5.0:
     object-refs "^0.3.0"
     tiny-svg "^2.2.2"
 
-bpmn-moddle@^7.0.4:
+bpmn-moddle@^7.1.2:
   version "7.1.3"
   resolved "https://registry.npmmirror.com/bpmn-moddle/-/bpmn-moddle-7.1.3.tgz#5b4592001e8f23dbdb18c557531e06489462bf42"
   integrity sha512-ZcBfw0NSOdYTSXFKEn7MOXHItz7VfLZTrFYKO8cK6V8ZzGjCcdiLIOiw7Lctw1PJsihhLiZQS8Htj2xKf+NwCg==
@@ -3739,33 +3739,33 @@ detect-node@^2.0.4:
   resolved "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-diagram-js-direct-editing@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.npmmirror.com/diagram-js-direct-editing/-/diagram-js-direct-editing-1.7.0.tgz#97a331158ef6466078831b3af8f78a5eb653e83b"
-  integrity sha512-ZfTLF4hdWr7NSoruwxGvVmu7aVaUjWRXjwgK5dx58LbXAsNjBS3Ap7zjVuGxjWUpCZ/MMwyZ00lpTHPH2P7BFQ==
+diagram-js-direct-editing@^1.6.3:
+  version "1.8.0"
+  resolved "https://registry.npmmirror.com/diagram-js-direct-editing/-/diagram-js-direct-editing-1.8.0.tgz#7a178cd9203f262842a3e0023f9644e04a157858"
+  integrity sha512-B4Xj+PJfgBjbPEzT3uZQEkZI5xHFB0Izc+7BhDFuHidzrEMzQKZrFGdA3PqfWhReHf3dp+iB6Tt11G9eGNjKMw==
   dependencies:
     min-dash "^3.5.2"
     min-dom "^3.1.3"
 
-diagram-js@^6.8.2:
-  version "6.8.2"
-  resolved "https://registry.npmmirror.com/diagram-js/-/diagram-js-6.8.2.tgz#d3c37915c62c0cc5d95bc533098c8a35b38e67be"
-  integrity sha512-5EKYHjW2mmGsn9/jSenSkm8cScK5sO9eETBRQNIIzgZjxBDJn6eX964L2d7/vrAW9SeuijGUsztL9+NUinSsNg==
+diagram-js@^7.8.2:
+  version "7.9.0"
+  resolved "https://registry.npmmirror.com/diagram-js/-/diagram-js-7.9.0.tgz#2ec986086f066f0d9d622c214df6c144ff42601f"
+  integrity sha512-o1yUtX5TXV1pmpevP55gxU/AEG6nCidOXGs/HLuxNXG0zMZ3jQta7kMqRxTK93rNw/XuHmP1eMOwdvdJ2RP5qA==
   dependencies:
     css.escape "^1.5.1"
-    didi "^4.0.0"
+    didi "^5.2.1"
     hammerjs "^2.0.1"
-    inherits "^2.0.1"
-    min-dash "^3.5.0"
-    min-dom "^3.1.2"
+    inherits "^2.0.4"
+    min-dash "^3.5.2"
+    min-dom "^3.1.3"
     object-refs "^0.3.0"
-    path-intersection "^2.2.0"
-    tiny-svg "^2.2.1"
+    path-intersection "^2.2.1"
+    tiny-svg "^2.2.2"
 
-didi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmmirror.com/didi/-/didi-4.0.0.tgz#2b89d892a67fd3777f7642d3bf06697b69e9b622"
-  integrity sha512-AzMElh8mCHOPWPCWfGjoJRla31fMXUT6+287W5ef3IPmtuBcyG9+MkFS7uPP6v3t2Cl086KwWfRB9mESa0OsHQ==
+didi@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmmirror.com/didi/-/didi-5.2.1.tgz#1a0b1336be8baa0b068a72036eedd9fb94135bff"
+  integrity sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -6588,12 +6588,12 @@ mimic-fn@^2.1.0:
   resolved "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-min-dash@^3.0.0, min-dash@^3.5.0, min-dash@^3.5.2, min-dash@^3.8.1:
+min-dash@^3.0.0, min-dash@^3.5.2, min-dash@^3.8.1:
   version "3.8.1"
   resolved "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz#09a8bd8a041d65eec4732042cde9cb24a6e84b0d"
   integrity sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg==
 
-min-dom@^3.1.2, min-dom@^3.1.3, min-dom@^3.2.1:
+min-dom@^3.1.3, min-dom@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz#c272a814397d8bfe97edd12670e7ac34123c043f"
   integrity sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA==
@@ -7387,7 +7387,7 @@ path-exists@^4.0.0:
   resolved "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-intersection@^2.2.0:
+path-intersection@^2.2.1:
   version "2.2.1"
   resolved "https://registry.npmmirror.com/path-intersection/-/path-intersection-2.2.1.tgz#8476b75fefb7ac402f810d304e0eb0c080c11fe7"
   integrity sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==
@@ -9300,7 +9300,7 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.npmmirror.com/tiny-emitter/download/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM=
 
-tiny-svg@^2.2.1, tiny-svg@^2.2.2, tiny-svg@^2.2.4:
+tiny-svg@^2.2.2, tiny-svg@^2.2.4:
   version "2.2.4"
   resolved "https://registry.npmmirror.com/tiny-svg/-/tiny-svg-2.2.4.tgz#8d4a16bd2c4644c8444fd3c2ece91db7631cfb35"
   integrity sha512-NOi39lBknf4UdDEahNkbEAJnzhu1ZcN2j75IS2vLRmIhsfxdZpTChfLKBcN1ShplVmPIXJAIafk6YY5/Aa80lQ==
-- 
Gitee


From 220c1e4dad25ef1844f8b1d9bda955100f332bc8 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 21 Mar 2023 20:28:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix=20=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bpmn/WorkflowBpmnModeler.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Bpmn/WorkflowBpmnModeler.vue b/src/components/Bpmn/WorkflowBpmnModeler.vue
index dff7f14..8e45ebd 100644
--- a/src/components/Bpmn/WorkflowBpmnModeler.vue
+++ b/src/components/Bpmn/WorkflowBpmnModeler.vue
@@ -84,7 +84,7 @@
             width="400px"
             placement="right"
             :closable="false"
-            :visible="panelVisible && panelExist"
+            v-show="panelVisible && panelExist"
             :get-container="false"
             :wrap-style="{ position: 'absolute' }"
           >
-- 
Gitee


From 80001148e559b7b3e6641a8321824d1fec0234e5 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 28 Mar 2023 19:58:48 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=20=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bpmn/WorkflowBpmnModeler.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Bpmn/WorkflowBpmnModeler.vue b/src/components/Bpmn/WorkflowBpmnModeler.vue
index 8e45ebd..9016647 100644
--- a/src/components/Bpmn/WorkflowBpmnModeler.vue
+++ b/src/components/Bpmn/WorkflowBpmnModeler.vue
@@ -75,7 +75,7 @@
         <a-layout-content style="padding: 0;margin-top: 10px;">
           <div ref="canvas" class="canvas" />
         </a-layout-content>
-        <a-layout-sider class="sider" style="background: #fff; min-width: 40px; width: 40px;max-width: 40px;border-left: 1px solid #eeeeee;box-shadow: 0 0 8px #cccccc;">
+        <a-layout-sider style="background: #fff; min-width: 40px; width: 40px;max-width: 40px;border-left: 1px solid #eeeeee;box-shadow: 0 0 8px #cccccc;">
           <div style="width: 100%;text-align: center" @click="panelVisible = true">
             <i class="iconfont icon-left-graph" style="font-size: 32px" v-if="panelExist"></i>
           </div>
@@ -83,8 +83,9 @@
           <a-drawer
             width="400px"
             placement="right"
+            v-show="panelVisible"
+            :visible="panelVisible && panelExist"
             :closable="false"
-            v-show="panelVisible && panelExist"
             :get-container="false"
             :wrap-style="{ position: 'absolute' }"
           >
-- 
Gitee