@rugal.tu/vuemodel3 1.5.8 → 1.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rugal.tu/vuemodel3",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "publishConfig": {
     "access": "public"
   },

package/src/VueModel.d.ts

@@ -297,14 +297,13 @@ type CommandOption = {
     FuncAction?: boolean;
     FuncArgs?: PathType;
 };
-type TreeWatchOption = {
-    CallBack: WatchCallback;
-    Option?: WatchOptions;
-};
+type AddCommandOption = PathType | Function | CommandOption;
 export type TreeSetType = {
     'using'?: UsingFunctionType;
     'store'?: any;
     [DomName: `:${string}`]: UsingFunctionType | TreeSetType;
+    [TagName: `@${string}`]: UsingFunctionType | TreeSetType;
+    [TagName: `tag:${string}`]: UsingFunctionType | TreeSetType;
     'watch'?: WatchCallback | TreeWatchOption;
     [WatchTargetCmd: `watch:${string}`]: WatchCallback | TreeWatchOption;
     'func'?: Function;
@@ -347,7 +346,6 @@ type TreeSetFuncOption = {
     TargetFunc: PathType | Function;
     Args?: PathType;
 };
-type AddCommandOption = PathType | Function | CommandOption;
 type TreeSetInfo = {
     Nodes?: QueryNode[];
     TreePaths: string[];
@@ -363,6 +361,10 @@ type TreeSetInfoOption = {
     TargetDom: PathType | QueryNode[];
     TargetValue: PathType | Function | CommandOption;
 };
+type TreeWatchOption = {
+    CallBack: WatchCallback;
+    Option?: WatchOptions;
+};
 type AddV_ModelOption = {
     ModelValue?: string;
     DefaultValue?: any;
@@ -414,7 +416,7 @@ export declare class VueCommand extends VueStore {
     protected $AddCommand(DomName: PathType | QueryNode[], Command: string, Option: CommandOption): void;
     protected $SetAttribute(Dom: HTMLElement, AttrName: string, AttrValue: string): void;
     protected $RandomFuncName(BaseFuncName: string): string;
-    protected $GenerateEventFunction(DomName: PathType, EventFunc: Function, Command: string): string;
+    protected $GenerateEventFunction(domName: PathType, eventFunc: Function, command: string): string;
 }
 export declare class VueModel extends VueCommand {
     $NativeWarn: (...Message: any[]) => void;

package/src/VueModel.ts

@@ -257,6 +257,7 @@ export class QueryNode extends FuncBase {
     DomName: string = null;
     Parent: QueryNode = null;
     Children: QueryNode[] = [];
+    //DomChildren: 
     ElementDeep: number = 0;
     NodeDeep: number = 0;
     constructor(Dom: HTMLElement) {
@@ -266,9 +267,11 @@ export class QueryNode extends FuncBase {
     }
 
     public Query(DomName: PathType, Option?: QueryOption): QueryNode[] {
+        Option ??= { Mode: 'Multi' };
         return this.$RCS_QueryChildrens(this, DomName, Option);
     }
     public QueryCss(Selector: string, Option?: QueryOption): QueryNode[] {
+        Option ??= { Mode: 'Multi' };
         return this.$RCS_QueryCssChildrens(this, Selector, Option);
     }
     public Selector(Selector: string) {
@@ -289,7 +292,22 @@ export class QueryNode extends FuncBase {
         for (let NodeItem of TargetNode.Children) {
             if (Array.isArray(DomName)) {
                 let Names: PathType = [...DomName];
-                let FirstName = Names.shift();
+                let FirstName = Names.shift() as string;
+
+                const pathRegex = FirstName.match(/^(?<key>[^:]+):(?<name>.+)$/);
+                if (pathRegex) {
+                    const key = pathRegex.groups.key;
+                    const name = pathRegex.groups.name;
+                    switch (key) {
+                        case 'tag':
+                            //TargetNode.Dom.
+                            //Todo: 
+                            break;
+                        default:
+                            FirstName = name;
+                            break;
+                    }
+                }
                 if (NodeItem.DomName == FirstName) {
                     if (Names.length == 1)
                         Names = Names[0];
@@ -1546,14 +1564,13 @@ type CommandOption = {
     FuncAction?: boolean;
     FuncArgs?: PathType,
 };
-type TreeWatchOption = {
-    CallBack: WatchCallback,
-    Option?: WatchOptions,
-}
+type AddCommandOption = PathType | Function | CommandOption;
 export type TreeSetType = {
     'using'?: UsingFunctionType,
     'store'?: any,
     [DomName: `:${string}`]: UsingFunctionType | TreeSetType,
+    [TagName: `@${string}`]: UsingFunctionType | TreeSetType,
+    [TagName: `tag:${string}`]: UsingFunctionType | TreeSetType,
 
     'watch'?: WatchCallback | TreeWatchOption,
     [WatchTargetCmd: `watch:${string}`]: WatchCallback | TreeWatchOption,
@@ -1609,8 +1626,6 @@ type TreeSetFuncOption = {
     TargetFunc: PathType | Function,
     Args?: PathType,
 };
-type AddCommandOption = PathType | Function | CommandOption;
-
 type TreeSetInfo = {
     Nodes?: QueryNode[],
     TreePaths: string[],
@@ -1626,6 +1641,10 @@ type TreeSetInfoOption = {
     TargetDom: PathType | QueryNode[],
     TargetValue: PathType | Function | CommandOption,
 };
+type TreeWatchOption = {
+    CallBack: WatchCallback,
+    Option?: WatchOptions,
+};
 type AddV_ModelOption = {
     ModelValue?: string,
     DefaultValue?: any,
@@ -2191,14 +2210,14 @@ export class VueCommand extends VueStore {
                 if (Option.get)
                     return Option.get();
 
-                return this.$get(PropertyKey);
+                return (this as any).$get(PropertyKey);
             },
             set(Value) {
                 if (Option.set) {
                     Option.set(Value);
                     return;
                 }
-                this.$set(PropertyKey, Value);
+                (this as any).$set(PropertyKey, Value);
             }
         };
 
@@ -2328,12 +2347,14 @@ export class VueCommand extends VueStore {
     protected $RandomFuncName(BaseFuncName: string) {
         return `${BaseFuncName}${this.GenerateIdReplace('')}`.replace(/[-:.]/g, '_');
     }
-    protected $GenerateEventFunction(DomName: PathType, EventFunc: Function, Command: string) {
-        let FuncName = this.$RandomFuncName(`${Command}_`);
-        DomName = this.Paths(DomName);
-        let FullFuncPath = ['event', ...DomName, FuncName];
-        this.AddV_Function(FullFuncPath, EventFunc);
-        return this.ToJoin(FullFuncPath);
+    protected $GenerateEventFunction(domName: PathType, eventFunc: Function, command: string) {
+        const funcName = this.$RandomFuncName(`${command}_`);
+        domName = this.Paths(domName);
+        const fullFuncPath = ['event', ...domName, funcName]
+            .filter(item => item != null && item != '');
+
+        this.AddV_Function(fullFuncPath, eventFunc);
+        return this.ToJoin(fullFuncPath);
     }
     //#endregion