From d9940b1300f8ea7e9a181feddc5c7233628337c2 Mon Sep 17 00:00:00 2001
From: lixuan <lx7664@163.com>
Date: Fri, 10 Jan 2025 02:03:27 -0800
Subject: [PATCH] fix: Modify review comments

---
 .../common/component/BlockHistoryList.vue     |  8 +++---
 packages/common/component/MetaListItem.vue    |  8 +-----
 .../VariableConfigurator.vue                  |  4 +--
 packages/design-core/assets/add-folder.svg    |  1 -
 .../{retract_all.svg => collapse_all.svg}     |  0
 packages/layout/src/DesignSettings.vue        |  2 +-
 packages/plugins/block/src/BlockConfig.vue    |  4 +--
 packages/plugins/block/src/BlockEventList.vue |  6 -----
 packages/plugins/page/src/PageSetting.vue     |  2 +-
 packages/plugins/state/src/CreateStore.vue    |  4 +--
 packages/plugins/state/src/CreateVariable.vue |  4 +--
 packages/plugins/state/src/Main.vue           |  3 ++-
 .../components/background/ImageSetting.vue    | 26 -------------------
 13 files changed, 14 insertions(+), 58 deletions(-)
 rename packages/design-core/assets/{retract_all.svg => collapse_all.svg} (100%)

diff --git a/packages/common/component/BlockHistoryList.vue b/packages/common/component/BlockHistoryList.vue
index ed52196db..8b3bf5c9d 100644
--- a/packages/common/component/BlockHistoryList.vue
+++ b/packages/common/component/BlockHistoryList.vue
@@ -1,5 +1,5 @@
 <template>
-  <tiny-grid :data="history" height="300" v-if="history.length">
+  <tiny-grid v-if="history.length" :data="history" height="300">
     <tiny-grid-column v-if="isBlockManage" field="version" title="版本号">
       <template v-slot="data">
         {{ data.row.version }}
@@ -14,8 +14,8 @@
     <tiny-grid-column field="message" title="描述"></tiny-grid-column>
     <tiny-grid-column width="90" field="operation" title="操作">
       <template v-slot="data">
-        <span @click="$emit('preview', data.row)" class="operation-text">预览</span>
-        <span v-if="!isBlockManage" @click="$emit('restore', data.row)" class="operation-text">还原</span>
+        <span class="operation-text" @click="$emit('preview', data.row)">预览</span>
+        <span v-if="!isBlockManage" class="operation-text" @click="$emit('restore', data.row)">还原</span>
       </template>
     </tiny-grid-column>
   </tiny-grid>
@@ -38,7 +38,7 @@ defineProps({
   },
   lastVersion: {
     type: Object,
-    default: () => {}
+    default: () => ({})
   }
 })
 
diff --git a/packages/common/component/MetaListItem.vue b/packages/common/component/MetaListItem.vue
index 305d44c21..1f3b59f06 100644
--- a/packages/common/component/MetaListItem.vue
+++ b/packages/common/component/MetaListItem.vue
@@ -305,15 +305,9 @@ export default {
 }
 .add-options {
   overflow-y: auto;
-  max-height: calc(100vh - 94px);
+  max-height: calc(100vh - 94px); // 94为头部高度和底部高度
   &.top {
     margin-bottom: 0;
   }
-  &::-webkit-scrollbar-track-piece {
-    background: var(--te-common-bg-container-weaken);
-  }
-  &::-webkit-scrollbar {
-    width: 5px;
-  }
 }
 </style>
diff --git a/packages/configurator/src/variable-configurator/VariableConfigurator.vue b/packages/configurator/src/variable-configurator/VariableConfigurator.vue
index e7e67eab2..24de54a62 100644
--- a/packages/configurator/src/variable-configurator/VariableConfigurator.vue
+++ b/packages/configurator/src/variable-configurator/VariableConfigurator.vue
@@ -86,7 +86,7 @@
               </div>
             </div>
             <div class="bottom lowcode-scrollbar-thin">
-              <span class="bottom__title">用法</span>
+              <span class="bottom-title">用法</span>
               <div class="bottom-demo">
                 <p>
                   你可以通过点击左侧区域绑定变量或处理函数，或者点击右边的铅笔按钮切换到输入模式，输入复杂的表达式。
@@ -702,7 +702,7 @@ export default {
           pre {
             font-family: consolas;
           }
-          .bottom__title {
+          .bottom-title {
             font-weight: var(--te-base-font-weight-6);
             color: var(--te-common-text-primary);
           }
diff --git a/packages/design-core/assets/add-folder.svg b/packages/design-core/assets/add-folder.svg
index e33cd5d4f..b42f93b83 100644
--- a/packages/design-core/assets/add-folder.svg
+++ b/packages/design-core/assets/add-folder.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
 <style type="text/css">
diff --git a/packages/design-core/assets/retract_all.svg b/packages/design-core/assets/collapse_all.svg
similarity index 100%
rename from packages/design-core/assets/retract_all.svg
rename to packages/design-core/assets/collapse_all.svg
diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue
index 4554783c7..7a5aada53 100644
--- a/packages/layout/src/DesignSettings.vue
+++ b/packages/layout/src/DesignSettings.vue
@@ -36,7 +36,7 @@ export default {
     const activating = computed(() => layoutState.settings.activating)
     const showMask = ref(true)
     const isCollapsed = ref(false)
-    const settingIcon = computed(() => (isCollapsed.value ? 'retract_all' : 'expand_all'))
+    const settingIcon = computed(() => (isCollapsed.value ? 'collapse_all' : 'expand_all'))
 
     provide('isCollapsed', isCollapsed)
 
diff --git a/packages/plugins/block/src/BlockConfig.vue b/packages/plugins/block/src/BlockConfig.vue
index e932f9bc1..acffc68cc 100644
--- a/packages/plugins/block/src/BlockConfig.vue
+++ b/packages/plugins/block/src/BlockConfig.vue
@@ -181,12 +181,10 @@ export default {
     }
 
     const validateForm = () => {
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         blockForm.value.validate((valid) => {
           if (valid) {
             resolve()
-          } else {
-            reject(new Error('校验失败'))
           }
         })
       })
diff --git a/packages/plugins/block/src/BlockEventList.vue b/packages/plugins/block/src/BlockEventList.vue
index f3e5e8d28..cfbd8640d 100644
--- a/packages/plugins/block/src/BlockEventList.vue
+++ b/packages/plugins/block/src/BlockEventList.vue
@@ -84,10 +84,4 @@ export default {
     stroke: var(--te-common-text-weaken);
   }
 }
-.opt-button {
-  width: auto;
-  &:last-child {
-    margin-right: var(--te-base-space-3x);
-  }
-}
 </style>
diff --git a/packages/plugins/page/src/PageSetting.vue b/packages/plugins/page/src/PageSetting.vue
index 70b6764b9..21a74a54b 100644
--- a/packages/plugins/page/src/PageSetting.vue
+++ b/packages/plugins/page/src/PageSetting.vue
@@ -44,7 +44,7 @@
             </div>
           </tiny-collapse-item>
 
-          <tiny-collapse-item class="history-source" title="版本列表" :name="PAGE_SETTING_SESSION.history">
+          <tiny-collapse-item class="history-source" title="历史备份" :name="PAGE_SETTING_SESSION.history">
             <page-history @restorePage="restorePage"></page-history>
           </tiny-collapse-item>
         </tiny-collapse>
diff --git a/packages/plugins/state/src/CreateStore.vue b/packages/plugins/state/src/CreateStore.vue
index 8b20cecf8..21da884f3 100644
--- a/packages/plugins/state/src/CreateStore.vue
+++ b/packages/plugins/state/src/CreateStore.vue
@@ -227,12 +227,10 @@ export default {
     const storeDataForm = ref(null)
 
     const validateForm = () => {
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         storeDataForm.value.validate((valid) => {
           if (valid) {
             resolve()
-          } else {
-            reject(new Error('校验失败'))
           }
         })
       })
diff --git a/packages/plugins/state/src/CreateVariable.vue b/packages/plugins/state/src/CreateVariable.vue
index a2bb6d3f4..c5f6f56db 100644
--- a/packages/plugins/state/src/CreateVariable.vue
+++ b/packages/plugins/state/src/CreateVariable.vue
@@ -368,12 +368,10 @@ export default {
     const createDataForm = ref(null)
 
     const validateForm = () => {
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         createDataForm.value.validate((valid) => {
           if (valid) {
             resolve()
-          } else {
-            reject(new Error('校验失败'))
           }
         })
       })
diff --git a/packages/plugins/state/src/Main.vue b/packages/plugins/state/src/Main.vue
index b3aa9db5a..8689cf4b8 100644
--- a/packages/plugins/state/src/Main.vue
+++ b/packages/plugins/state/src/Main.vue
@@ -208,6 +208,7 @@ export default {
           updateSchema({ state: { ...(schema.state || {}), [name]: variable } })
 
           useHistory().addHistory()
+          openCommon()
         })
       } else {
         storeRef.value.validateForm().then(() => {
@@ -241,9 +242,9 @@ export default {
             isPanelShow.value = false
             useResource().appSchemaState.globalState = res.global_state || []
           })
+          openCommon()
         })
       }
-      openCommon()
     }
 
     const search = (value) => {
diff --git a/packages/settings/styles/src/components/background/ImageSetting.vue b/packages/settings/styles/src/components/background/ImageSetting.vue
index c089003ca..dd1fb79f2 100644
--- a/packages/settings/styles/src/components/background/ImageSetting.vue
+++ b/packages/settings/styles/src/components/background/ImageSetting.vue
@@ -1,21 +1,6 @@
 <template>
   <div class="background-row line">
     <label class="image-label">背景图</label>
-    <!-- <div class="image-content">
-      <div class="image-wrap">
-        <div class="image-inner"></div>
-      </div>
-      <div class="text-wrap">
-        <span class="size">background-image.svg</span>
-        <span class="size">250 * 250 3.4 KB</span>
-        <span>
-          <tiny-checkbox v-model="state.checked" @change="imageSizeChange">@2x</tiny-checkbox>
-        </span>
-      </div>
-      <div class="choose-image">
-        <span>选择图片</span>
-      </div>
-    </div> -->
     <tiny-input v-model="state.imgUrl" placeholder="请输入图片URL" @change="handleChangeImg"></tiny-input>
   </div>
   <div class="background-row line">
@@ -74,7 +59,6 @@
 
 <script setup>
 import { reactive, defineProps, defineEmits, onMounted } from 'vue'
-// import { Checkbox as TinyCheckbox } from '@opentiny/vue'
 import { Input as TinyInput } from '@opentiny/vue'
 import { TabsGroupConfigurator } from '@opentiny/tiny-engine-configurator'
 import PositionOrigin from './PositionOrigin.vue'
@@ -125,16 +109,6 @@ const handleChangeImg = (value) => {
   updateStyle({ [BACKGROUND_PROPERTY.BackgroundImage]: `url(${value})` })
 }
 
-// const imageSizeChange = (val) => {
-//   state.width = val ? '125' : 'Auto'
-//   state.widthSuffix = val ? 'px' : 'auto'
-//   state.height = 'Auto'
-//   state.heightSuffix = 'auto'
-//   val
-//     ? updateStyle({ [BACKGROUND_PROPERTY.BackgroundSize]: '125px' })
-//     : updateStyle({ [BACKGROUND_PROPERTY.BackgroundSize]: null })
-// }
-
 const selectSize = (value) => {
   if (value !== 'auto') {
     state.width = 'Auto'