@fugood/bricks-project 2.21.0-beta.18-1 → 2.21.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.21.0-beta.18-1",
+  "version": "2.21.0-beta.19",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -12,5 +12,6 @@
     "escodegen": "^2.1.0",
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
-  }
+  },
+  "gitHead": "0d8535614551b74553cb3d09801dbfe1c14a78fc"
 }

package/types/canvas.ts

@@ -13,7 +13,7 @@ interface CanvasDef {
     /* The showing timeout of Canvas, need to set `Next Canvas ID` as well */
     showingTimeout?: number | DataLink
     /* Canvas ID for change next canvas on showing timeout */
-    nextCanvasId?: string | DataLink
+    nextCanvasId?: string | DataLink | (() => Canvas)
     /* Canvas's background color */
     backgroundColor?: string | DataLink
     /* Dismiss keyboard on press */

package/types/switch.ts

@@ -1,5 +1,6 @@
 import type { Canvas } from './canvas'
 import type { Data } from './data'
+
 export type SwitchCondInnerStateCurrentCanvas = {
   __typename: 'SwitchCondInnerStateCurrentCanvas'
   value: () => Canvas
@@ -21,19 +22,7 @@ export interface SwitchDef {
   id: string
   title?: string
   description?: string
-  override?: {
-    animation?: boolean
-    event?: boolean
-    property?: boolean
-    outlet?: boolean
-  }
-  disabled?: boolean
-  break?: boolean
-  // Default property, events, outlets, animation, conds
-  property?: {}
-  events?: {}
-  outlets?: {}
-  animation?: {}
+  // Default conditions
   conds?: Array<{
     method: '==' | '!=' | '>' | '<' | '>=' | '<='
     cond:
@@ -45,4 +34,18 @@ export interface SwitchDef {
           value: any
         }
   }>
+  // Default property, events, outlets, animation
+  property?: {}
+  events?: {}
+  outlets?: {}
+  animation?: {}
+  // Override the default items and hitted switch items before the switch
+  override?: {
+    animation?: boolean
+    event?: boolean
+    property?: boolean
+    outlet?: boolean
+  }
+  disabled?: boolean
+  break?: boolean
 }

package/utils/data.ts

@@ -72,6 +72,7 @@ type SystemDataName =
   | 'isSupportAuthInDevice'
   | 'env'
   | 'isViewDebugModeEnabled'
+  | 'language'
 
 type SystemDataInfo = {
   name: SystemDataName
@@ -405,6 +406,14 @@ export const systemDataList: Array<SystemDataInfo> = [
     type: 'bool',
     value: false,
   },
+  {
+    name: 'language',
+    id: 'PROPERTY_BANK_DATA_NODE_f0ed0a03-6195-459f-9ffe-bca61923f94e',
+    title: 'SYSTEM: Language',
+    description: 'Language of the device',
+    type: 'string',
+    value: '',
+  },
 ]
 
 export const useSystemData = (name: SystemDataName): Data => {