fix:Modify change version list in block

opentiny · Jan 9, 2025 · 1667ed5 · 1667ed5
1 parent aa049bb
commit 1667ed5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/packages/common/component/BlockHistoryList.vue b/packages/common/component/BlockHistoryList.vue
@@ -50,8 +50,8 @@ defineEmits(['preview', 'restore'])
   font-size: 12px;
   padding: 2px 8px;
   margin-left: 5px;
-  background-color: var(--te-base-green-20);
-  color: var(--te-base-green-70);
+  background-color: var(--te-common-bg-tag);
+  color: var(--te-common-color-success);
   border-radius: var(--te-base-border-radius-1);
 }
 .operation-text {

diff --git a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
@@ -1,28 +1,21 @@
 <template>
   <plugin-setting v-if="panel.created" v-show="panel.show" :title="state.title" class="version-list-panel">
     <template #header>
-      <close-icon class="close-icon" @click="closePanel"></close-icon>
+      <button-group>
+        <tiny-button type="primary" @click="handleConfirm">确定</tiny-button>
+        <close-icon @click="closePanel"></close-icon>
+      </button-group>
     </template>
     <template #content>
       <tiny-grid ref="versionGrid" :data="state.backupList" :highlight-hover-row="false">
+        <tiny-grid-column type="radio" width="40"></tiny-grid-column>
         <tiny-grid-column field="version" title="版本号"></tiny-grid-column>
         <tiny-grid-column title="发布时间">
           <template v-slot="{ row }">
             <span>{{ format(row.updated_at, 'yyyy/MM/dd hh:mm:ss') }}</span>
           </template>
         </tiny-grid-column>
         <tiny-grid-column field="message" title="发布描述"></tiny-grid-column>
-        <tiny-grid-column title="操作">
-          <template v-slot="{ row }">
-            <tiny-button
-              type="text"
-              text="回退"
-              class="fallback-btn"
-              :disabled="isCurrentVersion(row)"
-              @click="handleChangeVersion(row)"
-            ></tiny-button
-          ></template>
-        </tiny-grid-column>
         <template #empty>
           <search-empty :isShow="true" />
         </template>
@@ -35,7 +28,7 @@
 import { reactive, watch, ref } from 'vue'
 import { Grid, GridColumn, Button } from '@opentiny/vue'
 import { format } from '@opentiny/vue-renderless/common/date'
-import { PluginSetting, CloseIcon, SearchEmpty } from '@opentiny/tiny-engine-common'
+import { PluginSetting, CloseIcon, SearchEmpty, ButtonGroup } from '@opentiny/tiny-engine-common'
 import { useBlock, useModal, useMaterial, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { fetchBlockById, requestGroupBlockVersion } from './http'
 import { useVersionSelectPanel } from './js/usePanel'
@@ -47,7 +40,8 @@ export default {
     TinyButton: Button,
     PluginSetting,
     CloseIcon,
-    SearchEmpty
+    SearchEmpty,
+    ButtonGroup
   },
   setup() {
     const { confirm } = useModal()
@@ -65,6 +59,11 @@ export default {
       fetchBlockById(selectedBlock.value.id)
         .then((data) => {
           state.backupList = data.histories?.reverse?.() || []
+          state.backupList.forEach((item, index) => {
+            if (item.version === selectedBlock.value.current_version) {
+              versionGrid.value?.setRadioRow(state.backupList[index])
+            }
+          })
         })
         .catch((error) => {
           message({ message: `获取区块版本失败: ${error.message || error}`, title: '区块版本获取失败' })
@@ -103,6 +102,10 @@ export default {
       }
     }
 
+    const handleConfirm = () => {
+      handleChangeVersion(versionGrid.value?.getRadioRow())
+    }
+
     watch([() => panel.show, () => selectedBlock.value], ([panelShow]) => {
       if (panelShow) {
         state.title = `选择版本(${selectedBlock.value.label})`
@@ -123,7 +126,8 @@ export default {
       closePanel,
       format,
       isCurrentVersion,
-      handleChangeVersion
+      handleChangeVersion,
+      handleConfirm
     }
   }
 }