feat(CRUD):新增可选的历史记录云备份功能

Author: build-admin

app/admin/controller/crud/Crud.php

@@ -60,7 +60,7 @@ class Crud extends Backend
      */
     protected array $dtStringToArray = ['checkbox', 'selects', 'remoteSelects', 'city', 'images', 'files'];
 
-    protected array $noNeedPermission = ['logStart', 'getFileData', 'parseFieldData', 'generateCheck'];
+    protected array $noNeedPermission = ['logStart', 'getFileData', 'parseFieldData', 'generateCheck', 'uploadCompleted'];
 
     public function initialize(): void
     {
@@ -294,7 +294,9 @@ public function generate(): void
             $this->error($e->getMessage());
         }
 
-        $this->success();
+        $this->success('', [
+            'crudLog' => CrudLog::find($crudLogId),
+        ]);
     }
 
     /**
@@ -304,8 +306,41 @@ public function generate(): void
     public function logStart(): void
     {
         $id   = $this->request->post('id');
-        $info = CrudLog::find($id)->toArray();
-        if (!$info) {
+        $type = $this->request->post('type', '');
+
+        if ($type == 'Cloud history') {
+            // 云端 历史记录
+            $client     = get_ba_client();
+            $response   = $client->request('GET', '/api/v6.Crud/info', [
+                'query' => [
+                    'id'            => $id,
+                    'server'        => 1,
+                    'ba-user-token' => $this->request->post('token', ''),
+                ]
+            ]);
+            $body       = $response->getBody();
+            $statusCode = $response->getStatusCode();
+            $content    = $body->getContents();
+            if ($content == '' || stripos($content, '<title>系统发生错误</title>') !== false || $statusCode != 200) {
+                $this->error(__('Failed to load cloud data'));
+            }
+            $json = json_decode($content, true);
+            if (json_last_error() != JSON_ERROR_NONE) {
+                $this->error(__('Failed to load cloud data'));
+            }
+            if (is_array($json)) {
+                if ($json['code'] != 1) {
+                    $this->error($json['msg']);
+                }
+
+                $info = $json['data']['info'];
+            }
+        } else {
+            // 本地记录
+            $info = CrudLog::find($id)->toArray();
+        }
+
+        if (!isset($info) || !$info) {
             $this->error(__('Record not found'));
         }
 
@@ -328,6 +363,7 @@ public function logStart(): void
         $this->success('', [
             'table'  => $info['table'],
             'fields' => $info['fields'],
+            'sync'   => $info['sync'],
         ]);
     }
 
@@ -548,6 +584,38 @@ public function generateCheck(): void
         $this->success();
     }
 
+    /**
+     * CRUD 设计记录上传成功标记
+     * @throws Throwable
+     */
+    public function uploadCompleted(): void
+    {
+        $syncIds      = $this->request->post('syncIds/a', []);
+        $cancelSync   = $this->request->post('cancelSync/b', false);
+        $crudLogModel = new CrudLog();
+
+        if ($cancelSync) {
+            $logData = $crudLogModel->where('id', 'in', array_keys($syncIds))->select();
+            foreach ($logData as $logDatum) {
+                if ($logDatum->sync == $syncIds[$logDatum->id]) {
+                    $logDatum->sync = 0;
+                    $logDatum->save();
+                }
+            }
+            $this->success();
+        }
+
+        $saveData = [];
+        foreach ($syncIds as $key => $syncId) {
+            $saveData[] = [
+                'id'   => $key,
+                'sync' => $syncId,
+            ];
+        }
+        $crudLogModel->saveAll($saveData);
+        $this->success();
+    }
+
     /**
      * 关联表数据解析
      * @param $field

app/admin/lang/zh-cn/crud/crud.php

@@ -7,4 +7,5 @@
     'del-field fail not exist'         => '字段 %s 删除失败，数据表内不存在该字段',
     'change-field-attr fail not exist' => '修改字段 %s 的属性失败，数据表内不存在该字段',
     'add-field fail exist'             => '添加字段 %s 失败，数据表内已经存在该字段',
+    'Failed to load cloud data'        => '加载云端数据失败，请稍后重试！',
 ];

web/src/api/backend/crud.ts

@@ -1,3 +1,5 @@
+import { useBaAccount } from '/@/stores/baAccount'
+import { useSiteConfig } from '/@/stores/siteConfig'
 import createAxios from '/@/utils/axios'
 
 export const url = '/admin/crud.Crud/'
@@ -47,13 +49,21 @@ export function parseFieldData(data: anyObj) {
     })
 }
 
-export function postLogStart(id: number) {
+export function postLogStart(id: string, type: string) {
+    const data: anyObj = {
+        id,
+        type,
+    }
+
+    if (type == 'Cloud history') {
+        const baAccount = useBaAccount()
+        data['token'] = baAccount.getToken('auth')
+    }
+
     return createAxios({
         url: url + 'logStart',
         method: 'post',
-        data: {
-            id: id,
-        },
+        data: data,
     })
 }
 
@@ -77,3 +87,44 @@ export function checkCrudLog(table: string, connection: string) {
         },
     })
 }
+
+export function uploadLog(data: anyObj) {
+    const baAccount = useBaAccount()
+    const siteConfig = useSiteConfig()
+    data['ba-user-token'] = baAccount.getToken('auth')
+    return createAxios({
+        url: siteConfig.apiUrl + '/api/v6.Crud/uploadLog',
+        data: data,
+        method: 'post',
+    })
+}
+
+export function uploadCompleted(data: anyObj) {
+    return createAxios({
+        url: url + 'uploadCompleted',
+        data: data,
+        method: 'post',
+    })
+}
+
+export function logs(data: anyObj = {}) {
+    const baAccount = useBaAccount()
+    const siteConfig = useSiteConfig()
+    data['ba-user-token'] = baAccount.getToken('auth')
+    return createAxios({
+        url: siteConfig.apiUrl + '/api/v6.Crud/logs',
+        data: data,
+        method: 'post',
+    })
+}
+
+export function delLog(data: anyObj = {}) {
+    const baAccount = useBaAccount()
+    const siteConfig = useSiteConfig()
+    data['ba-user-token'] = baAccount.getToken('auth')
+    return createAxios({
+        url: siteConfig.apiUrl + '/api/v6.Crud/del',
+        data: data,
+        method: 'post',
+    })
+}

web/src/lang/backend/en/crud/log.ts

@@ -4,6 +4,9 @@ export default {
     comment: 'comment',
     table: 'table',
     fields: 'fields',
+    sync: 'sync',
+    'sync no': 'no',
+    'sync yes': 'yes',
     status: 'status',
     delete: 'delete code',
     'status delete': 'status delete',
@@ -12,4 +15,39 @@ export default {
     'status start': 'status start',
     create_time: 'create_time',
     'quick Search Fields': 'id,table_name,comment',
+    'Upload the selected design records to the cloud for cross-device use': 'Upload the selected design records to the cloud for cross-device use',
+    'Design records that have been synchronized to the cloud': 'Design records that have been synchronized to the cloud',
+    'Cloud record': 'Cloud record',
+    Settings: 'Settings',
+    'Login for backup design': 'Login for backup design',
+    'CRUD design record synchronization scheme': 'CRUD design record synchronization scheme',
+    Manual: 'Manual',
+    automatic: 'automatic',
+    'When automatically synchronizing records, share them to the open source community':
+        'When automatically synchronizing records, share them to the open source community',
+    'Not to share': 'Not to share',
+    Share: 'Share',
+    'Enabling sharing can automatically earn community points during development':
+        'Enabling sharing can automatically earn community points during development',
+    'The synchronized CRUD records are automatically resynchronized when they are updated':
+        'The synchronized CRUD records are automatically resynchronized when they are updated',
+    'Do not resynchronize': 'Do not resynchronize',
+    'Automatic resynchronization': 'Automatic resynchronization',
+    'No effective design': 'No effective design',
+    'Number of fields': 'Number of fields',
+    'Upload type': 'Upload type',
+    Update: 'Update',
+    'New added': 'New added',
+    'Share to earn points': 'Share to earn points',
+    'Share to the open source community': 'Share to the open source community',
+    'No design record': 'No design record',
+    Field: 'Field',
+    'Field information': 'Field information',
+    'No field': 'No field',
+    'Field name': 'Field name',
+    Note: 'Note',
+    Type: 'Type',
+    Load: 'Load',
+    'Delete cloud records?': 'Delete cloud records?',
+    'You can use the synchronized design records across devices': 'You can use the synchronized design records across devices',
 }

web/src/lang/backend/zh-cn/crud/log.ts

@@ -4,6 +4,9 @@ export default {
     comment: '表注释',
     table: '数据表数据',
     fields: '字段数据',
+    sync: '是否上传',
+    'sync no': '否',
+    'sync yes': '是',
     status: '状态',
     delete: '删除代码',
     'status delete': '代码已删除',
@@ -12,4 +15,37 @@ export default {
     'status start': '生成中',
     create_time: '创建时间',
     'quick Search Fields': 'ID、表名、注释',
+    'Upload the selected design records to the cloud for cross-device use': '上传选中的设计记录至云端以跨设备使用',
+    'Design records that have been synchronized to the cloud': '已同步至云端的设计记录',
+    'Cloud record': '云记录',
+    Settings: '设置',
+    'Login for backup design': '登录以备份设计',
+    'CRUD design record synchronization scheme': 'CRUD 设计记录同步方案',
+    Manual: '手动',
+    automatic: '自动',
+    'When automatically synchronizing records, share them to the open source community': '自动同步记录时分享至开源社区',
+    'Not to share': '不分享',
+    Share: '分享',
+    'Enabling sharing can automatically earn community points during development': '开启分享可于开发同时自动获取社区积分',
+    'The synchronized CRUD records are automatically resynchronized when they are updated': '已同步的 CRUD 记录被更新时自动重新同步',
+    'Do not resynchronize': '不重新同步',
+    'Automatic resynchronization': '自动重新同步',
+    'No effective design': '无有效设计',
+    'Number of fields': '字段数',
+    'Upload type': '上传类型',
+    Update: '更新',
+    'New added': '新增',
+    'Share to earn points': '分享获得积分',
+    'Share to the open source community': '分享至开源社区',
+    'No design record': '无设计记录',
+    Field: '字段',
+    'Field information': '字段信息',
+    'No field': '无字段',
+    'Field name': '字段名',
+    Note: '注释',
+    Type: '类型',
+    Load: '载入',
+    'Delete cloud records?': '删除云端记录？',
+    'You can use the synchronized design records across devices':
+        '您可以跨设备使用已同步的设计记录；选择手动同步时，系统不会主动收集任何数据，同时系统永远不会同步表内数据',
 }

web/src/stores/config.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { reactive } from 'vue'
 import { STORE_CONFIG } from '/@/stores/constant/cacheKey'
-import type { Lang, Layout } from '/@/stores/interface'
+import type { Crud, Lang, Layout } from '/@/stores/interface'
 
 export const useConfig = defineStore(
     'config',
@@ -43,6 +43,12 @@ export const useConfig = defineStore(
             ],
         })
 
+        const crud: Crud = reactive({
+            syncType: 'manual',
+            syncedUpdate: 'yes',
+            syncAutoPublic: 'no',
+        })
+
         function menuWidth() {
             if (layout.shrink) {
                 return layout.menuCollapse ? '0px' : layout.menuWidth + 'px'
@@ -79,7 +85,7 @@ export const useConfig = defineStore(
         }
 
         const setLayout = (name: keyof Layout, value: any) => {
-            layout[name] = value as never
+            ;(layout[name] as any) = value
         }
 
         const getColorVal = function (name: keyof Layout): string {
@@ -91,7 +97,11 @@ export const useConfig = defineStore(
             }
         }
 
-        return { layout, lang, menuWidth, setLang, setLayoutMode, setLayout, getColorVal, onSetLayoutColor }
+        const setCrud = (name: keyof Crud, value: any) => {
+            ;(crud[name] as any) = value
+        }
+
+        return { layout, lang, crud, menuWidth, setLang, setLayoutMode, setLayout, getColorVal, onSetLayoutColor, setCrud }
     },
     {
         persist: {

web/src/stores/interface/index.ts

@@ -60,6 +60,15 @@ export interface Lang {
     langArray: { name: string; value: string }[]
 }
 
+export interface Crud {
+    // 日志同步方式
+    syncType: 'manual' | 'automatic'
+    // 已同步记录被更新时，是否自动重新同步
+    syncedUpdate: 'no' | 'yes'
+    // 自动同步时是否分享至开源社区
+    syncAutoPublic: 'no' | 'yes'
+}
+
 export interface NavTabs {
     // 激活 tab 的 index
     activeIndex: number