feat:标注支持组件映射关系

wuba · Jul 22, 2021 · c0a0f39 · c0a0f39
1 parent 6749f5c
commit c0a0f39
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/picasso-package/packages/picasso-dsl/src/Component/BaseComponent.ts b/picasso-package/packages/picasso-dsl/src/Component/BaseComponent.ts
@@ -16,4 +16,9 @@ export interface BaseComponent {
     value?: string // 内容
     panel?: Panel // 标注面板
     symbolName?: string //组件名称
+    symbolComponentObject?: { // 组件映射对象
+        url: string,
+        code_name: string,
+        code_lib_name: string,
+    } 
 }
diff --git a/picasso-package/packages/picasso-parse/package.json b/picasso-package/packages/picasso-parse/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@wubafe/picasso-parse",
-    "version": "0.0.29",
+    "version": "0.0.30",
     "description": "Picasso解析库",
     "main": "dist/picasso-parse/src/index.js",
     "scripts": {

diff --git a/picasso-package/packages/picasso-parse/src/parseDSL/filterGroupLayer.ts b/picasso-package/packages/picasso-parse/src/parseDSL/filterGroupLayer.ts
@@ -8,7 +8,7 @@ import { SKLayer } from '../types'
  */
 const filterGroupLayer = (layers:SKLayer[],afterLayer:SKLayer[]=[]):SKLayer[] => {
     layers.forEach((layer:SKLayer) => {
-        if (layer._class!=='group') {
+        if (layer._class!=='group' || layer.symbolComponentObject) {
             afterLayer.push({...layer,layers:[]})
         }
         if (Array.isArray(layer.layers)) {

diff --git a/picasso-package/packages/picasso-parse/src/parseDSL/index.ts b/picasso-package/packages/picasso-parse/src/parseDSL/index.ts
@@ -16,6 +16,10 @@ const _parseDSL = (sketchData: SKLayer[]):DSL => {
             symbolName: layer.symbolName || ''
         }
 
+        if (layer.symbolComponentObject) {
+            dslLayer.symbolComponentObject = layer.symbolComponentObject;
+        }
+
         // 面板解析
         dslLayer.panel = layer.panel;
         // 结构解析

diff --git a/picasso-package/packages/picasso-parse/tsconfig.json b/picasso-package/packages/picasso-parse/tsconfig.json
@@ -3,6 +3,7 @@
         "src", "../picasso-trans/src/parseCode.ts" // 会编译src目录下的所有文件，包括子目录
     ],
     "compilerOptions": {
+        "lib":  ["dom", "es2017"],
         "target": "es6", // 指定ECMAScript目标版本
         "module": "commonjs", // 指定模块化类型
         "declaration": true, // 生成 `.d.ts` 文件

diff --git a/picasso-package/packages/sketch-dsl/src/index.ts b/picasso-package/packages/sketch-dsl/src/index.ts
@@ -68,6 +68,11 @@ export type SKLayer = {
     hasConvertedToNewRoundCorners?: boolean
     panel?: Panel
     symbolName?: string
+    symbolComponentObject?: {
+        url: string,
+        code_name: string,
+        code_lib_name: string,
+    },
     sharedLayerStyleName?: string
     sharedTextStyleName?: string
 }

diff --git a/picasso-package/tsconfig.json b/picasso-package/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "lib": ["dom", "es2017"],
         "module": "commonjs",
         "target": "es6",
         "experimentalDecorators": true,