From e9f929c2da396f89573f03d13411e7cb96c49d78 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Feb 2023 21:48:26 +0800
Subject: [PATCH 01/11] =?UTF-8?q?style=20=E6=95=B0=E6=8D=AE=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitor/data/DataVersionLog.api.ts        |  42 ++-----
 .../monitor/data/DataVersionLogEdit.vue       | 113 ------------------
 .../monitor/data/DataVersionLogInfo.vue       |  82 +++++++++++++
 .../monitor/data/DataVersionLogList.vue       |  55 +++------
 .../monitor/operate/OperateLogInfo.vue        |   1 -
 5 files changed, 106 insertions(+), 187 deletions(-)
 delete mode 100644 src/views/modules/monitor/data/DataVersionLogEdit.vue
 create mode 100644 src/views/modules/monitor/data/DataVersionLogInfo.vue

diff --git a/src/views/modules/monitor/data/DataVersionLog.api.ts b/src/views/modules/monitor/data/DataVersionLog.api.ts
index ff73a43..6e00442 100644
--- a/src/views/modules/monitor/data/DataVersionLog.api.ts
+++ b/src/views/modules/monitor/data/DataVersionLog.api.ts
@@ -22,36 +22,6 @@ export const get = (id) => {
   })
 }
 
-/**
- * 添加
- */
-export const add = (obj: DataVersionLog) => {
-  return defHttp.post({
-    url: '/log/dataVersion/add',
-    data: obj,
-  })
-}
-
-/**
- * 更新
- */
-export const update = (obj: DataVersionLog) => {
-  return defHttp.post({
-    url: '/log/dataVersion/update',
-    data: obj,
-  })
-}
-
-/**
- * 删除
- */
-export const del = (id) => {
-  return defHttp.delete({
-    url: '/log/dataVersion/delete',
-    params: { id },
-  })
-}
-
 /**
  * 查询全部
  */
@@ -65,10 +35,16 @@ export const findAll = () => {
  * 数据版本日志
  */
 export interface DataVersionLog extends BaseEntity {
+  // 表名称
+  tableName?: string
   // 数据名称
-  dataName: string
+  dataName?: string
   // 数据主键
-  dataId: string
+  dataId?: string
   // 数据内容
-  dataContent: string
+  dataContent?: string
+  // 本次变动的数据内容
+  changeContent?: string
+  // 数据版本
+  version?: number
 }
diff --git a/src/views/modules/monitor/data/DataVersionLogEdit.vue b/src/views/modules/monitor/data/DataVersionLogEdit.vue
deleted file mode 100644
index ca845b1..0000000
--- a/src/views/modules/monitor/data/DataVersionLogEdit.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <basic-modal
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :width="modalWidth"
-    :title="title"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
-        <a-input v-model:value="form.id" :disabled="showable" />
-      </a-form-item>
-      <a-form-item label="数据名称" name="dataName">
-        <a-input v-model:value="form.dataName" :disabled="showable" placeholder="请输入数据名称" />
-      </a-form-item>
-      <a-form-item label="数据主键" name="dataId">
-        <a-input v-model:value="form.dataId" :disabled="showable" placeholder="请输入数据主键" />
-      </a-form-item>
-      <a-form-item label="数据内容" name="dataContent">
-        <a-input v-model:value="form.dataContent" :disabled="showable" placeholder="请输入数据内容" />
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-space>
-        <a-button key="cancel" @click="handleCancel">取消</a-button>
-        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
-      </a-space>
-    </template>
-  </basic-modal>
-</template>
-
-<script lang="ts" setup>
-  import { nextTick, reactive } from 'vue'
-  import { $ref } from 'vue/macros'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { add, get, update, DataVersionLog } from './DataVersionLog.api'
-  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { FormEditType } from '/@/enums/formTypeEnum'
-  import { BasicModal } from '/@/components/Modal'
-
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  // 表单
-  const formRef = $ref<FormInstance>()
-  let form = $ref({
-    id: null,
-    dataName: null,
-    dataId: null,
-    dataContent: null,
-  } as DataVersionLog)
-  // 校验
-  const rules = reactive({} as Record<string, Rule[]>)
-  // 事件
-  const emits = defineEmits(['ok'])
-  // 入口
-  function init(id, editType: FormEditType) {
-    initFormEditType(editType)
-    resetForm()
-    getInfo(id, editType)
-  }
-  // 获取信息
-  function getInfo(id, editType: FormEditType) {
-    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
-      confirmLoading.value = true
-      get(id).then(({ data }) => {
-        form = data
-        confirmLoading.value = false
-      })
-    } else {
-      confirmLoading.value = false
-    }
-  }
-  // 保存
-  function handleOk() {
-    formRef?.validate().then(async () => {
-      confirmLoading.value = true
-      if (formEditType.value === FormEditType.Add) {
-        await add(form)
-      } else if (formEditType.value === FormEditType.Edit) {
-        await update(form)
-      }
-      confirmLoading.value = false
-      handleCancel()
-      emits('ok')
-    })
-  }
-
-  // 重置表单的校验
-  function resetForm() {
-    nextTick(() => {
-      formRef?.resetFields()
-    })
-  }
-  defineExpose({
-    init,
-  })
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/modules/monitor/data/DataVersionLogInfo.vue b/src/views/modules/monitor/data/DataVersionLogInfo.vue
new file mode 100644
index 0000000..6f6218e
--- /dev/null
+++ b/src/views/modules/monitor/data/DataVersionLogInfo.vue
@@ -0,0 +1,82 @@
+<template>
+  <basic-modal
+    v-bind="$attrs"
+    title="查看"
+    :width="960"
+    :loading="confirmLoading"
+    :visible="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
+        <a-descriptions-item label="表名称">
+          {{ form.tableName }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据名称">
+          {{ form.dataName }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据主键">
+          {{ form.dataId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据版本">
+          {{ form.version }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据内容">
+          <json-preview :data="JSON.parse(form.dataContent || '{}')" />
+        </a-descriptions-item>
+        <a-descriptions-item label="变动内容">
+          <json-preview :data="JSON.parse(form.changeContent || '{}')" />
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
+    <template #footer>
+      <a-button key="cancel" @click="handleCancel">取消</a-button>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import { $ref } from 'vue/macros'
+  import useFormEdit from '/@/hooks/bootx/useFormEdit'
+  import JsonPreview from '/@/components/CodeEditor/src/json-preview/JsonPreview.vue'
+  import { get, DataVersionLog } from './DataVersionLog.api'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { FormEditType } from '/@/enums/formTypeEnum'
+  import { BasicModal } from '/@/components/Modal'
+
+  const {
+    initFormEditType,
+    handleCancel,
+    search,
+    labelCol,
+    wrapperCol,
+    modalWidth,
+    title,
+    confirmLoading,
+    visible,
+    editable,
+    showable,
+    formEditType,
+  } = useFormEdit()
+  // 表单
+  let form = $ref<DataVersionLog>({})
+  // 入口
+  function init(id) {
+    visible.value = true
+    getInfo(id)
+  }
+  // 获取信息
+  function getInfo(id) {
+    get(id).then(({ data }) => {
+      form = data
+      confirmLoading.value = false
+    })
+  }
+
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/modules/monitor/data/DataVersionLogList.vue b/src/views/modules/monitor/data/DataVersionLogList.vue
index 3b30ac6..71ee376 100644
--- a/src/views/modules/monitor/data/DataVersionLogList.vue
+++ b/src/views/modules/monitor/data/DataVersionLogList.vue
@@ -4,32 +4,19 @@
       <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ query: queryPage }">
-        <template #buttons>
-          <a-space>
-            <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
-          </a-space>
-        </template>
-      </vxe-toolbar>
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ query: queryPage }" />
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" width="60" />
+        <vxe-column field="tableName" title="表名称" />
         <vxe-column field="dataName" title="数据名称" />
         <vxe-column field="dataId" title="数据主键" />
-        <vxe-column field="dataContent" title="数据内容" />
+        <vxe-column field="version" title="数据版本" />
         <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+        <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
           <template #default="{ 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-column>
       </vxe-table>
@@ -47,23 +34,27 @@
 </template>
 
 <script lang="ts" setup>
-  import { onMounted, ref } from 'vue'
+  import { onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { del, page } from './DataVersionLog.api'
+  import { page } from './DataVersionLog.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
-  import DataVersionLogEdit from './DataVersionLogEdit.vue'
+  import DataVersionLogEdit from './DataVersionLogInfo.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { FormEditType } from '/@/enums/formTypeEnum'
   import { useMessage } from '/@/hooks/web/useMessage'
-  import { QueryField } from '/@/components/Bootx/Query/Query'
+  import { NUMBER, QueryField, STRING } from '/@/components/Bootx/Query/Query'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
   const { notification, createMessage } = useMessage()
 
   // 查询条件
-  const fields = [] as QueryField[]
+  const fields = [
+    { field: 'dataName', type: STRING, name: '数据名称', placeholder: '请输入数据名称' },
+    { field: 'tableName', type: STRING, name: '表名称', placeholder: '请输入表名称' },
+    { field: 'dataId', type: STRING, name: '数据主键', placeholder: '请输入数据主键' },
+    { field: 'version', type: NUMBER, name: '数据版本', placeholder: '请输入数据版本' },
+  ] as QueryField[]
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
@@ -87,25 +78,9 @@
       pageQueryResHandel(data)
     })
   }
-  // 新增
-  function add() {
-    dataVersionLogEdit.init(null, FormEditType.Add)
-  }
-  // 查看
-  function edit(record) {
-    dataVersionLogEdit.init(record.id, FormEditType.Edit)
-  }
   // 查看
   function show(record) {
-    dataVersionLogEdit.init(record.id, FormEditType.Show)
-  }
-
-  // 删除
-  function remove(record) {
-    del(record.id).then(() => {
-      createMessage.success('删除成功')
-    })
-    queryPage()
+    dataVersionLogEdit.init(record.id)
   }
 </script>
 
diff --git a/src/views/modules/monitor/operate/OperateLogInfo.vue b/src/views/modules/monitor/operate/OperateLogInfo.vue
index b19efc6..7179032 100644
--- a/src/views/modules/monitor/operate/OperateLogInfo.vue
+++ b/src/views/modules/monitor/operate/OperateLogInfo.vue
@@ -50,7 +50,6 @@
   import { $ref } from 'vue/macros'
   import { get, OperateLog } from './OperateLog.api'
   import { BasicModal } from '/@/components/Modal'
-  import Description from '/@/components/Description/src/Description.vue'
   import { DescItem } from '/@/components/Description'
   import { useDict } from '/@/hooks/bootx/useDict'
 
-- 
Gitee


From 1dc7b4b0facefa284a49892721f454d0ea5c78ef Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Feb 2023 22:00:45 +0800
Subject: [PATCH 02/11] =?UTF-8?q?style=20=E6=9F=A5=E8=AF=A2=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/design/components/antdv.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/design/components/antdv.less b/src/design/components/antdv.less
index ea76b0d..1c34dc7 100644
--- a/src/design/components/antdv.less
+++ b/src/design/components/antdv.less
@@ -14,7 +14,7 @@
 /* 分页列表搜索栏 */
 .page-query {
   .ant-form-item {
-    margin-bottom: 8px;
+    margin-bottom: 8px !important;
   }
   .ant-row {
     width: 100%;
-- 
Gitee


From c6364b2775ef783851e7f9784331253c09378354 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Feb 2023 22:31:41 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix=20=E6=9F=A5=E7=9C=8B=E6=88=96?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8Eid=E4=B8=BB=E9=94=AE=E4=B8=8D?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/bpm/model/BpmModelEdit.vue                 | 2 +-
 src/views/modules/bpm/model/BpmModelNodeEdit.vue             | 2 +-
 src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue  | 4 +++-
 src/views/modules/demo/data/perm/DataPermDemoEdit.vue        | 5 +----
 .../modules/demo/data/sensitive/DataSensitiveDemoEdit.vue    | 2 +-
 src/views/modules/demo/query/SuperQueryDemoEdit.vue          | 2 +-
 src/views/modules/develop/dynamicform/DynamicFormEdit.vue    | 2 +-
 .../modules/develop/dynamicsource/DynamicDataSourceEdit.vue  | 2 +-
 src/views/modules/notice/mail/MailConfigEdit.vue             | 2 +-
 src/views/modules/notice/template/MessageTemplateEdit.vue    | 2 +-
 .../modules/payment/channel/alipay/AlipayConfigEdit.vue      | 2 +-
 .../modules/payment/channel/wechat/WechatPayConfigEdit.vue   | 2 +-
 src/views/modules/system/client/ClientEdit.vue               | 2 +-
 src/views/modules/system/dept/DeptEdit.vue                   | 2 +-
 src/views/modules/system/dict/DictEdit.vue                   | 2 +-
 src/views/modules/system/dict/DictItemEdit.vue               | 2 +-
 src/views/modules/system/menu/ResourceEdit.vue               | 2 +-
 src/views/modules/system/param/SystemParamEdit.vue           | 2 +-
 src/views/modules/system/path/PermPathEdit.vue               | 2 +-
 src/views/modules/system/quartz/QuartzJobEdit.vue            | 2 +-
 src/views/modules/system/role/RoleEdit.vue                   | 2 +-
 src/views/modules/system/scope/DataScopeEdit.vue             | 2 +-
 .../modules/third/dingtalk/robot/DingRobotConfigEdit.vue     | 2 +-
 src/views/modules/third/wechat/menu/WechatMenuEdit.vue       | 2 +-
 .../modules/third/wechat/template/WechatTemplateEdit.vue     | 2 +-
 src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue | 2 +-
 26 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/bpm/model/BpmModelEdit.vue b/src/views/modules/bpm/model/BpmModelEdit.vue
index 1a173a7..f9d313a 100644
--- a/src/views/modules/bpm/model/BpmModelEdit.vue
+++ b/src/views/modules/bpm/model/BpmModelEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
index d169f47..d5e4027 100644
--- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue
+++ b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="任务节点id" name="nodeId">
diff --git a/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue b/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue
index 1900d58..dc706a6 100644
--- a/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue
+++ b/src/views/modules/demo/data/encrypt/DataEncryptDemoEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
@@ -105,7 +105,9 @@
   // 重置表单
   function resetForm() {
     nextTick(() => {
+      console.log(form)
       formRef?.resetFields()
+      console.log(form)
     })
   }
   defineExpose({
diff --git a/src/views/modules/demo/data/perm/DataPermDemoEdit.vue b/src/views/modules/demo/data/perm/DataPermDemoEdit.vue
index b7c97f9..d4706ae 100644
--- a/src/views/modules/demo/data/perm/DataPermDemoEdit.vue
+++ b/src/views/modules/demo/data/perm/DataPermDemoEdit.vue
@@ -17,15 +17,12 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
         <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入名称" />
       </a-form-item>
-      <a-form-item label="创建者名称" name="creatorName">
-        <a-input v-model:value="form.creatorName" :disabled="showable" placeholder="请输入创建者名称" />
-      </a-form-item>
       <a-form-item label="说明" name="remark">
         <a-input v-model:value="form.remark" :disabled="showable" placeholder="请输入说明" />
       </a-form-item>
diff --git a/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue b/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue
index 1e38c8a..62d3c5c 100644
--- a/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue
+++ b/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="中文名字" name="chineseName">
diff --git a/src/views/modules/demo/query/SuperQueryDemoEdit.vue b/src/views/modules/demo/query/SuperQueryDemoEdit.vue
index ef5fb30..1e430b6 100644
--- a/src/views/modules/demo/query/SuperQueryDemoEdit.vue
+++ b/src/views/modules/demo/query/SuperQueryDemoEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
diff --git a/src/views/modules/develop/dynamicform/DynamicFormEdit.vue b/src/views/modules/develop/dynamicform/DynamicFormEdit.vue
index 25e5c1c..69263b6 100644
--- a/src/views/modules/develop/dynamicform/DynamicFormEdit.vue
+++ b/src/views/modules/develop/dynamicform/DynamicFormEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="表单名称" name="name">
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
index 140a4eb..b7f6035 100644
--- a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="数据源编码" name="code">
diff --git a/src/views/modules/notice/mail/MailConfigEdit.vue b/src/views/modules/notice/mail/MailConfigEdit.vue
index 91cb5e1..022d807 100644
--- a/src/views/modules/notice/mail/MailConfigEdit.vue
+++ b/src/views/modules/notice/mail/MailConfigEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="编号" name="code">
diff --git a/src/views/modules/notice/template/MessageTemplateEdit.vue b/src/views/modules/notice/template/MessageTemplateEdit.vue
index 2890bfb..dfe4ba9 100644
--- a/src/views/modules/notice/template/MessageTemplateEdit.vue
+++ b/src/views/modules/notice/template/MessageTemplateEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form layout="vertical" ref="formRef" :validate-trigger="['blur', 'change']" :model="form" :rules="rules">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="编码" name="code">
diff --git a/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue b/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue
index 575bdd8..21067ae 100644
--- a/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue
+++ b/src/views/modules/payment/channel/alipay/AlipayConfigEdit.vue
@@ -18,7 +18,7 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-item label="主键" :hidden="true">
+        <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
         <a-form-item label="名称" name="name">
diff --git a/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue b/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue
index b1df795..14f5a47 100644
--- a/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue
+++ b/src/views/modules/payment/channel/wechat/WechatPayConfigEdit.vue
@@ -18,7 +18,7 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-item label="主键" :hidden="true">
+        <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
         <a-form-item label="名称" name="name">
diff --git a/src/views/modules/system/client/ClientEdit.vue b/src/views/modules/system/client/ClientEdit.vue
index 5e042b2..d2a3b45 100644
--- a/src/views/modules/system/client/ClientEdit.vue
+++ b/src/views/modules/system/client/ClientEdit.vue
@@ -10,7 +10,7 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-form class="small-from-item" ref="formRef" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-form-item label="主键" :hidden="true">
+        <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
         <a-form-item label="编码" v-bind="validateInfos.code" name="code">
diff --git a/src/views/modules/system/dept/DeptEdit.vue b/src/views/modules/system/dept/DeptEdit.vue
index d6e3eca..67a76de 100644
--- a/src/views/modules/system/dept/DeptEdit.vue
+++ b/src/views/modules/system/dept/DeptEdit.vue
@@ -18,7 +18,7 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-item label="主键" :hidden="true">
+        <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
         <a-form-item label="类型" name="orgCategory">
diff --git a/src/views/modules/system/dict/DictEdit.vue b/src/views/modules/system/dict/DictEdit.vue
index 2db5510..75a03f6 100644
--- a/src/views/modules/system/dict/DictEdit.vue
+++ b/src/views/modules/system/dict/DictEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="编码" name="code">
diff --git a/src/views/modules/system/dict/DictItemEdit.vue b/src/views/modules/system/dict/DictItemEdit.vue
index 0765755..35aee16 100644
--- a/src/views/modules/system/dict/DictItemEdit.vue
+++ b/src/views/modules/system/dict/DictItemEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="字典编码" name="dictCode">
diff --git a/src/views/modules/system/menu/ResourceEdit.vue b/src/views/modules/system/menu/ResourceEdit.vue
index db054f5..36ef8b1 100644
--- a/src/views/modules/system/menu/ResourceEdit.vue
+++ b/src/views/modules/system/menu/ResourceEdit.vue
@@ -9,7 +9,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item validate-first label="编码" name="permCode">
diff --git a/src/views/modules/system/param/SystemParamEdit.vue b/src/views/modules/system/param/SystemParamEdit.vue
index 5c010c5..9fbc5b8 100644
--- a/src/views/modules/system/param/SystemParamEdit.vue
+++ b/src/views/modules/system/param/SystemParamEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="参数名称" name="name">
diff --git a/src/views/modules/system/path/PermPathEdit.vue b/src/views/modules/system/path/PermPathEdit.vue
index 3b0288a..29a805d 100644
--- a/src/views/modules/system/path/PermPathEdit.vue
+++ b/src/views/modules/system/path/PermPathEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="请求路径" name="path">
diff --git a/src/views/modules/system/quartz/QuartzJobEdit.vue b/src/views/modules/system/quartz/QuartzJobEdit.vue
index 413b7fa..237e180 100644
--- a/src/views/modules/system/quartz/QuartzJobEdit.vue
+++ b/src/views/modules/system/quartz/QuartzJobEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="任务名称" name="name">
diff --git a/src/views/modules/system/role/RoleEdit.vue b/src/views/modules/system/role/RoleEdit.vue
index 027896e..357093b 100644
--- a/src/views/modules/system/role/RoleEdit.vue
+++ b/src/views/modules/system/role/RoleEdit.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-modal :loading="confirmLoading" v-bind="$attrs" :title="title" :visible="visible" :mask-closable="showable" @cancel="handleCancel">
     <a-form class="small-from-item" :model="form" ref="formRef" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="编码" name="code">
diff --git a/src/views/modules/system/scope/DataScopeEdit.vue b/src/views/modules/system/scope/DataScopeEdit.vue
index ab99660..e23ac4b 100644
--- a/src/views/modules/system/scope/DataScopeEdit.vue
+++ b/src/views/modules/system/scope/DataScopeEdit.vue
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
diff --git a/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue b/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue
index c2ac425..83f48ca 100644
--- a/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue
+++ b/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="机器人编码" name="code">
diff --git a/src/views/modules/third/wechat/menu/WechatMenuEdit.vue b/src/views/modules/third/wechat/menu/WechatMenuEdit.vue
index 763eea6..8167ac8 100644
--- a/src/views/modules/third/wechat/menu/WechatMenuEdit.vue
+++ b/src/views/modules/third/wechat/menu/WechatMenuEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
diff --git a/src/views/modules/third/wechat/template/WechatTemplateEdit.vue b/src/views/modules/third/wechat/template/WechatTemplateEdit.vue
index 0afbf17..cf3ef5a 100644
--- a/src/views/modules/third/wechat/template/WechatTemplateEdit.vue
+++ b/src/views/modules/third/wechat/template/WechatTemplateEdit.vue
@@ -18,7 +18,7 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-item label="主键" :hidden="true">
+        <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
         <a-form-item label="名称" name="name">
diff --git a/src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue b/src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue
index 515057e..e9d4bc4 100644
--- a/src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue
+++ b/src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue
@@ -17,7 +17,7 @@
       :label-col="labelCol"
       :wrapper-col="wrapperCol"
     >
-      <a-form-item label="主键" :hidden="true">
+      <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
       <a-form-item label="名称" name="name">
-- 
Gitee


From d4a4592d82f41891556c206438c10f4635252710 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Feb 2023 22:37:57 +0800
Subject: [PATCH 04/11] =?UTF-8?q?style=20=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/monitor/data/DataVersionLogInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/monitor/data/DataVersionLogInfo.vue b/src/views/modules/monitor/data/DataVersionLogInfo.vue
index 6f6218e..5c192c3 100644
--- a/src/views/modules/monitor/data/DataVersionLogInfo.vue
+++ b/src/views/modules/monitor/data/DataVersionLogInfo.vue
@@ -25,7 +25,7 @@
         <a-descriptions-item label="数据内容">
           <json-preview :data="JSON.parse(form.dataContent || '{}')" />
         </a-descriptions-item>
-        <a-descriptions-item label="变动内容">
+        <a-descriptions-item label="变动前内容">
           <json-preview :data="JSON.parse(form.changeContent || '{}')" />
         </a-descriptions-item>
       </a-descriptions>
-- 
Gitee


From 04bf61318067f6be5d78afbe053a381f95883f15 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Mon, 20 Feb 2023 14:40:46 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat=20=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=BC=94=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ccc8a474a7cafacff1bdfd71c7b4c320f6617815)
---
 README.md                                     |   1 -
 src/views/account/security/EmailBind.vue      |   2 +-
 .../demo/notice/email/EmailSenderDemo.vue     |  21 ++++
 .../demo/notice/email/SimpleEmailSender.vue   | 107 ++++++++++++++++++
 .../demo/notice/email/StandardEmailSender.vue |   7 ++
 .../demo/notice/email/emailSenderDemo.api.ts  |  21 ++++
 6 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/demo/notice/email/EmailSenderDemo.vue
 create mode 100644 src/views/modules/demo/notice/email/SimpleEmailSender.vue
 create mode 100644 src/views/modules/demo/notice/email/StandardEmailSender.vue
 create mode 100644 src/views/modules/demo/notice/email/emailSenderDemo.api.ts

diff --git a/README.md b/README.md
index d701848..696fa09 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 <p>
  <img src='https://gitee.com/bootx/bootx-platform/badge/star.svg?theme=dark' alt='star'/>
- <img src="https://img.shields.io/badge/Boot%20Platform-1.1.3-success.svg" alt="Build Status">
  <img src="https://img.shields.io/badge/Author-Bootx-orange.svg" alt="Build Status">
  <img src="https://img.shields.io/badge/Vue-3.x-blue.svg" alt="Downloads">
  <img src="https://img.shields.io/badge/license-Apache%20License%202.0-green.svg"/>
diff --git a/src/views/account/security/EmailBind.vue b/src/views/account/security/EmailBind.vue
index e90f452..e286fa8 100644
--- a/src/views/account/security/EmailBind.vue
+++ b/src/views/account/security/EmailBind.vue
@@ -45,7 +45,7 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { validateEmail } from '/@/utils/validate'
   import { bindEmail } from '/@/views/account/account.api'
-  import CountDownInput from "/@/components/CountDown/src/CountdownInput.vue";
+  import CountDownInput from '/@/components/CountDown/src/CountdownInput.vue'
 
   const emits = defineEmits(['ok'])
   const { visible, confirmLoading, modalWidth, labelCol, wrapperCol, handleCancel } = useFormEdit()
diff --git a/src/views/modules/demo/notice/email/EmailSenderDemo.vue b/src/views/modules/demo/notice/email/EmailSenderDemo.vue
new file mode 100644
index 0000000..41fab0a
--- /dev/null
+++ b/src/views/modules/demo/notice/email/EmailSenderDemo.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-3 bg-white">
+      <a-tabs default-active-key="1">
+        <a-tab-pane key="1" tab="简单邮件" force-render>
+          <simple-email-sender />
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="标准邮件" force-render>
+          <standard-email-sender />
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import SimpleEmailSender from './SimpleEmailSender.vue'
+  import StandardEmailSender from './StandardEmailSender.vue'
+</script>
+
+<style scoped></style>
diff --git a/src/views/modules/demo/notice/email/SimpleEmailSender.vue b/src/views/modules/demo/notice/email/SimpleEmailSender.vue
new file mode 100644
index 0000000..b01aa4d
--- /dev/null
+++ b/src/views/modules/demo/notice/email/SimpleEmailSender.vue
@@ -0,0 +1,107 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form layout="vertical" ref="formRef" :validate-trigger="['blur', 'change']" :model="form" :rules="rules">
+      <a-form-item label="标题" name="subject">
+        <a-input v-model:value="form.subject" placeholder="请输入邮件名称" />
+      </a-form-item>
+      <a-form-item validateFirst label="邮箱" name="email">
+        <a-input v-model:value="form.email" placeholder="请输入用户邮箱" />
+      </a-form-item>
+      <a-form-item ref="content" label="内容" name="message">
+        <div style="border: 1px solid #ccc">
+          <a-form-item-rest>
+            <Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="{}" mode="simple" />
+          </a-form-item-rest>
+          <Editor
+            style="height: 300px; max-height: 650px"
+            v-model="form.message"
+            :defaultConfig="{ placeholder: '请输入内容...' }"
+            mode="simple"
+            @onCreated="handleCreated"
+          />
+        </div>
+      </a-form-item>
+      <a-form-item>
+        <a-space>
+          <a-button @click="resetForm">重置</a-button>
+          <a-button :loading="confirmLoading" type="primary" @click="send">发送</a-button>
+        </a-space>
+      </a-form-item>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import '@wangeditor/editor/dist/css/style.css' // 引入 css
+  import { $ref } from 'vue/macros'
+  import { validateEmail } from '/@/utils/validate'
+  import { nextTick, onBeforeUnmount, shallowRef } from 'vue'
+  import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+  import { FormInstance } from 'ant-design-vue/lib/form'
+  import { renderHtml } from '/@/utils/lib/wangEditorUtil'
+  import { sentSimpleMail } from '/@/views/modules/demo/notice/email/emailSenderDemo.api'
+  import { useMessage } from '/@/hooks/web/useMessage'
+
+  const { createMessage } = useMessage()
+  let confirmLoading = $ref(false)
+  let formRef = $ref<FormInstance>()
+  // 编辑器实例，必须用 shallowRef
+  const editorRef = shallowRef()
+  let form = $ref({
+    subject: '',
+    email: '',
+    message: '',
+  })
+  const rules = {
+    subject: [{ required: true, message: '请输入标题' }],
+    email: [{ required: true, message: '请输入要发送的邮箱地址' }, { validator: validateEmailRule }],
+    message: [{ required: true, message: '请输入邮件内容' }],
+  }
+
+  // 记录 editor 实例，重要！
+  const handleCreated = (editor) => {
+    editorRef.value = editor
+  }
+
+  /**
+   * 发送
+   */
+  function send() {
+    formRef?.validate().then(() => {
+      // 渲染邮件样式
+      const message = renderHtml(form.message)
+      confirmLoading = true
+      sentSimpleMail({
+        ...form,
+        message,
+      })
+        .then(() => {
+          createMessage.success('发送成功')
+          resetForm()
+        })
+        .catch(() => {
+          confirmLoading = false
+        })
+    })
+  }
+  function resetForm() {
+    nextTick(() => {
+      form.resetFields()
+      this.confirmLoading = false
+    })
+  }
+
+  function validateEmailRule(rule, value, callback) {
+    const { msg, result } = validateEmail(value)
+    result ? callback() : callback(msg)
+  }
+
+  // 组件销毁时，也及时销毁编辑器
+  onBeforeUnmount(() => {
+    const editor = editorRef.value
+    if (editor == null) return
+    editor.destroy()
+  })
+</script>
+
+<style scoped></style>
diff --git a/src/views/modules/demo/notice/email/StandardEmailSender.vue b/src/views/modules/demo/notice/email/StandardEmailSender.vue
new file mode 100644
index 0000000..7c410af
--- /dev/null
+++ b/src/views/modules/demo/notice/email/StandardEmailSender.vue
@@ -0,0 +1,7 @@
+<template>
+  <h1>开发中</h1>
+</template>
+
+<script lang="ts" setup></script>
+
+<style scoped></style>
diff --git a/src/views/modules/demo/notice/email/emailSenderDemo.api.ts b/src/views/modules/demo/notice/email/emailSenderDemo.api.ts
new file mode 100644
index 0000000..78c7341
--- /dev/null
+++ b/src/views/modules/demo/notice/email/emailSenderDemo.api.ts
@@ -0,0 +1,21 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+/**
+ * 简单邮件发送
+ */
+export function sentSimpleMail(obj) {
+  return defHttp.post({
+    url: '/demo/notice/email/sentSimpleMail',
+    data: obj,
+  })
+}
+/**
+ * 标准邮件发送
+ */
+export function sentMail(obj) {
+  return defHttp.post({
+    url: '/demo/notice/email/sentMail',
+    data: obj,
+  })
+}
-- 
Gitee


From 72829774449f39485030639d1a6a1ca8b155caf7 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Fri, 24 Feb 2023 17:29:49 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/report/ProjectInfo.api.ts |  80 +++++++++++
 .../develop/report/ProjectInfoEdit.vue        | 132 ++++++++++++++++++
 .../develop/report/ProjectInfoList.vue        | 115 +++++++++++++++
 3 files changed, 327 insertions(+)
 create mode 100644 src/views/modules/develop/report/ProjectInfo.api.ts
 create mode 100644 src/views/modules/develop/report/ProjectInfoEdit.vue
 create mode 100644 src/views/modules/develop/report/ProjectInfoList.vue

diff --git a/src/views/modules/develop/report/ProjectInfo.api.ts b/src/views/modules/develop/report/ProjectInfo.api.ts
new file mode 100644
index 0000000..129a179
--- /dev/null
+++ b/src/views/modules/develop/report/ProjectInfo.api.ts
@@ -0,0 +1,80 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 分页
+ */
+export function page(params) {
+  return defHttp.get<Result<PageResult<ProjectInfo>>>({
+    url: '/goview/admin/page',
+    params,
+  })
+}
+
+/**
+ * 查询全部
+ */
+export function findAll() {
+  return defHttp.get<Result<ProjectInfo[]>>({
+    url: '/goview/admin/findAll',
+  })
+}
+
+/**
+ * 获取单条
+ */
+export function get(id) {
+  return defHttp.get<Result<ProjectInfo>>({
+    url: '/goview/admin/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 添加
+ */
+export function add(obj: ProjectInfo) {
+  return defHttp.post({
+    url: '/goview/admin/add',
+    data: obj,
+  })
+}
+
+/**
+ * 更新
+ */
+export function update(obj: ProjectInfo) {
+  return defHttp.post({
+    url: '/goview/admin/update',
+    data: obj,
+  })
+}
+
+/**
+ * 删除
+ */
+export function del(id) {
+  return defHttp.delete({
+    url: '/goview/admin/delete',
+    params: { id },
+  })
+}
+
+/**
+ * 自定义大屏信息
+ */
+export interface ProjectInfo extends BaseEntity {
+  // 项目名称
+  name?: string
+  // 发布状态
+  state?: number
+  // 报表内容
+  content?: string
+  // 备注
+  remark?: string
+  // 预览图片id
+  indexImage?: string
+  // 是否在编辑中
+  edit?: boolean
+}
diff --git a/src/views/modules/develop/report/ProjectInfoEdit.vue b/src/views/modules/develop/report/ProjectInfoEdit.vue
new file mode 100644
index 0000000..82dbffa
--- /dev/null
+++ b/src/views/modules/develop/report/ProjectInfoEdit.vue
@@ -0,0 +1,132 @@
+<template>
+  <basic-modal
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :title="title"
+    :width="modalWidth"
+    :visible="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="项目名称" name="name">
+          <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入项目名称" />
+        </a-form-item>
+        <a-form-item label="发布状态" name="state">
+          <a-input v-model:value="form.state" :disabled="showable" placeholder="请输入发布状态" />
+        </a-form-item>
+        <a-form-item label="报表内容" name="content">
+          <a-input v-model:value="form.content" :disabled="showable" placeholder="请输入报表内容" />
+        </a-form-item>
+        <a-form-item label="备注" name="remark">
+          <a-input v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
+        </a-form-item>
+        <a-form-item label="预览图片id" name="indexImage">
+          <a-input v-model:value="form.indexImage" :disabled="showable" placeholder="请输入预览图片id" />
+        </a-form-item>
+        <a-form-item label="是否在编辑中" name="edit">
+          <a-input v-model:value="form.edit" :disabled="showable" placeholder="请输入是否在编辑中" />
+        </a-form-item>
+      </a-form>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import { nextTick, reactive } from 'vue'
+  import { $ref } from 'vue/macros'
+  import useFormEdit from '/@/hooks/bootx/useFormEdit'
+  import { add, get, update, ProjectInfo } from './ProjectInfo.api'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { FormEditType } from '/@/enums/formTypeEnum'
+  import { BasicModal } from '/@/components/Modal'
+  const {
+    initFormEditType,
+    handleCancel,
+    search,
+    labelCol,
+    wrapperCol,
+    modalWidth,
+    title,
+    confirmLoading,
+    visible,
+    editable,
+    showable,
+    formEditType,
+  } = useFormEdit()
+  // 表单
+  const formRef = $ref<FormInstance>()
+  let form = $ref<ProjectInfo>({
+    id: null,
+    name: null,
+    state: null,
+    content: null,
+    remark: null,
+    indexImage: null,
+    edit: null,
+  })
+  // 校验
+  const rules = reactive({} as Record<string, Rule[]>)
+  // 事件
+  const emits = defineEmits(['ok'])
+  // 入口
+  function init(id, editType: FormEditType) {
+    initFormEditType(editType)
+    resetForm()
+    getInfo(id, editType)
+  }
+  // 获取信息
+  function getInfo(id, editType: FormEditType) {
+    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
+      confirmLoading.value = true
+      get(id).then(({ data }) => {
+        form = data
+        confirmLoading.value = false
+      })
+    } else {
+      confirmLoading.value = false
+    }
+  }
+  // 保存
+  function handleOk() {
+    formRef?.validate().then(async () => {
+      confirmLoading.value = true
+      if (formEditType.value === FormEditType.Add) {
+        await add(form)
+      } else if (formEditType.value === FormEditType.Edit) {
+        await update(form)
+      }
+      confirmLoading.value = false
+      handleCancel()
+      emits('ok')
+    })
+  }
+
+  // 重置表单
+  function resetForm() {
+    nextTick(() => {
+      formRef?.resetFields()
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
new file mode 100644
index 0000000..476deeb
--- /dev/null
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ query: queryPage }">
+        <template #buttons>
+          <a-space>
+            <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+          </a-space>
+        </template>
+      </vxe-toolbar>
+      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-column type="seq" width="60" />
+        <vxe-column field="name" title="项目名称" />
+        <vxe-column field="state" title="发布状态" />
+        <vxe-column field="content" title="报表内容" />
+        <vxe-column field="remark" title="备注" />
+        <vxe-column field="indexImage" title="预览图片id" />
+        <vxe-column field="edit" title="是否在编辑中" />
+        <vxe-column field="createTime" title="创建时间" />
+        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <span>
+              <a-link @click="show(row)">查看</a-link>
+            </span>
+            <a-divider type="vertical" />
+            <span>
+              <a-link @click="edit(row)">编辑</a-link>
+            </span>
+            <a-divider type="vertical" />
+            <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
+              <a-link danger>删除</a-link>
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+      <project-info-edit ref="projectInfoEdit" @ok="queryPage" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted } from 'vue'
+  import { $ref } from 'vue/macros'
+  import { del, page } from './ProjectInfo.api'
+  import useTablePage from '/@/hooks/bootx/useTablePage'
+  import ProjectInfoEdit from './ProjectInfoEdit.vue'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { FormEditType } from '/@/enums/formTypeEnum'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { QueryField } from '/@/components/Bootx/Query/Query'
+
+  // 使用hooks
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { notification, createMessage, createConfirm } = useMessage()
+
+  // 查询条件
+  const fields = [] as QueryField[]
+
+  const xTable = $ref<VxeTableInstance>()
+  const xToolbar = $ref<VxeToolbarInstance>()
+  const projectInfoEdit = $ref<any>()
+
+  onMounted(() => {
+    vxeBind()
+    queryPage()
+  })
+  function vxeBind() {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  }
+
+  // 分页查询
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+  }
+  // 新增
+  function add() {
+    projectInfoEdit.init(null, FormEditType.Add)
+  }
+  // 编辑
+  function edit(record) {
+    projectInfoEdit.init(record.id, FormEditType.Edit)
+  }
+  // 查看
+  function show(record) {
+    projectInfoEdit.init(record.id, FormEditType.Show)
+  }
+
+  // 删除
+  function remove(record) {
+    del(record.id).then(() => {
+      createMessage.success('删除成功')
+      queryPage()
+    })
+    }
+</script>
+
+<style lang="less" scoped></style>
-- 
Gitee


From 27b798dbccc5b95ea9edabf465e2b3ed6e9c83f4 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 2 Mar 2023 18:19:01 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat=20=E5=A4=A7=E5=B1=8F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/report/ProjectInfo.api.ts |  50 +++++--
 .../develop/report/ProjectInfoEdit.vue        |  61 +++-----
 .../develop/report/ProjectInfoList.vue        | 138 +++++++++++++++---
 3 files changed, 179 insertions(+), 70 deletions(-)

diff --git a/src/views/modules/develop/report/ProjectInfo.api.ts b/src/views/modules/develop/report/ProjectInfo.api.ts
index 129a179..bf619a1 100644
--- a/src/views/modules/develop/report/ProjectInfo.api.ts
+++ b/src/views/modules/develop/report/ProjectInfo.api.ts
@@ -12,15 +12,6 @@ export function page(params) {
   })
 }
 
-/**
- * 查询全部
- */
-export function findAll() {
-  return defHttp.get<Result<ProjectInfo[]>>({
-    url: '/goview/admin/findAll',
-  })
-}
-
 /**
  * 获取单条
  */
@@ -31,6 +22,15 @@ export function get(id) {
   })
 }
 
+/**
+ * 获取GoView的地址
+ */
+export function getGoViewUrl() {
+  return defHttp.get<Result<string>>({
+    url: '/goview/admin/getGoViewUrl',
+  })
+}
+
 /**
  * 添加
  */
@@ -51,6 +51,26 @@ export function update(obj: ProjectInfo) {
   })
 }
 
+/**
+ * 发布
+ */
+export function publish(id) {
+  return defHttp.post<Result>({
+    url: '/goview/admin/publish',
+    params: { id },
+  })
+}
+
+/**
+ * 取消发布
+ */
+export function unPublish(id) {
+  return defHttp.post<Result>({
+    url: '/goview/admin/unPublish',
+    params: { id },
+  })
+}
+
 /**
  * 删除
  */
@@ -61,6 +81,16 @@ export function del(id) {
   })
 }
 
+/**
+ * 复制
+ */
+export function copy(id) {
+  return defHttp.delete({
+    url: '/goview/admin/copy',
+    params: { id },
+  })
+}
+
 /**
  * 自定义大屏信息
  */
@@ -69,8 +99,6 @@ export interface ProjectInfo extends BaseEntity {
   name?: string
   // 发布状态
   state?: number
-  // 报表内容
-  content?: string
   // 备注
   remark?: string
   // 预览图片id
diff --git a/src/views/modules/develop/report/ProjectInfoEdit.vue b/src/views/modules/develop/report/ProjectInfoEdit.vue
index 82dbffa..a435f88 100644
--- a/src/views/modules/develop/report/ProjectInfoEdit.vue
+++ b/src/views/modules/develop/report/ProjectInfoEdit.vue
@@ -8,37 +8,25 @@
     :mask-closable="showable"
     @cancel="handleCancel"
   >
-      <a-form
-        class="small-from-item"
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        :validate-trigger="['blur', 'change']"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol"
-      >
-        <a-form-item label="主键" :hidden="true">
-          <a-input v-model:value="form.id" :disabled="showable" />
-        </a-form-item>
-        <a-form-item label="项目名称" name="name">
-          <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入项目名称" />
-        </a-form-item>
-        <a-form-item label="发布状态" name="state">
-          <a-input v-model:value="form.state" :disabled="showable" placeholder="请输入发布状态" />
-        </a-form-item>
-        <a-form-item label="报表内容" name="content">
-          <a-input v-model:value="form.content" :disabled="showable" placeholder="请输入报表内容" />
-        </a-form-item>
-        <a-form-item label="备注" name="remark">
-          <a-input v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
-        </a-form-item>
-        <a-form-item label="预览图片id" name="indexImage">
-          <a-input v-model:value="form.indexImage" :disabled="showable" placeholder="请输入预览图片id" />
-        </a-form-item>
-        <a-form-item label="是否在编辑中" name="edit">
-          <a-input v-model:value="form.edit" :disabled="showable" placeholder="请输入是否在编辑中" />
-        </a-form-item>
-      </a-form>
+    <a-form
+      class="small-from-item"
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :validate-trigger="['blur', 'change']"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="主键" :hidden="true">
+        <a-input v-model:value="form.id" :disabled="showable" />
+      </a-form-item>
+      <a-form-item label="项目名称" name="name">
+        <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入项目名称" />
+      </a-form-item>
+      <a-form-item label="备注" name="remark">
+        <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
+      </a-form-item>
+    </a-form>
     <template #footer>
       <a-space>
         <a-button key="cancel" @click="handleCancel">取消</a-button>
@@ -74,15 +62,12 @@
   const formRef = $ref<FormInstance>()
   let form = $ref<ProjectInfo>({
     id: null,
-    name: null,
-    state: null,
-    content: null,
-    remark: null,
-    indexImage: null,
-    edit: null,
+    name: '',
   })
   // 校验
-  const rules = reactive({} as Record<string, Rule[]>)
+  const rules = reactive({
+    name: [{ required: true, message: '请输入大屏的名称' }],
+  } as Record<string, Rule[]>)
   // 事件
   const emits = defineEmits(['ok'])
   // 入口
diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
index 476deeb..7978d7a 100644
--- a/src/views/modules/develop/report/ProjectInfoList.vue
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -13,26 +13,55 @@
       </vxe-toolbar>
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" width="60" />
+        <vxe-column field="id" title="大屏代码" />
         <vxe-column field="name" title="项目名称" />
-        <vxe-column field="state" title="发布状态" />
-        <vxe-column field="content" title="报表内容" />
+        <vxe-column field="state" title="发布状态">
+          <template #default="{ row }">
+            <a-tag v-if="row.state" color="green">已发布</a-tag>
+            <a-tag v-else color="red">未发布</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="edit" title="编辑状态">
+          <template #default="{ row }">
+            <a-tag v-if="row.edit" color="green">编辑中</a-tag>
+            <a-tag v-else color="red">未编辑</a-tag>
+          </template>
+        </vxe-column>
         <vxe-column field="remark" title="备注" />
-        <vxe-column field="indexImage" title="预览图片id" />
-        <vxe-column field="edit" title="是否在编辑中" />
         <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+        <vxe-column fixed="right" width="220" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <span>
-              <a-link @click="show(row)">查看</a-link>
+              <a-link @click="edit(row)">编辑</a-link>
             </span>
             <a-divider type="vertical" />
             <span>
-              <a-link @click="edit(row)">编辑</a-link>
+              <a-link @click="design(row)">设计</a-link>
+            </span>
+            <a-divider type="vertical" />
+            <span>
+              <a-link @click="preview(row)">预览</a-link>
             </span>
             <a-divider type="vertical" />
-            <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
-              <a-link danger>删除</a-link>
-            </a-popconfirm>
+            <a-dropdown>
+              <a class="ant-dropdown-link"> 更多 <icon icon="ant-design:down-outlined" :size="12" /> </a>
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item>
+                    <a-link @click="copyInfo(row)">复制</a-link>
+                  </a-menu-item>
+                  <a-menu-item v-if="row.state === -1">
+                    <a-link danger @click="publishInfo(row)">发布</a-link>
+                  </a-menu-item>
+                  <a-menu-item v-if="row.state === 1">
+                    <a-link danger @click="unPublishInfo(row)">取消发布</a-link>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-link danger>删除</a-link>
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
           </template>
         </vxe-column>
       </vxe-table>
@@ -52,7 +81,7 @@
 <script lang="ts" setup>
   import { onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { del, page } from './ProjectInfo.api'
+  import { copy, del, getGoViewUrl, page, publish, unPublish } from './ProjectInfo.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import ProjectInfoEdit from './ProjectInfoEdit.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -66,20 +95,31 @@
   const { notification, createMessage, createConfirm } = useMessage()
 
   // 查询条件
-  const fields = [] as QueryField[]
+  const fields = [
+    { field: 'projectId', name: '大屏代码', placeholder: '请输入大屏代码' },
+    { field: 'name', name: '项目名称', placeholder: '请输入项目名称' },
+  ] as QueryField[]
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
   const projectInfoEdit = $ref<any>()
+  let goViewUrl = $ref('')
 
   onMounted(() => {
+    initGoViewUrl()
     vxeBind()
     queryPage()
   })
+
   function vxeBind() {
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
-
+  // 初始化GoView地址
+  function initGoViewUrl() {
+    getGoViewUrl().then(({ data }) => {
+      goViewUrl = data
+    })
+  }
   // 分页查询
   function queryPage() {
     loading.value = true
@@ -98,18 +138,74 @@
   function edit(record) {
     projectInfoEdit.init(record.id, FormEditType.Edit)
   }
-  // 查看
-  function show(record) {
-    projectInfoEdit.init(record.id, FormEditType.Show)
+  // 预览
+  function preview(record) {
+    open(`${goViewUrl}/#/chart/preview/${record.id}`, '_blank')
+  }
+  // 设计
+  function design(record) {
+    open(`${goViewUrl}/#/chart/home/${record.id}`, '_blank')
+  }
+  // 复制
+  function copyInfo(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '复制',
+      content: '是否复制大屏',
+      onOk: () => {
+        loading.value = true
+        copy(record.id).then((_) => {
+          createMessage.success('复制成功')
+          queryPage()
+        })
+      },
+    })
+  }
+  // 发布
+  function publishInfo(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '发布',
+      content: '发布大屏',
+      onOk: () => {
+        loading.value = true
+        publish(record.id).then((_) => {
+          createMessage.success('发布成功')
+          queryPage()
+        })
+      },
+    })
+  }
+  // 取消发布
+  function unPublishInfo(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '取消发布',
+      content: '是否取消发布大屏',
+      onOk: () => {
+        loading.value = true
+        unPublish(record.id).then((_) => {
+          createMessage.success('取消发布成功')
+          queryPage()
+        })
+      },
+    })
   }
-
   // 删除
   function remove(record) {
-    del(record.id).then(() => {
-      createMessage.success('删除成功')
-      queryPage()
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除大屏',
+      onOk: () => {
+        loading.value = true
+        del(record.id).then((_) => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
     })
-    }
+  }
 </script>
 
 <style lang="less" scoped></style>
-- 
Gitee


From 34d5d6eb72c1b6174485c2c11267d3190dfffe39 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Fri, 3 Mar 2023 11:04:42 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat=20=E5=A4=A7=E5=B1=8F=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/store/modules/user.ts                     |  2 +-
 .../develop/report/ProjectInfoList.vue        | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 2686d22..879f830 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -16,7 +16,7 @@ import { h } from 'vue'
 import { getFilePreviewUrlPrefix } from '/@/api/common/FileUpload'
 // @ts-ignore
 import { getUserInfo } from '/@/api/sys/user'
-import { closeWebSocket, initWebSocket } from "/@/logics/websocket/UserGlobalWebSocker";
+import { closeWebSocket, initWebSocket } from '/@/logics/websocket/UserGlobalWebSocker'
 
 interface UserState {
   userInfo: Nullable<UserInfo>
diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
index 7978d7a..b9e277e 100644
--- a/src/views/modules/develop/report/ProjectInfoList.vue
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -8,6 +8,7 @@
         <template #buttons>
           <a-space>
             <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+            <a-button pre-icon="ant-design:sync-outlined" @click="loginGoView">一键登录大屏</a-button>
           </a-space>
         </template>
       </vxe-toolbar>
@@ -17,7 +18,7 @@
         <vxe-column field="name" title="项目名称" />
         <vxe-column field="state" title="发布状态">
           <template #default="{ row }">
-            <a-tag v-if="row.state" color="green">已发布</a-tag>
+            <a-tag v-if="row.state === 1" color="green">已发布</a-tag>
             <a-tag v-else color="red">未发布</a-tag>
           </template>
         </vxe-column>
@@ -51,13 +52,13 @@
                     <a-link @click="copyInfo(row)">复制</a-link>
                   </a-menu-item>
                   <a-menu-item v-if="row.state === -1">
-                    <a-link danger @click="publishInfo(row)">发布</a-link>
+                    <a-link @click="publishInfo(row)">发布</a-link>
                   </a-menu-item>
                   <a-menu-item v-if="row.state === 1">
-                    <a-link danger @click="unPublishInfo(row)">取消发布</a-link>
+                    <a-link @click="unPublishInfo(row)">取消发布</a-link>
                   </a-menu-item>
                   <a-menu-item>
-                    <a-link danger>删除</a-link>
+                    <a-link danger :disabled="row.state === 1" @click="remove(row)">删除</a-link>
                   </a-menu-item>
                 </a-menu>
               </template>
@@ -89,10 +90,12 @@
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { QueryField } from '/@/components/Bootx/Query/Query'
+  import { useUserStoreWithOut } from '/@/store/modules/user'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
+  const useUserStore = useUserStoreWithOut()
 
   // 查询条件
   const fields = [
@@ -206,6 +209,19 @@
       },
     })
   }
+  // 一键登录GoView平台
+  function loginGoView() {
+    createConfirm({
+      iconType: 'info',
+      title: '一键登录',
+      content: '是否一键登录可视化大屏平台',
+      okText: '登录',
+      onOk: () => {
+        const token = useUserStore.getToken
+        createMessage.info('等待下一个版本实装')
+      },
+    })
+  }
 </script>
 
 <style lang="less" scoped></style>
-- 
Gitee


From 1007d83d90dfe11b9159cd87c0180995b5986df0 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 4 Mar 2023 18:55:06 +0800
Subject: [PATCH 09/11] =?UTF-8?q?perf=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/report/ProjectInfo.api.ts | 30 ++++++++++---
 .../develop/report/ProjectInfoEdit.vue        |  5 ++-
 .../develop/report/ProjectInfoList.vue        | 42 +++++++++++++++++--
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/develop/report/ProjectInfo.api.ts b/src/views/modules/develop/report/ProjectInfo.api.ts
index bf619a1..ab58ff3 100644
--- a/src/views/modules/develop/report/ProjectInfo.api.ts
+++ b/src/views/modules/develop/report/ProjectInfo.api.ts
@@ -72,11 +72,21 @@ export function unPublish(id) {
 }
 
 /**
- * 删除
+ * 应用编辑中的信息
  */
-export function del(id) {
-  return defHttp.delete({
-    url: '/goview/admin/delete',
+export function enableEditContent(id) {
+  return defHttp.post<Result>({
+    url: '/goview/admin/enableEditContent',
+    params: { id },
+  })
+}
+
+/**
+ * 重置编辑中的信息
+ */
+export function resetEditContent(id) {
+  return defHttp.post<Result>({
+    url: '/goview/admin/resetEditContent',
     params: { id },
   })
 }
@@ -85,12 +95,22 @@ export function del(id) {
  * 复制
  */
 export function copy(id) {
-  return defHttp.delete({
+  return defHttp.post({
     url: '/goview/admin/copy',
     params: { id },
   })
 }
 
+/**
+ * 删除
+ */
+export function del(id) {
+  return defHttp.delete({
+    url: '/goview/admin/delete',
+    params: { id },
+  })
+}
+
 /**
  * 自定义大屏信息
  */
diff --git a/src/views/modules/develop/report/ProjectInfoEdit.vue b/src/views/modules/develop/report/ProjectInfoEdit.vue
index a435f88..3c3fb4a 100644
--- a/src/views/modules/develop/report/ProjectInfoEdit.vue
+++ b/src/views/modules/develop/report/ProjectInfoEdit.vue
@@ -23,8 +23,11 @@
       <a-form-item label="项目名称" name="name">
         <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入项目名称" />
       </a-form-item>
+      <a-form-item label="是否启用" name="enable">
+        <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" :disabled="showable" />
+      </a-form-item>
       <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
+        <a-textarea :rows="3" v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
       </a-form-item>
     </a-form>
     <template #footer>
diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
index b9e277e..224ddea 100644
--- a/src/views/modules/develop/report/ProjectInfoList.vue
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -24,8 +24,8 @@
         </vxe-column>
         <vxe-column field="edit" title="编辑状态">
           <template #default="{ row }">
-            <a-tag v-if="row.edit" color="green">编辑中</a-tag>
-            <a-tag v-else color="red">未编辑</a-tag>
+            <a-tag v-if="row.edit" color="red">编辑中</a-tag>
+            <a-tag v-else color="green">未编辑</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="remark" title="备注" />
@@ -51,6 +51,12 @@
                   <a-menu-item>
                     <a-link @click="copyInfo(row)">复制</a-link>
                   </a-menu-item>
+                  <a-menu-item v-if="row.edit">
+                    <a-link @click="enableEdit(row)">应用编辑</a-link>
+                  </a-menu-item>
+                  <a-menu-item v-if="row.edit">
+                    <a-link @click="resetEdit(row)">重置编辑</a-link>
+                  </a-menu-item>
                   <a-menu-item v-if="row.state === -1">
                     <a-link @click="publishInfo(row)">发布</a-link>
                   </a-menu-item>
@@ -82,7 +88,7 @@
 <script lang="ts" setup>
   import { onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { copy, del, getGoViewUrl, page, publish, unPublish } from './ProjectInfo.api'
+  import { copy, del, enableEditContent, getGoViewUrl, page, publish, resetEditContent, unPublish } from './ProjectInfo.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import ProjectInfoEdit from './ProjectInfoEdit.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -194,6 +200,36 @@
       },
     })
   }
+  // 应用编辑中的信息
+  function enableEdit(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '应用编辑数据',
+      content: '是否应用编辑中的信息，确定后发布的数据将会更新',
+      onOk: () => {
+        loading.value = true
+        enableEditContent(record.id).then((_) => {
+          createMessage.success('更新成功')
+          queryPage()
+        })
+      },
+    })
+  }
+  // 重置编辑中的信息
+  function resetEdit(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '重置编辑',
+      content: '是否重置编辑中的信息，确定后编辑的内容将会恢复为当前已发布的内容',
+      onOk: () => {
+        loading.value = true
+        resetEditContent(record.id).then((_) => {
+          createMessage.success('重置成功')
+          queryPage()
+        })
+      },
+    })
+  }
   // 删除
   function remove(record) {
     createConfirm({
-- 
Gitee


From 8e824598d364fd492bdd4e8e8dd8064fda6d5e1e Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 4 Mar 2023 21:25:09 +0800
Subject: [PATCH 10/11] =?UTF-8?q?perf=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/develop/report/ProjectInfoList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
index 224ddea..b3dc4f9 100644
--- a/src/views/modules/develop/report/ProjectInfoList.vue
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -52,7 +52,7 @@
                     <a-link @click="copyInfo(row)">复制</a-link>
                   </a-menu-item>
                   <a-menu-item v-if="row.edit">
-                    <a-link @click="enableEdit(row)">应用编辑</a-link>
+                    <a-link @click="enableEdit(row)">保存编辑</a-link>
                   </a-menu-item>
                   <a-menu-item v-if="row.edit">
                     <a-link @click="resetEdit(row)">重置编辑</a-link>
@@ -204,8 +204,8 @@
   function enableEdit(record) {
     createConfirm({
       iconType: 'info',
-      title: '应用编辑数据',
-      content: '是否应用编辑中的信息，确定后发布的数据将会更新',
+      title: '保存编辑',
+      content: '是否保存编辑中的信息，保存后发布的数据将会更新',
       onOk: () => {
         loading.value = true
         enableEditContent(record.id).then((_) => {
@@ -220,7 +220,7 @@
     createConfirm({
       iconType: 'info',
       title: '重置编辑',
-      content: '是否重置编辑中的信息，确定后编辑的内容将会恢复为当前已发布的内容',
+      content: '是否重置编辑中的信息，确定后编辑的内容将会恢复为之前保存的内容',
       onOk: () => {
         loading.value = true
         resetEditContent(record.id).then((_) => {
-- 
Gitee


From a883f28bb10b9b0150588ea5d64976240f2b8f39 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 4 Mar 2023 21:28:25 +0800
Subject: [PATCH 11/11] =?UTF-8?q?perf=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/develop/report/ProjectInfoEdit.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/modules/develop/report/ProjectInfoEdit.vue b/src/views/modules/develop/report/ProjectInfoEdit.vue
index 3c3fb4a..91c10f6 100644
--- a/src/views/modules/develop/report/ProjectInfoEdit.vue
+++ b/src/views/modules/develop/report/ProjectInfoEdit.vue
@@ -23,9 +23,6 @@
       <a-form-item label="项目名称" name="name">
         <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入项目名称" />
       </a-form-item>
-      <a-form-item label="是否启用" name="enable">
-        <a-switch checked-children="启用" un-checked-children="停用" v-model:checked="form.enable" :disabled="showable" />
-      </a-form-item>
       <a-form-item label="备注" name="remark">
         <a-textarea :rows="3" v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
       </a-form-item>
-- 
Gitee