fix(insert-footer-button)：设计器页面设置-输入设置中，保存取消按钮顺序错误，格式化按钮样式错误，应与UI保持一直…

…；大纲书导航中，眼睛图标，建议改为睁开就是可见，闭眼就是不可见；提示框样式修改 (opentiny#94) * fix(insert-footer-button)：设计器页面设置-输入设置中，保存取消按钮顺序错误，格式化按钮样式错误，应与UI保持一致; 大纲树导航中，眼睛图标，建议改为睁开就是可见，闭眼就是不可见; 提示框样式修改
MomoPoppy · Nov 22, 2023 · 68addea · 68addea
1 parent f6981fd
commit 68addea
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 27 deletions.
diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue
@@ -45,12 +45,12 @@
       </div>
       <template #footer>
         <div class="btn-box">
-          <tiny-button type="danger" v-if="language === 'json' && showFormatBtn" @click="formatCode">
+          <tiny-button plain type="danger" v-if="language === 'json' && showFormatBtn" @click="formatCode">
             {{ $t('common.format') }}
           </tiny-button>
           <div>
+            <tiny-button @click="close">{{ $t('common.cancel') }}</tiny-button>
             <tiny-button type="primary" @click="save">{{ $t('common.save') }}</tiny-button>
-            <tiny-button @click="close">{{ $t('common.close') }}</tiny-button>
           </div>
         </div>
       </template>

diff --git a/packages/controller/src/useModal.jsx b/packages/controller/src/useModal.jsx
@@ -24,10 +24,12 @@ const confirm = ({ title, status, message, exec, cancel, showFooter = true }) =>
   })
 }
 
-const message = ({ title, status, message, exec }) => {
+const message = ({ title, status, message, exec, width = '400' }) => {
   Modal.alert({
     title,
     status,
+    'confirm-btn-props': { text: '确定' },
+    width: width,
     message() {
       return (
         <div div class="modal-content" >

diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
@@ -1,14 +1,14 @@
 /**
-* Copyright (c) 2023 - present TinyEngine Authors.
-* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
-*
-* Use of this source code is governed by an MIT-style license.
-*
-* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
-* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
-* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
-*
-*/
+ * Copyright (c) 2023 - present TinyEngine Authors.
+ * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
+ *
+ * Use of this source code is governed by an MIT-style license.
+ *
+ * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
+ * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
+ * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
+ *
+ */
 
 import { reactive, readonly, onMounted } from 'vue'
 import { extend } from '@opentiny/vue-renderless/common/object'
@@ -534,16 +534,14 @@ export const getDeployProgress = (taskId, block) => {
         getDeployProgress(taskId, block)
       }, INTERVAL_PROGRESS)
     } else if (block.deployStatus === DEPLOY_STATUS.Stopped) {
-      const title = '异常提示'
-      const status = 'error'
-      const messagePub = {
-        render: () => <span style="max-height:540px;overflow:auto;">{`区块发布失败: ${block.taskResult}`}</span>
-      }
-      const exec = () => {
-        getDeployProgress(taskId, block)
-      }
-
-      confirm({ title, status, messagePub, exec })
+      message({
+        title: '异常提示',
+        status: 'error',
+        message: {
+          render: () => <span style="max-height:276px;overflow:auto;">{`区块发布失败: ${block.taskResult}`}</span>
+        },
+        width: '550'
+      })
       setDeployFailed(block)
     } else {
       setDeployFinished(block)

diff --git a/packages/plugins/materials/src/block/BlockGroup.vue b/packages/plugins/materials/src/block/BlockGroup.vue
@@ -85,7 +85,7 @@
                     class="confirm-btn"
                     size="small"
                     type="primary"
-                    @click="handleConfirmDeleteGroup(item.value.groupId)"
+                    @click="handleConfirmDeleteGroup(item.value)"
                   >
                     确定
                   </tiny-button>
@@ -145,6 +145,7 @@ import {
   DialogBox,
   Button,
   Tooltip,
+  Notify,
   Popover
 } from '@opentiny/vue'
 import { iconYes, iconClose, iconError } from '@opentiny/vue-icon'
@@ -319,7 +320,9 @@ export default {
       })
     }
 
-    const handleConfirmDeleteGroup = (groupId) => {
+    const handleConfirmDeleteGroup = (group) => {
+      const { groupId, groupName } = group
+      const messageSuccess = `${groupName}分组删除成功!`
       requestDeleteGroup(groupId)
         .then(() => {
           state.currentDeleteGroupId = null
@@ -330,6 +333,11 @@ export default {
               setBlockPanelVisible(false)
             }
           })
+          Notify({
+            type: 'success',
+            message: messageSuccess,
+            position: 'top-right'
+          })
         })
         .catch((error) => {
           message({ message: `删除区块分组失败: ${error.message || error}`, status: 'error' })

diff --git a/packages/plugins/tree/src/Main.vue b/packages/plugins/tree/src/Main.vue
@@ -58,8 +58,8 @@
                   <span>{{ data.row.componentName }}</span>
                 </span>
                 <span v-show="!data.row.show" class="tree-handle" @mouseup="showNode(data.row)">
-                  <icon-eyeopen v-show="!data.row.show"></icon-eyeopen>
-                  <icon-eyeclose v-show="data.row.show"></icon-eyeclose>
+                  <icon-eyeopen v-show="data.row.show"></icon-eyeopen>
+                  <icon-eyeclose v-show="!data.row.show"></icon-eyeclose>
                 </span>
               </span>
             </template>