@ibiz-template/vue3-components 0.1.2 → 0.1.5

package/lib/control/index.cjs

@@ -13,12 +13,13 @@ var index$p = require('./tree/index.cjs');
 var index$q = require('./pickup-view-panel/index.cjs');
 var index$r = require('./tab-exp-panel/index.cjs');
 require('./exp-bar/index.cjs');
-var index$w = require('./search-bar/index.cjs');
-var index$x = require('./chart/index.cjs');
-var index$y = require('./wizard-panel/index.cjs');
-var index$z = require('./drbar/index.cjs');
-var index$A = require('./drtab/index.cjs');
-var index$B = require('./dashboard/index.cjs');
+var index$x = require('./search-bar/index.cjs');
+var index$y = require('./chart/index.cjs');
+var index$z = require('./wizard-panel/index.cjs');
+var index$A = require('./drbar/index.cjs');
+var index$B = require('./drtab/index.cjs');
+var index$C = require('./dashboard/index.cjs');
+var index$F = require('./calendar/index.cjs');
 var appMenu_provider = require('./app-menu/app-menu.provider.cjs');
 var appMenu_controller = require('./app-menu/app-menu.controller.cjs');
 var appMenuIconView_provider = require('./app-menu-icon-view/app-menu-icon-view.provider.cjs');
@@ -118,6 +119,9 @@ var listExpBar_provider = require('./exp-bar/list-exp-bar/list-exp-bar.provider.
 var index$t = require('./exp-bar/list-exp-bar/index.cjs');
 var index$u = require('./exp-bar/grid-exp-bar/index.cjs');
 var index$v = require('./exp-bar/data-view-exp-bar/index.cjs');
+var calendarExpBar_provider = require('./exp-bar/calendar-exp-bar/calendar-exp-bar.provider.cjs');
+var calendarExpBar_controller = require('./exp-bar/calendar-exp-bar/calendar-exp-bar.controller.cjs');
+var index$w = require('./exp-bar/calendar-exp-bar/index.cjs');
 var searchBar_provider = require('./search-bar/search-bar.provider.cjs');
 var searchBar_controller = require('./search-bar/search-bar.controller.cjs');
 var wizardPanel_provider = require('./wizard-panel/wizard-panel.provider.cjs');
@@ -133,12 +137,14 @@ var portletPart_state = require('./dashboard/portlet/portlet-part/portlet-part.s
 var containerPortlet_controller = require('./dashboard/portlet/container-portlet/container-portlet.controller.cjs');
 var containerPortlet_provider = require('./dashboard/portlet/container-portlet/container-portlet.provider.cjs');
 var containerPortlet = require('./dashboard/portlet/container-portlet/container-portlet.cjs');
-var index$C = require('./dashboard/portlet/container-portlet/index.cjs');
+var index$D = require('./dashboard/portlet/container-portlet/index.cjs');
 var portletLayout = require('./dashboard/portlet/portlet-layout/portlet-layout.cjs');
 var viewPortlet_controller = require('./dashboard/portlet/view-portlet/view-portlet.controller.cjs');
 var viewPortlet_provider = require('./dashboard/portlet/view-portlet/view-portlet.provider.cjs');
 var viewPortlet = require('./dashboard/portlet/view-portlet/view-portlet.cjs');
-var index$D = require('./dashboard/portlet/view-portlet/index.cjs');
+var index$E = require('./dashboard/portlet/view-portlet/index.cjs');
+var calendar_provider = require('./calendar/calendar.provider.cjs');
+var calendar_controller = require('./calendar/calendar.controller.cjs');
 
 
 
@@ -151,12 +157,13 @@ exports.IBizDataViewControl = index$o.IBizDataViewControl;
 exports.IBizTreeControl = index$p.IBizTreeControl;
 exports.IBizPickupViewPanelControl = index$q.IBizPickupViewPanelControl;
 exports.IBizTabExpPanelControl = index$r.IBizTabExpPanelControl;
-exports.IBizSearchBarControl = index$w.IBizSearchBarControl;
-exports.IBizChartControl = index$x.IBizChartControl;
-exports.IBizWizardPanelControl = index$y.IBizWizardPanelControl;
-exports.IBizDRBarControl = index$z.IBizDRBarControl;
-exports.IBizDRTabControl = index$A.IBizDRTabControl;
-exports.IBizDashboardControl = index$B.IBizDashboardControl;
+exports.IBizSearchBarControl = index$x.IBizSearchBarControl;
+exports.IBizChartControl = index$y.IBizChartControl;
+exports.IBizWizardPanelControl = index$z.IBizWizardPanelControl;
+exports.IBizDRBarControl = index$A.IBizDRBarControl;
+exports.IBizDRTabControl = index$B.IBizDRTabControl;
+exports.IBizDashboardControl = index$C.IBizDashboardControl;
+exports.IBizCalendarControl = index$F.IBizCalendarControl;
 exports.AppMenuProvider = appMenu_provider.AppMenuProvider;
 exports.AppMenuController = appMenu_controller.AppMenuController;
 exports.AppMenuIconViewProvider = appMenuIconView_provider.AppMenuIconViewProvider;
@@ -257,6 +264,9 @@ exports.ListExpBarProvider = listExpBar_provider.ListExpBarProvider;
 exports.IBizListExpBarControl = index$t.IBizListExpBarControl;
 exports.IBizGridExpBarControl = index$u.IBizGridExpBarControl;
 exports.IBizDataViewExpBarControl = index$v.IBizDataViewExpBarControl;
+exports.CalendarExpBarProvider = calendarExpBar_provider.CalendarExpBarProvider;
+exports.CalendarExpBarController = calendarExpBar_controller.CalendarExpBarController;
+exports.IBizCalendarExpBarControl = index$w.IBizCalendarExpBarControl;
 exports.SearchBarProvider = searchBar_provider.SearchBarProvider;
 exports.SearchBarController = searchBar_controller.SearchBarController;
 exports.WizardPanelProvider = wizardPanel_provider.WizardPanelProvider;
@@ -272,9 +282,11 @@ exports.PortletPartState = portletPart_state.PortletPartState;
 exports.ContainerPortletController = containerPortlet_controller.ContainerPortletController;
 exports.ContainerPortletProvider = containerPortlet_provider.ContainerPortletProvider;
 exports.ContainerPortlet = containerPortlet.ContainerPortlet;
-exports.IBizContainerPortlet = index$C.IBizContainerPortlet;
+exports.IBizContainerPortlet = index$D.IBizContainerPortlet;
 exports.PortletLayout = portletLayout.PortletLayout;
 exports.ViewPortletController = viewPortlet_controller.ViewPortletController;
 exports.ViewPortletProvider = viewPortlet_provider.ViewPortletProvider;
 exports.ViewPortlet = viewPortlet.ViewPortlet;
-exports.IBizViewPortlet = index$D.IBizViewPortlet;
+exports.IBizViewPortlet = index$E.IBizViewPortlet;
+exports.CalendarProvider = calendar_provider.CalendarProvider;
+exports.CalendarController = calendar_controller.CalendarController;

package/lib/control/tree/tree.cjs

@@ -2,6 +2,7 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
 var tree_controller = require('./tree.controller.cjs');
 require('./tree.css');
 
@@ -42,6 +43,9 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     singleSelect: {
       type: Boolean,
       default: true
+    },
+    defaultExpandedKeys: {
+      type: Array
     }
   },
   setup() {
@@ -58,16 +62,33 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     };
     const treeData = vue.computed(() => {
       if (!c.state.isLoaded) {
-        return void 0;
+        return [];
       }
-      return c.model.rootVisible ? c.state.rootNode : c.state.rootNode.children;
+      return c.model.rootVisible ? c.state.rootNodes : c.state.rootNodes.reduce((result, nodeData) => {
+        if (nodeData.children) {
+          return result.concat(nodeData.children);
+        }
+        return result;
+      }, []);
     });
     const loadData = async (item, callback) => {
-      if (!c.state.isLoaded) {
+      let nodes;
+      if (item.level === 0) {
+        nodes = treeData.value;
+        ibiz.log.debug("\u521D\u59CB\u52A0\u8F7D");
+      } else if (item.data instanceof runtime.TreeNodeData) {
+        if (item.data.children) {
+          ibiz.log.debug("\u8282\u70B9\u5C55\u5F00\u52A0\u8F7D-\u672C\u5730", item.data);
+          nodes = item.data.children;
+        } else {
+          ibiz.log.debug("\u8282\u70B9\u5C55\u5F00\u52A0\u8F7D-\u8FDC\u7A0B", item.data);
+          nodes = await c.loadNodes(item.data);
+        }
+      } else {
+        ibiz.log.error("\u672A\u8003\u8651\u5230\u7684\u60C5\u51B5", item, item.data);
         return;
       }
-      const nodes = await c.loadNodes(item.data);
-      setCheckedNodes();
+      ibiz.log.debug("\u7ED9\u6811\u8FD4\u56DE\u503C", nodes);
       callback(nodes);
     };
     let selectionWait = false;
@@ -218,9 +239,8 @@ const TreeControl = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c
     }, {
-      default: () => [this.c.state.isCreated && vue.createVNode(vue.resolveComponent("el-tree"), {
+      default: () => [this.c.state.isLoaded && vue.createVNode(vue.resolveComponent("el-tree"), {
         "ref": "treeRef",
-        "data": this.treeData,
         "node-key": "id",
         "highlight-current": true,
         "expand-on-click-node": false,

package/lib/control/tree/tree.controller.cjs

@@ -7,12 +7,7 @@ var tree_service = require('./tree.service.cjs');
 class TreeController extends runtime.MDControlController {
   initState() {
     super.initState();
-    this.state.rootNode = new runtime.TreeStaticNodeData(
-      runtime.getRootNode(this.model),
-      void 0,
-      { leaf: false }
-    );
-    this.state.expandedKeys = [];
+    this.state.defaultExpandedKeys = [];
     this.state.size = 0;
     this.state.contextMenus = {};
   }
@@ -35,15 +30,10 @@ class TreeController extends runtime.MDControlController {
    */
   async load(args = {}) {
     const isInitialLoad = args.isInitialLoad === true;
-    const isLoadMore = args.isLoadMore === true;
     const nodes = await this.loadNodes();
+    this.state.expandedKeys = this.calcExpandedKeys(nodes);
     await this.afterLoad(args, nodes);
     this.state.isLoaded = true;
-    if (isLoadMore) {
-      this.state.items.push(...nodes);
-    } else {
-      this.state.items = nodes;
-    }
     await this.evt.emit("onLoadSuccess", {
       isInitialLoad
     });
@@ -59,21 +49,31 @@ class TreeController extends runtime.MDControlController {
   async loadNodes(parentNode) {
     const params = await this.getFetchParams();
     const hasQuery = !!params.query;
-    if (!parentNode) {
-      parentNode = this.state.rootNode;
-    }
+    const defaultExpandedKeys = !parentNode ? this.state.defaultExpandedKeys : void 0;
     await this.startLoading();
     let nodes;
     try {
       nodes = await this.service.fetchChildNodes(parentNode, {
         context: this.context.clone(),
         params,
-        hasQuery
+        hasQuery,
+        defaultExpandedKeys
       }) || [];
     } finally {
       await this.endLoading();
     }
-    parentNode.children = nodes;
+    if (parentNode) {
+      parentNode.children = nodes;
+    } else {
+      this.state.rootNodes = nodes;
+    }
+    this.state.items = [];
+    core.recursiveIterate(
+      { children: this.state.rootNodes },
+      (node) => {
+        this.state.items.push(node);
+      }
+    );
     return nodes;
   }
   /**
@@ -111,25 +111,13 @@ class TreeController extends runtime.MDControlController {
       await this.setActive(nodeData);
     }
   }
+  setActive(item) {
+    const nodeParams = this.parseTreeNodeData(item);
+    return this.evt.emit("onActive", { ...nodeParams, nodeData: item });
+  }
   setSelection(selection) {
     super.setSelection(selection);
   }
-  /**
-   * 设置展开节点
-   *
-   * @author zk
-   * @date 2023-07-10 08:07:29
-   * @param {string[]} nodeKeys
-   * @param {boolean} [isReplace=false]
-   * @memberof TreeController
-   */
-  setExpandedKeys(nodeKeys, isReplace = false) {
-    if (isReplace) {
-      this.state.expandedKeys = nodeKeys;
-    } else {
-      this.state.expandedKeys.push(...nodeKeys);
-    }
-  }
   /**
    * 获取节点模型
    * @author lxm
@@ -152,18 +140,10 @@ class TreeController extends runtime.MDControlController {
    */
   async doUIAction(uiActionId, nodeData, event) {
     const eventArgs = this.getEventArgs();
-    if (nodeData.context) {
-      eventArgs.context = Object.assign(
-        eventArgs.context.clone(),
-        nodeData.context
-      );
-    }
-    if (nodeData.params) {
-      eventArgs.params = { ...eventArgs.params, ...nodeData.params };
-    }
+    const nodeParams = this.parseTreeNodeData(nodeData);
     await runtime.UIActionUtil.execAndResolved(uiActionId, {
       ...eventArgs,
-      data: [nodeData.deData || nodeData],
+      ...nodeParams,
       event
     });
   }
@@ -197,6 +177,42 @@ class TreeController extends runtime.MDControlController {
     this.state.contextMenus[contextMenu.id] = menuState;
     this.state.contextMenus[contextMenu.id].update();
   }
+  /**
+   * 解析树节点获取通用数据，和完整的上下文和视图参数。
+   * @author lxm
+   * @date 2023-08-09 11:45:34
+   * @protected
+   * @param {TreeNodeData} nodeData
+   */
+  parseTreeNodeData(nodeData) {
+    return {
+      data: [{ ...nodeData, ...nodeData.deData || {} }],
+      context: Object.assign(this.context.clone(), nodeData.context || {}),
+      params: { ...this.params, ...nodeData.params || {} }
+    };
+  }
+  /**
+   * 计算展开节点集合
+   * @author lxm
+   * @date 2023-08-09 05:19:36
+   * @param {ITreeNodeData[]} nodes
+   * @param {boolean} [isRoot=false]
+   * @return {*}  {string[]}
+   */
+  calcExpandedKeys(nodes) {
+    let expandedKeys = [];
+    core.recursiveIterate({ children: nodes }, (node) => {
+      var _a;
+      if ((_a = node.children) == null ? void 0 : _a.length) {
+        expandedKeys.push(node.id);
+      }
+    });
+    if (this.state.defaultExpandedKeys.length) {
+      expandedKeys.push(...this.state.defaultExpandedKeys);
+      expandedKeys = Array.from(new Set(expandedKeys));
+    }
+    return expandedKeys;
+  }
 }
 
 exports.TreeController = TreeController;

package/lib/control/tree/tree.service.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
 
 class TreeService extends runtime.MDControlService {
@@ -13,61 +14,117 @@ class TreeService extends runtime.MDControlService {
    */
   async fetchChildNodes(parentNodeData, opts) {
     const { hasQuery } = opts;
-    const childNodeRSs = runtime.getChildNodeRSs(this.model, {
-      parentId: parentNodeData == null ? void 0 : parentNodeData.nodeId,
-      hasQuery
-    });
-    if (childNodeRSs.length === 0) {
-      return;
-    }
-    const results = await Promise.allSettled(
-      childNodeRSs.map(async (childNodeRS) => {
-        const childNode = runtime.getTreeNode(
-          this.model,
-          childNodeRS.childDETreeNodeId
-        );
-        const leaf = runtime.getChildNodeRSs(this.model, {
-          parentId: childNode.id,
-          hasQuery
-        }).length === 0;
-        const tempOpts = { ...opts, leaf };
-        if (childNode.treeNodeType === "STATIC") {
-          const nodeData = await this.getStaticNodeData(
-            childNode,
-            childNodeRS,
-            parentNodeData,
-            tempOpts
+    let childrenNodes = [];
+    if (!parentNodeData) {
+      const rootNode = runtime.getRootNode(this.model);
+      childrenNodes = await this.fetchNodeDatasByType(
+        rootNode,
+        void 0,
+        void 0,
+        opts
+      );
+    } else {
+      const childNodeRSs = runtime.getChildNodeRSs(this.model, {
+        parentId: parentNodeData == null ? void 0 : parentNodeData.nodeId,
+        hasQuery
+      });
+      if (childNodeRSs.length === 0) {
+        return;
+      }
+      const results = await Promise.allSettled(
+        childNodeRSs.map(async (childNodeRS) => {
+          const childNode = runtime.getTreeNode(
+            this.model,
+            childNodeRS.childDETreeNodeId
           );
-          return [nodeData];
-        }
-        if (childNode.treeNodeType === "DE") {
-          return this.getDENodeDatas(
+          return this.fetchNodeDatasByType(
             childNode,
             childNodeRS,
             parentNodeData,
-            tempOpts
+            opts
           );
+        })
+      );
+      results.forEach((result) => {
+        if (result.status === "fulfilled" && result.value) {
+          childrenNodes.push(...result.value);
+        } else if (result.status === "rejected") {
+          ibiz.log.error(result.reason);
         }
-        if (childNode.treeNodeType === "CODELIST") {
-          return this.getCodeListNodeDatas(
-            childNode,
-            childNodeRS,
+      });
+    }
+    return childrenNodes;
+  }
+  /**
+   * 通过节点类型加载节点数据
+   * @author lxm
+   * @date 2023-08-09 03:22:47
+   * @protected
+   * @param {IDETreeNode} nodeModel 节点模型
+   * @param {(IDETreeNodeRS | undefined)} nodeRS 与上层节点的节点关系
+   * @param {(ITreeNodeData | undefined)} parentNodeData 上层节点数据
+   * @param {TreeFetchOpts} opts 额外参数
+   * @return {*}  {Promise<ITreeNodeData[]>}
+   */
+  async fetchNodeDatasByType(nodeModel, nodeRS, parentNodeData, opts) {
+    const leaf = runtime.getChildNodeRSs(this.model, {
+      parentId: nodeModel.id,
+      hasQuery: opts.hasQuery
+    }).length === 0;
+    const tempOpts = { ...opts, leaf };
+    let result = [];
+    switch (nodeModel.treeNodeType) {
+      case "STATIC":
+        {
+          const nodeData = await this.getStaticNodeData(
+            nodeModel,
+            nodeRS,
             parentNodeData,
             tempOpts
           );
+          result = [nodeData];
         }
-        return void 0;
-      })
-    );
-    const childrenNodes = [];
-    results.forEach((result) => {
-      if (result.status === "fulfilled" && result.value) {
-        childrenNodes.push(...result.value);
-      } else if (result.status === "rejected") {
-        ibiz.log.error(result.reason);
-      }
-    });
-    return childrenNodes;
+        break;
+      case "DE":
+        result = await this.getDENodeDatas(
+          nodeModel,
+          nodeRS,
+          parentNodeData,
+          tempOpts
+        );
+        break;
+      case "CODELIST":
+        result = await this.getCodeListNodeDatas(
+          nodeModel,
+          nodeRS,
+          parentNodeData,
+          tempOpts
+        );
+        break;
+      default:
+        throw new core.ModelError(
+          nodeModel,
+          `${nodeModel.treeNodeType}\u8282\u70B9\u7C7B\u578B\u672A\u652F\u6301`
+        );
+    }
+    const { expandFirstOnly, expanded, rootNode } = nodeModel;
+    const isExpandedRoot = rootNode && !this.model.rootVisible;
+    if (!leaf) {
+      await Promise.all(
+        result.map(async (childNode, index) => {
+          if (expanded && // 全展开合只展开首节点expanded都为true
+          (!expandFirstOnly || expandFirstOnly && index === 0) || opts.defaultExpandedKeys.includes(childNode.id) || // 外部回显给的默认展开节点集合有的展开
+          isExpandedRoot) {
+            const subChildrenNodes = await this.fetchChildNodes(
+              childNode,
+              opts
+            );
+            childNode.children = subChildrenNodes;
+          }
+        })
+      );
+    }
+    return result;
   }
   /**
    * 获取静态节点数据
@@ -82,7 +139,7 @@ class TreeService extends runtime.MDControlService {
     const nodeData = new runtime.TreeStaticNodeData(
       nodeModel,
       parentNodeData,
-      { parentValueLevel: nodeRS.parentValueLevel, leaf: !!opts.leaf }
+      { parentValueLevel: nodeRS == null ? void 0 : nodeRS.parentValueLevel, leaf: !!opts.leaf }
     );
     if (nodeModel.expanded) {
       nodeData.children = await this.fetchChildNodes(nodeData, opts);
@@ -130,7 +187,13 @@ class TreeService extends runtime.MDControlService {
       derValue = parentData.value;
     }
     const { resultContext, resultParams } = runtime.calcNavParams(
-      { deName, navFilter, pickupDEFName, navParams, navContexts },
+      {
+        deName,
+        navFilter: `n_${navFilter}_eq`,
+        pickupDEFName,
+        navParams,
+        navContexts
+      },
       { derValue, context, params, data }
     );
     Object.assign(context, resultContext);
@@ -153,7 +216,12 @@ class TreeService extends runtime.MDControlService {
    */
   async getDENodeDatas(nodeModel, nodeRS, parentNodeData, opts) {
     const { appDEDataSetId, appDataEntityId } = nodeModel;
-    const { context, params, navContext, navParams } = this.getNodeRSFilterParams(nodeRS, parentNodeData, opts);
+    const { context, params, navContext, navParams } = nodeRS ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts) : {
+      context: opts.context,
+      params: opts.params,
+      navContext: {},
+      navParams: {}
+    };
     params.size = nodeModel.maxSize || 1e3;
     if (nodeModel.sortAppDEFieldId && nodeModel.sortDir) {
       Object.assign(params, {
@@ -188,7 +256,12 @@ class TreeService extends runtime.MDControlService {
    * @memberof TreeService
    */
   async getCodeListNodeDatas(nodeModel, nodeRS, parentNodeData, opts) {
-    const { context, params, navContext, navParams } = this.getNodeRSFilterParams(nodeRS, parentNodeData, opts);
+    const { context, params, navContext, navParams } = nodeRS ? this.getNodeRSFilterParams(nodeRS, parentNodeData, opts) : {
+      context: opts.context,
+      params: opts.params,
+      navContext: {},
+      navParams: {}
+    };
     const items = await this.app.codeList.get(
       nodeModel.codeListId,
       context,