@ibiz-template/vue3-components 0.7.38-alpha.12 → 0.7.38-alpha.21

package/es/control/tree/el-tree-util.d.ts

@@ -1,7 +1,28 @@
-import { ITreeController, ITreeNodeData } from '@ibiz-template/runtime';
+import { IControlProvider, ITreeController, ITreeNodeData, TreeController } from '@ibiz-template/runtime';
+import { IDETree } from '@ibiz/model-core';
 import { ElTree } from 'element-plus';
 import { NodeDropType } from 'element-plus/es/components/tree/src/tree.type';
 import { Ref } from 'vue';
+/**
+ * 树props接口
+ *
+ * @export
+ * @interface IGridProps
+ */
+export interface ITreeProps {
+    modelData: IDETree;
+    context: IContext;
+    params: IParams;
+    provider?: IControlProvider;
+    mdctrlActiveMode?: number;
+    singleSelect?: boolean;
+    navigational?: boolean;
+    defaultExpandedKeys?: string[];
+    checkStrictly?: boolean;
+    isSimple?: boolean;
+    data?: Array<ITreeNodeData>;
+    loadDefault: boolean;
+}
 /**
  * 根据id查找树节点数据对象
  * @author lxm
@@ -918,3 +939,20 @@ export declare function useElTreeUtil(treeRef: Ref<InstanceType<typeof ElTree> |
  * @return {*}  {('inner' | 'prev' | 'next')}
  */
 export declare function formatNodeDropType(dropType: NodeDropType): 'inner' | 'prev' | 'next';
+/**
+ * 初始化树数据
+ *
+ * @export
+ * @param {TreeController} c
+ * @param {ITreeProps} props
+ */
+export declare function useAppTreeBase(c: TreeController, props: ITreeProps): void;
+/**
+ * 根据关系获取当前项的子节点
+ *
+ * @export
+ * @param {TreeController} c
+ * @param {IData} modelData
+ * @param {IData} curItem
+ */
+export declare function findChildItems(c: TreeController, modelData: IData, curItem: IData): IData[];

package/es/control/tree/el-tree-util.mjs

@@ -1,5 +1,7 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { debounce } from 'lodash-es';
+import { createUUID } from 'qx-util';
+import { debounce, cloneDeep } from 'lodash-es';
+import { watch } from 'vue';
 
 "use strict";
 function findNodeData(key, c) {
@@ -71,5 +73,71 @@ function formatNodeDropType(dropType) {
       );
   }
 }
+function useAppTreeBase(c, props) {
+  if (props.defaultExpandedKeys) {
+    c.state.defaultExpandedKeys = props.defaultExpandedKeys;
+  }
+  const initSimpleData = () => {
+    if (!props.data) {
+      return;
+    }
+    const root = props.data.find((item) => {
+      return item.isRoot === true;
+    });
+    if (root) {
+      c.state.rootNodes = props.data;
+      c.state.items = props.data;
+    }
+  };
+  c.evt.on("onCreated", async () => {
+    if (props.isSimple) {
+      initSimpleData();
+      c.state.isLoaded = true;
+    }
+  });
+  watch(
+    () => props.data,
+    () => {
+      if (props.isSimple) {
+        initSimpleData();
+      }
+    },
+    {
+      deep: true
+    }
+  );
+}
+function findChildItems(c, modelData, curItem) {
+  const { detreeNodeRSs } = modelData;
+  const children = [];
+  if (!detreeNodeRSs || detreeNodeRSs.length === 0) {
+    return children;
+  }
+  const rss = detreeNodeRSs.filter((_rss) => {
+    var _a;
+    const temp = c.state.items.find((_item) => {
+      return _item._uuid === curItem.data._uuid;
+    });
+    if (temp) {
+      return _rss.parentDETreeNodeId === ((_a = temp._nodeId) == null ? void 0 : _a.toLowerCase());
+    }
+    return false;
+  });
+  rss.sort((a, b) => {
+    return a.ordervalue - b.ordervalue;
+  });
+  rss.forEach((_rss) => {
+    const child = c.state.items.find((_item) => {
+      var _a;
+      return ((_a = _item._nodeId) == null ? void 0 : _a.toLowerCase()) === _rss.childDETreeNodeId;
+    });
+    if (child) {
+      const temp = cloneDeep(child);
+      temp._id = createUUID();
+      children.push(temp);
+    }
+  });
+  return children;
+}
 
-export { findNodeData, formatNodeDropType, useElTreeUtil };
+export { findChildItems, findNodeData, formatNodeDropType, useAppTreeBase, useElTreeUtil };

package/es/control/tree/index.d.ts

@@ -43,10 +43,10 @@ export declare const IBizTreeControl: import("@ibiz-template/vue3-util").TypeWit
     };
     data: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): import("@ibiz-template/runtime").ITreeNodeData[];
+            (...items: import("@ibiz-template/runtime").ITreeNodeData[]): import("@ibiz-template/runtime").ITreeNodeData[];
+            new (arrayLength: number): import("@ibiz-template/runtime").ITreeNodeData[];
+            new (...items: import("@ibiz-template/runtime").ITreeNodeData[]): import("@ibiz-template/runtime").ITreeNodeData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -56,7 +56,7 @@ export declare const IBizTreeControl: import("@ibiz-template/vue3-util").TypeWit
             of<T_4>(...items: T_4[]): T_4[];
             readonly [Symbol.species]: ArrayConstructor;
         };
-        default: () => never[];
+        required: false;
     };
 }, {
     c: import("@ibiz-template/runtime").TreeController<import("@ibiz/model-core").IDETree, import("@ibiz-template/runtime").ITreeState, import("@ibiz-template/runtime").ITreeEvent>;
@@ -965,7 +965,7 @@ export declare const IBizTreeControl: import("@ibiz-template/vue3-util").TypeWit
     onCheck: (nodeData: import("@ibiz-template/runtime").ITreeNodeData, opts: {
         checkedNodes: import("@ibiz-template/runtime").ITreeNodeData[];
     }) => void;
-    onNodeClick: (nodeData: import("@ibiz-template/runtime").ITreeNodeData, evt: MouseEvent) => void;
+    onNodeClick: (nodeData: import("@ibiz-template/runtime").ITreeNodeData, data: IData, evt: MouseEvent) => void;
     onNodeDbClick: (nodeData: import("@ibiz-template/runtime").ITreeNodeData, evt: MouseEvent) => void;
     onNodeContextmenu: (nodeData: import("@ibiz-template/runtime").ITreeNodeData, evt: MouseEvent) => Promise<void>;
     loadData: (item: IData, callback: (nodes: IData[]) => void) => Promise<void>;
@@ -976,8 +976,9 @@ export declare const IBizTreeControl: import("@ibiz-template/vue3-util").TypeWit
     allowDrop: (draggingNode: IData, dropNode: IData, type: import("element-plus/es/components/tree/src/tree.type").AllowDropType) => boolean;
     allowDrag: (draggingNode: IData) => boolean;
     handleDrop: (draggingNode: IData, dropNode: IData, dropType: import("element-plus/es/components/tree/src/tree.type").NodeDropType) => void;
+    onShowNavView: () => void;
     onNodeTextEditBlur: () => Promise<void>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "nodeClick"[], "nodeClick", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: import("vue").PropType<import("@ibiz/model-core").IDETree>;
         required: true;
@@ -1022,10 +1023,10 @@ export declare const IBizTreeControl: import("@ibiz-template/vue3-util").TypeWit
     };
     data: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): import("@ibiz-template/runtime").ITreeNodeData[];
+            (...items: import("@ibiz-template/runtime").ITreeNodeData[]): import("@ibiz-template/runtime").ITreeNodeData[];
+            new (arrayLength: number): import("@ibiz-template/runtime").ITreeNodeData[];
+            new (...items: import("@ibiz-template/runtime").ITreeNodeData[]): import("@ibiz-template/runtime").ITreeNodeData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -1035,10 +1036,11 @@ export declare const IBizTreeControl: import("@ibiz-template/vue3-util").TypeWit
             of<T_4>(...items: T_4[]): T_4[];
             readonly [Symbol.species]: ArrayConstructor;
         };
-        default: () => never[];
+        required: false;
     };
-}>>, {
-    data: IData[];
+}>> & {
+    onNodeClick?: ((...args: any[]) => any) | undefined;
+}, {
     params: IParams;
     mdctrlActiveMode: number;
     singleSelect: boolean;

package/es/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-text-color:var(--ibiz-color-text-0);--ibiz-control-treeview-bg-color:transparent;--ibiz-control-treeview-disabled-color:var(--ibiz-color-disabled-text);--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) 0;--ibiz-control-treeview-row-hover-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-row-select-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-select-bg-color:var(--ibiz-color-primary-light-default);--ibiz-control-treeview-font-size:var(--ibiz-font-size-regular);--ibiz-control-treeview-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-treeview-node-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-node-icon-width:var(--ibiz-spacing-base);--ibiz-control-treeview-node-icon-margin-right:var(--ibiz-spacing-tight);--ibiz-control-treeview-node-height:26px;--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2);--ibiz-control-treeview-quick-search-padding:0 var(--ibiz-spacing-base) var(--ibiz-spacing-tight);--ibiz-control-treeview-tree-padding:0 var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{display:flex;align-items:center;width:var(--ibiz-control-treeview-node-icon-width);height:var(--ibiz-control-treeview-node-icon-height);margin-right:var(--ibiz-control-treeview-node-icon-margin-right)}.ibiz-control-treeview-node__icon>svg{width:100%;height:100%}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-control-treeview-disabled-color);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:var(--ibiz-control-treeview-context-menu-width);text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu{--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2)}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-control-treeview-context-menu-padding);background-color:var(--ibiz-control-treeview-context-menu-bg-color);border-radius:var(--ibiz-control-treeview-context-menu-border-radius);--mx-menu-text:var(--ibiz-control-treeview-context-menu-text-color)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{height:var(--ibiz-control-treeview-context-menu-item-height);padding:var(--ibiz-control-treeview-context-menu-item-padding)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item:hover{color:var(--ibiz-control-treeview-context-menu-text-color);background-color:var(--ibiz-control-treeview-context-menu-hover-color)}.ibiz-control-treeview-quick-search{padding:var(--ibiz-control-treeview-quick-search-padding)}.ibiz-control-treeview-tree.el-tree{--el-tree-text-color:var(--ibiz-control-treeview-text-color);--el-tree-node-content-height:var(--ibiz-control-treeview-node-height);padding:var(--ibiz-control-treeview-tree-padding);background-color:var(--ibiz-control-treeview-bg-color)}.ibiz-control-treeview-tree.el-tree .el-tree-node__content:hover{color:var(--ibiz-control-treeview-row-hover-color);background-color:var(--ibiz-control-treeview-row-hover-bg-color)}.ibiz-control-treeview-tree.el-tree.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{color:var(--ibiz-control-treeview-row-select-color);background-color:var(--ibiz-control-treeview-row-select-bg-color)}
+.ibiz-control-treeview{--ibiz-control-treeview-text-color:var(--ibiz-color-text-0);--ibiz-control-treeview-bg-color:transparent;--ibiz-control-treeview-disabled-color:var(--ibiz-color-disabled-text);--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) 0;--ibiz-control-treeview-row-hover-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-row-select-color:var(--ibiz-color-text-0);--ibiz-control-treeview-row-select-bg-color:var(--ibiz-color-primary-light-default);--ibiz-control-treeview-font-size:var(--ibiz-font-size-regular);--ibiz-control-treeview-font-weight:var(--ibiz-font-weight-regular);--ibiz-control-treeview-node-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-node-icon-width:var(--ibiz-spacing-base);--ibiz-control-treeview-node-icon-margin-right:var(--ibiz-spacing-tight);--ibiz-control-treeview-node-height:26px;--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2);--ibiz-control-treeview-quick-search-padding:0 var(--ibiz-spacing-base) var(--ibiz-spacing-tight);--ibiz-control-treeview-tree-padding:0 var(--ibiz-spacing-base);position:relative;height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview__nav-icon{right:10px;top:14px;cursor:pointer;position:absolute;color:var(--ibiz-color-primary)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{display:flex;align-items:center;width:var(--ibiz-control-treeview-node-icon-width);height:var(--ibiz-control-treeview-node-icon-height);margin-right:var(--ibiz-control-treeview-node-icon-margin-right)}.ibiz-control-treeview-node__icon>svg{width:100%;height:100%}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-control-treeview-disabled-color);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:var(--ibiz-control-treeview-context-menu-width);text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu{--ibiz-control-treeview-context-menu-width:30px;--ibiz-control-treeview-context-menu-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-control-treeview-context-menu-item-height:40px;--ibiz-control-treeview-context-menu-border-radius:var(--ibiz-spacing-none);--ibiz-control-treeview-context-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-control-treeview-context-menu-hover-color:var(--ibiz-color-fill-0);--ibiz-control-treeview-context-menu-text-color:var(--ibiz-color-text-2)}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-control-treeview-context-menu-padding);background-color:var(--ibiz-control-treeview-context-menu-bg-color);border-radius:var(--ibiz-control-treeview-context-menu-border-radius);--mx-menu-text:var(--ibiz-control-treeview-context-menu-text-color)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{height:var(--ibiz-control-treeview-context-menu-item-height);padding:var(--ibiz-control-treeview-context-menu-item-padding)}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item:hover{color:var(--ibiz-control-treeview-context-menu-text-color);background-color:var(--ibiz-control-treeview-context-menu-hover-color)}.ibiz-control-treeview-quick-search{padding:var(--ibiz-control-treeview-quick-search-padding)}.ibiz-control-treeview-tree.el-tree{--el-tree-text-color:var(--ibiz-control-treeview-text-color);--el-tree-node-content-height:var(--ibiz-control-treeview-node-height);padding:var(--ibiz-control-treeview-tree-padding);background-color:var(--ibiz-control-treeview-bg-color)}.ibiz-control-treeview-tree.el-tree .el-tree-node__content:hover{color:var(--ibiz-control-treeview-row-hover-color);background-color:var(--ibiz-control-treeview-row-hover-bg-color)}.ibiz-control-treeview-tree.el-tree.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{color:var(--ibiz-control-treeview-row-select-color);background-color:var(--ibiz-control-treeview-row-select-bg-color)}

package/es/control/tree/tree.d.ts

@@ -64,10 +64,10 @@ export declare const TreeControl: import("vue").DefineComponent<{
     };
     data: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): ITreeNodeData[];
+            (...items: ITreeNodeData[]): ITreeNodeData[];
+            new (arrayLength: number): ITreeNodeData[];
+            new (...items: ITreeNodeData[]): ITreeNodeData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -77,7 +77,7 @@ export declare const TreeControl: import("vue").DefineComponent<{
             of<T_4>(...items: T_4[]): T_4[];
             readonly [Symbol.species]: ArrayConstructor;
         };
-        default: () => never[];
+        required: false;
     };
 }, {
     c: TreeController<IDETree, import("@ibiz-template/runtime").ITreeState, import("@ibiz-template/runtime").ITreeEvent>;
@@ -986,7 +986,7 @@ export declare const TreeControl: import("vue").DefineComponent<{
     onCheck: (nodeData: ITreeNodeData, opts: {
         checkedNodes: ITreeNodeData[];
     }) => void;
-    onNodeClick: (nodeData: ITreeNodeData, evt: MouseEvent) => void;
+    onNodeClick: (nodeData: ITreeNodeData, data: IData, evt: MouseEvent) => void;
     onNodeDbClick: (nodeData: ITreeNodeData, evt: MouseEvent) => void;
     onNodeContextmenu: (nodeData: ITreeNodeData, evt: MouseEvent) => Promise<void>;
     loadData: (item: IData, callback: (nodes: IData[]) => void) => Promise<void>;
@@ -997,8 +997,9 @@ export declare const TreeControl: import("vue").DefineComponent<{
     allowDrop: (draggingNode: IData, dropNode: IData, type: AllowDropType) => boolean;
     allowDrag: (draggingNode: IData) => boolean;
     handleDrop: (draggingNode: IData, dropNode: IData, dropType: NodeDropType) => void;
+    onShowNavView: () => void;
     onNodeTextEditBlur: () => Promise<void>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "nodeClick"[], "nodeClick", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelData: {
         type: PropType<IDETree>;
         required: true;
@@ -1058,10 +1059,10 @@ export declare const TreeControl: import("vue").DefineComponent<{
     };
     data: {
         type: {
-            (arrayLength: number): IData[];
-            (...items: IData[]): IData[];
-            new (arrayLength: number): IData[];
-            new (...items: IData[]): IData[];
+            (arrayLength: number): ITreeNodeData[];
+            (...items: ITreeNodeData[]): ITreeNodeData[];
+            new (arrayLength: number): ITreeNodeData[];
+            new (...items: ITreeNodeData[]): ITreeNodeData[];
             isArray(arg: any): arg is any[];
             readonly prototype: any[];
             from<T>(arrayLike: ArrayLike<T>): T[];
@@ -1071,10 +1072,11 @@ export declare const TreeControl: import("vue").DefineComponent<{
             of<T_4>(...items: T_4[]): T_4[];
             readonly [Symbol.species]: ArrayConstructor;
         };
-        default: () => never[];
+        required: false;
     };
-}>>, {
-    data: IData[];
+}>> & {
+    onNodeClick?: ((...args: any[]) => any) | undefined;
+}, {
     params: IParams;
     mdctrlActiveMode: number;
     singleSelect: boolean;

package/es/control/tree/tree.mjs

@@ -1,12 +1,12 @@
 import { isVNode, defineComponent, ref, reactive, onUnmounted, watch, computed, nextTick, resolveComponent, createVNode, onMounted, withDirectives, resolveDirective } from 'vue';
 import { useControlController, useNamespace } from '@ibiz-template/vue3-util';
 import { createUUID } from 'qx-util';
-import { debounce } from 'lodash-es';
+import { cloneDeep, debounce } from 'lodash-es';
 import { TreeController, getControlPanel } from '@ibiz-template/runtime';
 import './tree.css';
 import { RuntimeError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
-import { findNodeData, useElTreeUtil, formatNodeDropType } from './el-tree-util.mjs';
+import { useAppTreeBase, findNodeData, useElTreeUtil, findChildItems, formatNodeDropType } from './el-tree-util.mjs';
 
 "use strict";
 function _isSlot(s) {
@@ -74,11 +74,15 @@ const TreeControl = /* @__PURE__ */ defineComponent({
     },
     data: {
       type: Array,
-      default: () => []
+      required: false
     }
   },
-  setup(props) {
+  emits: ["nodeClick"],
+  setup(props, {
+    emit
+  }) {
     const c = useControlController((...args) => new TreeController(...args));
+    useAppTreeBase(c, props);
     const cascadeSelect = ref(false);
     const counterData = reactive({});
     const fn = (counter) => {
@@ -184,21 +188,19 @@ const TreeControl = /* @__PURE__ */ defineComponent({
     });
     const loadData = async (item, callback) => {
       if (props.isSimple) {
-        let nodes2 = [];
+        let children = [];
         if (item.level === 0) {
-          const tempNodes = props.data.find((_item) => {
+          const tempNodes = c.state.items.find((_item) => {
             return _item.isRoot;
           });
           if (tempNodes) {
-            nodes2 = [tempNodes];
+            children = [tempNodes];
           }
         } else {
-          nodes2 = props.data.filter((_item) => {
-            return _item._pid.includes(item.data._uuid);
-          });
+          children = findChildItems(c, props.modelData, item);
         }
-        item._children = nodes2;
-        callback(toElNodes(nodes2));
+        item._children = children;
+        callback(toElNodes(children));
         updateUI();
         return;
       }
@@ -248,9 +250,18 @@ const TreeControl = /* @__PURE__ */ defineComponent({
     const readonly = computed(() => {
       return !!(c.context.srfreadonly === true || c.context.srfreadonly === "true");
     });
-    const onNodeClick = (nodeData, evt) => {
+    const onShowNavView = () => {
+      c.state.showNavView = !c.state.showNavView;
+    };
+    const onNodeClick = (nodeData, data, evt) => {
       var _a, _b;
       evt.stopPropagation();
+      if (c.runMode === "DESIGN") {
+        emit("nodeClick", {
+          nodeData,
+          evt
+        });
+      }
       if (nodeData._disableSelect)
         return;
       if (forbidClick) {
@@ -269,7 +280,11 @@ const TreeControl = /* @__PURE__ */ defineComponent({
           c.onExpandChange(nodeData, expanded);
         }
       }
-      c.onTreeNodeClick(nodeData, evt);
+      if (props.isSimple) {
+        treeRef.value.setCurrentKey((data == null ? void 0 : data._id) || void 0);
+      } else {
+        c.onTreeNodeClick(nodeData, evt);
+      }
       forbidClick = true;
       setTimeout(() => {
         forbidClick = false;
@@ -434,20 +449,19 @@ const TreeControl = /* @__PURE__ */ defineComponent({
       }, null);
     };
     const updateNodeExpand = (data, expanded) => {
-      let nodeData;
-      if (props.isSimple) {
-        nodeData = props.data.find((item) => {
-          return item._uuid === data._uuid;
-        });
-      } else {
-        nodeData = findNodeData(data._uuid, c);
-      }
+      const nodeData = findNodeData(data._uuid, c);
       if (!nodeData) {
         throw new RuntimeError(ibiz.i18n.t("control.common.noFoundNode", {
           id: data._uuid
         }));
       }
-      c.onExpandChange(nodeData, expanded);
+      if (props.isSimple) {
+        const tempData = cloneDeep(nodeData);
+        tempData._id = data._id;
+        c.onExpandChange(tempData, expanded);
+      } else {
+        c.onExpandChange(nodeData, expanded);
+      }
     };
     const debounceSearch = debounce(() => {
       c.load();
@@ -524,6 +538,7 @@ const TreeControl = /* @__PURE__ */ defineComponent({
       allowDrop,
       allowDrag,
       handleDrop,
+      onShowNavView,
       onNodeTextEditBlur
     };
   },
@@ -551,7 +566,7 @@ const TreeControl = /* @__PURE__ */ defineComponent({
     const key = this.c.controlPanel ? "tree" : "default";
     slots[key] = () => {
       if (this.c.state.isLoaded && this.treeRefreshKey) {
-        return createVNode(resolveComponent("el-tree"), {
+        return [createVNode(resolveComponent("el-tree"), {
           "ref": "treeRef",
           "class": this.ns.b("tree"),
           "key": this.treeRefreshKey,
@@ -632,20 +647,34 @@ const TreeControl = /* @__PURE__ */ defineComponent({
             }
             return createVNode("div", {
               "onDblclick": (evt) => this.onNodeDbClick(nodeData, evt),
-              "onClick": (evt) => this.onNodeClick(nodeData, evt),
+              "onClick": (evt) => this.onNodeClick(nodeData, data, evt),
               "onContextmenu": (evt) => this.onNodeContextmenu(nodeData, evt),
               "class": [this.ns.b("node"), nodeData._disableSelect ? this.ns.bm("node", "disabled") : "", (_b = nodeModel.sysCss) == null ? void 0 : _b.cssName]
             }, [content, this.renderCounter(nodeModel), this.renderContextMenu(nodeModel, nodeData)]);
           }
-        });
+        }), this.c.state.enableNavView ? !this.c.state.showNavView ? createVNode("ion-icon", {
+          "class": this.ns.e("nav-icon"),
+          "title": ibiz.i18n.t("component.controlNavigation.showNav"),
+          "name": "eye-outline",
+          "onClick": this.onShowNavView
+        }, null) : createVNode("ion-icon", {
+          "class": this.ns.e("nav-icon"),
+          "title": ibiz.i18n.t("component.controlNavigation.hiddenNav"),
+          "name": "eye-off-outline",
+          "onClick": this.onShowNavView
+        }, null) : null];
       }
     };
-    return withDirectives(createVNode(resolveComponent("iBizControlBase"), {
-      "ref": "treeviewRef",
+    return createVNode(resolveComponent("iBizControlNavigation"), {
       "controller": this.c
-    }, _isSlot(slots) ? slots : {
-      default: () => [slots]
-    }), [[resolveDirective("loading"), this.c.state.isLoading]]);
+    }, {
+      default: () => [withDirectives(createVNode(resolveComponent("iBizControlBase"), {
+        "ref": "treeviewRef",
+        "controller": this.c
+      }, _isSlot(slots) ? slots : {
+        default: () => [slots]
+      }), [[resolveDirective("loading"), this.c.state.isLoading]])]
+    });
   }
 });
 

package/es/editor/data-picker/ibiz-picker-embed-view/ibiz-picker-embed-view.css

@@ -1 +1 @@
-.ibiz-picker-embed-view--disabled{cursor:not-allowed}.ibiz-picker-embed-view--disabled *{pointer-events:none;cursor:not-allowed}.ibiz-picker-embed-view--disabled .el-tree-node__expand-icon{pointer-events:all;cursor:pointer}.ibiz-picker-embed-view .ibiz-picker-embed-view-value{height:var(--ibiz-form-item-line-height);line-height:var(--ibiz-form-item-line-height)}
+.ibiz-picker-embed-view--disabled{cursor:not-allowed}.ibiz-picker-embed-view--disabled *{pointer-events:none;cursor:not-allowed}.ibiz-picker-embed-view--disabled .el-tree-node__expand-icon{pointer-events:all;cursor:pointer}.ibiz-picker-embed-view--show-value{height:calc(100% - var(--ibiz-form-item-line-height))}.ibiz-picker-embed-view .ibiz-picker-embed-view-view{height:100%}.ibiz-picker-embed-view .ibiz-picker-embed-view-value{height:var(--ibiz-form-item-line-height);line-height:var(--ibiz-form-item-line-height)}

package/es/editor/data-picker/ibiz-picker-embed-view/ibiz-picker-embed-view.d.ts

@@ -26,22 +26,17 @@ export declare const IBizPickerEmbedView: import("vue").DefineComponent<{
 }, {
     ns: import("@ibiz-template/core").Namespace;
     c: PickerEditorController;
-    context: import("vue").Ref<{
+    context: any;
+    params: import("vue").Ref<{
         [x: string]: any;
         [x: symbol]: any;
-        srfsessionid: string;
-        srfappid: string;
-        srfsimple?: boolean | undefined;
-        srfnavctrlid?: string | undefined;
     }>;
-    params: import("vue").Ref<IParams>;
-    onSelectionChange: (event: EventBase) => void;
     editorRef: import("vue").Ref<any>;
-    pickupViewModel: import("vue").ComputedRef<import("@ibiz-template/runtime").IViewConfig | null>;
     singleSelect: import("vue").Ref<boolean>;
     checkStrictly: import("vue").Ref<boolean>;
     isShowText: import("vue").Ref<boolean>;
     selectedData: import("vue").Ref<IData[]>;
+    onSelectionChange: (event: EventBase) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (_value: unknown, _name?: string | undefined) => boolean;
     blur: (_event?: IData | undefined) => boolean;

package/es/editor/data-picker/ibiz-picker-embed-view/ibiz-picker-embed-view.mjs

@@ -1,7 +1,6 @@
-import { defineComponent, ref, watch, computed, resolveComponent, createVNode, h, createTextVNode } from 'vue';
+import { defineComponent, ref, watch, resolveComponent, createVNode, h, createTextVNode } from 'vue';
 import { getDataPickerProps, getEditorEmits, useNamespace, useFocusAndBlur } from '@ibiz-template/vue3-util';
 import './ibiz-picker-embed-view.css';
-import { clone } from 'ramda';
 
 "use strict";
 const IBizPickerEmbedView = /* @__PURE__ */ defineComponent({
@@ -13,21 +12,26 @@ const IBizPickerEmbedView = /* @__PURE__ */ defineComponent({
   }) {
     const ns = useNamespace("picker-embed-view");
     const c = props.controller;
-    const context = ref(clone(c.context));
-    const params = ref(clone(c.params));
-    const setViewParam = () => {
+    const context = ref(c.context.clone());
+    const params = ref({
+      ...c.params
+    });
+    watch(() => props.data, (newVal) => {
       const {
         context: _context,
         params: _params
-      } = c.handlePublicParams(props.data, c.context, c.params);
-      Object.assign(context.value, _context);
-      Object.assign(params.value, _params);
-    };
-    setViewParam();
-    watch(() => props.data, (newVal, oldVal) => {
-      if (newVal !== oldVal) {
-        setViewParam();
+      } = c.handlePublicParams(newVal, c.context, c.params);
+      const newContext = Object.assign(c.context.clone(), _context);
+      const newParams = Object.assign({
+        ...c.params
+      }, _params);
+      if (JSON.stringify(context.value) !== JSON.stringify(newContext) || JSON.stringify(params.value) !== JSON.stringify(newParams)) {
+        context.value = newContext;
+        params.value = newParams;
       }
+    }, {
+      deep: true,
+      immediate: true
     });
     const editorParams = c.model.editorParams;
     const singleSelect = ref(true);
@@ -87,35 +91,30 @@ const IBizPickerEmbedView = /* @__PURE__ */ defineComponent({
     const {
       componentRef: editorRef
     } = useFocusAndBlur(() => emit("focus"), () => emit("blur"));
-    const pickupViewModel = computed(() => {
-      return c.pickupView;
-    });
     return {
       ns,
       c,
       context,
       params,
-      onSelectionChange,
       editorRef,
-      pickupViewModel,
       singleSelect,
       checkStrictly,
       isShowText,
-      selectedData
+      selectedData,
+      onSelectionChange
     };
   },
   render() {
-    var _a;
     const viewShell = resolveComponent("IBizViewShell");
     return createVNode("div", {
-      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : ""],
+      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.isShowText ? this.ns.m("show-value") : ""],
       "ref": "editorRef"
-    }, [this.pickupViewModel ? [createVNode("div", {
+    }, [this.c.model.pickupAppViewId ? [createVNode("div", {
       "class": this.ns.b("view")
     }, [h(viewShell, {
       context: this.context,
       params: this.params,
-      viewId: (_a = this.c.pickupView) == null ? void 0 : _a.id,
+      viewId: this.c.model.pickupAppViewId,
       state: {
         singleSelect: this.singleSelect,
         checkStrictly: this.checkStrictly,

package/es/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.mjs

@@ -412,6 +412,7 @@ const IBizPickerSelectView = /* @__PURE__ */ defineComponent({
     const editContent = createVNode(resolveComponent("el-dropdown"), {
       "ref": "editorRef",
       "trigger": "click",
+      "disabled": this.disabled || this.readonly,
       "class": this.ns.b("select"),
       "popper-class": this.ns.b("popper"),
       "onVisibleChange": this.onVisibleChange,

package/es/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.mjs

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, watch, createVNode, resolveComponent, mergeProps } from 'vue';
 import { getDateRangeProps, getEditorEmits, useNamespace } from '@ibiz-template/vue3-util';
 import { clone } from 'ramda';
+import dayjs from 'dayjs';
 import './ibiz-date-range-picker.css';
 
 "use strict";
@@ -79,7 +80,8 @@ const IBizDateRangePicker = /* @__PURE__ */ defineComponent({
             }
           });
         } else if (props.value && typeof props.value === "string") {
-          value = props.value.split(valueSeparator);
+          const dates = props.value.split(valueSeparator);
+          value = dates.every((date) => dayjs(date).isValid()) ? dates : [];
         }
         return value;
       },