fix: add error handling

opentiny · Dec 11, 2024 · 7886450 · 7886450
1 parent c777b18
commit 7886450
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 12 deletions.
diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
@@ -31,7 +31,8 @@ import {
   getOptions,
   getMetaApi,
   META_SERVICE,
-  useMessage
+  useMessage,
+  useNotify
 } from '@opentiny/tiny-engine-meta-register'
 import { constants } from '@opentiny/tiny-engine-utils'
 import * as ast from '@opentiny/tiny-engine-common/js/ast'
@@ -188,7 +189,8 @@ export default {
         request: getMetaApi(META_SERVICE.Http).getHttp(),
         ast,
         useModal,
-        useMessage
+        useMessage,
+        useNotify
       },
       CanvasLayout,
       canvasRef,

diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js
@@ -356,10 +356,14 @@ const operationTypeMap = {
       node = pageState.pageSchema
     }
 
+    if (!node.props) {
+      node.props = {}
+    }
+
     if (overwrite) {
       node.props = value.props
     } else {
-      Object.assign(node, value || {})
+      Object.assign(node.props, value?.props || {})
     }
 
     return {

diff --git a/packages/canvas/render/src/RenderMain.js b/packages/canvas/render/src/RenderMain.js
@@ -64,6 +64,10 @@ const getDeletedKeys = (objA, objB) => {
 const getUtils = () => utils
 
 const setUtils = (data) => {
+  if (!Array.isArray(data)) {
+    return
+  }
+
   // 筛选出来已经被删除的 key
   const newKeys = new Set(data.map(({ name }) => name))
   const currentKeys = Object.keys(utils)
@@ -150,6 +154,10 @@ const generateStateAccessors = (type, accessor, key) => {
 }
 
 const setState = (data) => {
+  if (typeof data !== 'object' || data === null) {
+    return
+  }
+
   const deletedKeys = getDeletedKeys(state, data)
 
   // 同步删除的 key

diff --git a/packages/canvas/render/src/builtin/CanvasCollection.js b/packages/canvas/render/src/builtin/CanvasCollection.js
@@ -119,12 +119,19 @@ const askShouldImportData = ({ node, sourceRef, updateKey }) => {
     .confirm({
       message: '检测到表格存在配置的数据，是否需要引入？',
       exec() {
-        const sourceColumns = sourceRef.value?.data?.columns?.map(({ title, field }) => ({ title, field })) || []
-        // 这里需要找到对应列，然后进行列合并
-        node.props.columns = generateAssignColumns(sourceColumns, node.props.columns)
-
-        publish({ topic: 'schemaChange', data: {} })
-        updateKey.value++
+        try {
+          const sourceColumns = sourceRef.value?.data?.columns?.map(({ title, field }) => ({ title, field })) || []
+          // 这里需要找到对应列，然后进行列合并
+          node.props.columns = generateAssignColumns(sourceColumns, node.props.columns)
+
+          publish({ topic: 'schemaChange', data: {} })
+          updateKey.value++
+        } catch (error) {
+          getController().useNotify({
+            type: 'error',
+            message: '引入配置数据失败'
+          })
+        }
       },
       cancel() {
         node.props.columns = [...(sourceRef.value.data?.columns || [])]

diff --git a/packages/configurator/src/container-configurator/ContainerConfigurator.vue b/packages/configurator/src/container-configurator/ContainerConfigurator.vue
@@ -129,7 +129,7 @@ export default {
       const { operateNode } = useCanvas()
       const id = value.id
 
-      operateNode({ type: 'changeProps', id, value: value.props })
+      operateNode({ type: 'changeProps', id, value: { props: value.props } })
     }
 
     return { children, addChildren, delChildren, dragEnd, onTitleUpdate }

diff --git a/packages/plugins/bridge/src/js/resource.js b/packages/plugins/bridge/src/js/resource.js
@@ -181,6 +181,16 @@ export const saveResource = (data, callback, emit) => {
     requestUpdateReSource(data).then((result) => {
       if (result) {
         const index = useResource().appSchemaState[data.category].findIndex((item) => item.name === result.name)
+
+        if (index === -1) {
+          useNotify({
+            type: 'error',
+            message: '修改失败'
+          })
+
+          return
+        }
+
         useResource().appSchemaState[data.category][index] = result
 
         // 更新画布工具函数环境，保证渲染最新工具类返回值, 并触发画布的强制刷新
@@ -222,6 +232,16 @@ export const deleteData = (name, callback, emit) => {
   requestDeleteReSource(params).then((data) => {
     if (data) {
       const index = useResource().appSchemaState[state.type].findIndex((item) => item.name === data.name)
+
+      if (index === -1) {
+        useNotify({
+          type: 'error',
+          message: '删除失败'
+        })
+
+        return
+      }
+
       useResource().appSchemaState[state.type].splice(index, 1)
 
       generateBridgeUtil(getAppId())

diff --git a/packages/plugins/i18n/src/composable/useTranslate.js b/packages/plugins/i18n/src/composable/useTranslate.js
@@ -135,7 +135,7 @@ const getI18n = async ({ init, local }) => {
 
     return { locales, messages }
   } else {
-    const i18n = init ? appSchemaState.langs : await getI18nData
+    const i18n = init ? appSchemaState.langs : await getI18nData()
 
     return i18n
   }

diff --git a/packages/plugins/state/src/Main.vue b/packages/plugins/state/src/Main.vue
@@ -340,7 +340,7 @@ export default {
       } else {
         const pageSchema = getSchema() || {}
 
-        state.dataSource = pageSchema.state
+        state.dataSource = pageSchema.state || {}
       }
     }