fix: state & globalState getter (#930)

* fix: state & globalState getter 1. 修复 state getter、setter 无法保存、修改的bug 2. 修复 globalState getter 在画布计算不正确的 bug * fix: del useless variable
opentiny · Dec 10, 2024 · d45eb4b · d45eb4b
1 parent 1dc492a
commit d45eb4b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/canvas/render/src/RenderMain.js b/packages/canvas/render/src/RenderMain.js
@@ -58,7 +58,7 @@ watchEffect(() => {
     const computedGetters = Object.keys(getters).reduce(
       (acc, key) => ({
         ...acc,
-        [key]: parseData(getters[key], state, acc)
+        [key]: parseData(getters[key], null, acc)?.call?.(acc, state)
       }),
       {}
     )

diff --git a/packages/plugins/state/src/CreateVariable.vue b/packages/plugins/state/src/CreateVariable.vue
@@ -171,7 +171,6 @@ export default {
       errorMessage: '',
       activeName: ['initValue', 'getter', 'setter'],
       createData: getPropsCreateData(),
-      hasAccessor: isAccessorData(props.createData?.variable),
       variableType: getVarType(),
       getterEditorValue: props.createData.variable?.accessor?.getter?.value || DEFAULT_GETTER,
       setterEditorValue: props.createData.variable?.accessor?.setter?.value || DEFAULT_SETTER,
@@ -199,7 +198,6 @@ export default {
       () => props.createData.variable,
       () => {
         state.errorMessage = ''
-        state.hasAccessor = isAccessorData(props.createData?.variable)
         state.getterEditorValue = props.createData.variable?.accessor?.getter?.value || DEFAULT_GETTER
         state.setterEditorValue = props.createData.variable?.accessor?.setter?.value || DEFAULT_SETTER
         state.variableType = getVarType()
@@ -253,20 +251,26 @@ export default {
 
     const getFormData = () => {
       const defaultValue = getDefaultValue()
-      if (!state.hasAccessor) return defaultValue
 
       const getter = getterEditor.value.getEditor().getValue()
       const setter = setterEditor.value.getEditor().getValue()
       if (!getter && !setter) return defaultValue
 
       const result = { defaultValue }
+
       if (getter && getter !== DEFAULT_GETTER) {
         result.accessor = { ...result.accessor, getter: { type: 'JSFunction', value: getter } }
       }
+
       if (setter && setter !== DEFAULT_SETTER) {
         result.accessor = { ...result.accessor, setter: { type: 'JSFunction', value: setter } }
       }
 
+      // 没有设置 getter setter，需要直接返回 defaultValue
+      if (!result.accessor) {
+        return defaultValue
+      }
+
       return result
     }