@leafer/data 1.0.0-rc.6 → 1.0.0-rc.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/data",
-  "version": "1.0.0-rc.6",
+  "version": "1.0.0-rc.8",
   "description": "@leafer/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.6"
+    "@leafer/interface": "1.0.0-rc.8"
   }
 }

package/src/LeafData.ts

@@ -1,4 +1,4 @@
-import { ILeafData, ILeafDataOptions, ILeaf, IObject, __Value } from '@leafer/interface'
+import { ILeafData, ILeaf, IObject, IValue } from '@leafer/interface'
 
 
 export class LeafData implements ILeafData {
@@ -24,6 +24,18 @@ export class LeafData implements ILeafData {
         return (this as IObject)[name]
     }
 
+    public __getData(): IObject {
+        const data: IObject = { tag: this.__leaf.tag }, { __input } = this
+        let inputValue: IValue
+        for (let key in this) {
+            if (key[0] !== '_') {
+                inputValue = __input ? __input[key] : undefined
+                data[key] = (inputValue === undefined) ? this[key] : inputValue
+            }
+        }
+        return data
+    }
+
     public __setInput(name: string, value: any): void {
         this.__input || (this.__input = {})
         this.__input[name] = value
@@ -41,19 +53,15 @@ export class LeafData implements ILeafData {
         if (this.__input && this.__input[name] !== undefined) this.__input[name] = undefined
     }
 
-    public __getInputData(options?: ILeafDataOptions): IObject {
+    public __getInputData(): IObject {
         const data: IObject = { tag: this.__leaf.tag }, { __input } = this
-        if (options) {
-            for (let key in this) {
-                if (key[0] !== '_') data[key] = this[key]
-            }
-        } else {
-            let realKey: string, value: __Value
-            for (let key in this) {
-                realKey = key.substring(1)
-                if ((this as any)[realKey] !== undefined) {
-                    value = __input ? __input[realKey] : undefined
-                    data[realKey] = value === undefined ? this[key] : value
+        let value: IValue, inputValue: IValue
+        for (let key in this) {
+            if (key[0] !== '_') {
+                value = (this as IObject)['_' + key]
+                if (value !== undefined) {
+                    inputValue = __input ? __input[key] : undefined
+                    data[key] = (inputValue === undefined) ? value : inputValue
                 }
             }
         }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IObject, ILeafData, ILeaf, ILeafDataOptions } from '@leafer/interface';
+import { IObject, ILeafData, ILeaf } from '@leafer/interface';
 
 declare const DataHelper: {
     default<T>(t: T, defaultData: IObject): T;
@@ -16,10 +16,11 @@ declare class LeafData implements ILeafData {
     __naturalHeight?: number;
     constructor(leaf: ILeaf);
     __get(name: string): any;
+    __getData(): IObject;
     __setInput(name: string, value: any): void;
     __getInput(name: string): any;
     __removeInput(name: string): void;
-    __getInputData(options?: ILeafDataOptions): IObject;
+    __getInputData(): IObject;
     __setMiddle(name: string, value: any): void;
     __getMiddle(name: string): any;
     __checkSingle(): void;