diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue
index 2977b040c8..edcd9975d7 100644
--- a/packages/common/component/MetaCodeEditor.vue
+++ b/packages/common/component/MetaCodeEditor.vue
@@ -45,12 +45,12 @@
-
+
{{ $t('common.format') }}
+ {{ $t('common.cancel') }}
{{ $t('common.save') }}
- {{ $t('common.close') }}
diff --git a/packages/controller/src/useModal.jsx b/packages/controller/src/useModal.jsx
index 1ec9f334b7..3c0b0bf8c1 100644
--- 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 (
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 12a8ebac7e..19e8410d76 100644
--- 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: () => {`区块发布失败: ${block.taskResult}`}
- }
- const exec = () => {
- getDeployProgress(taskId, block)
- }
-
- confirm({ title, status, messagePub, exec })
+ message({
+ title: '异常提示',
+ status: 'error',
+ message: {
+ render: () => {`区块发布失败: ${block.taskResult}`}
+ },
+ 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
index 9567fbd88c..2e93fa7efe 100644
--- 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)"
>
确定
@@ -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
index 013480453a..4efe994b31 100644
--- a/packages/plugins/tree/src/Main.vue
+++ b/packages/plugins/tree/src/Main.vue
@@ -58,8 +58,8 @@
{{ data.row.componentName }}
-
-
+
+