@ibiz-template/vue3-components 0.7.41-alpha.16 → 0.7.41-alpha.17

package/es/panel-component/panel-button/panel-button.mjs

@@ -95,6 +95,7 @@ const PanelButton = /* @__PURE__ */ defineComponent({
       }, [createVNode(resolveComponent("el-button"), {
         "type": this.buttonType,
         "text": this.isText,
+        "data-id": this.modelData.id,
         "title": showTitle(this.tooltip),
         "disabled": this.state.disabled,
         "loading": this.state.loading,

package/es/util/fullscreen/fullscreen-util.mjs

@@ -1,6 +1,6 @@
 import { createApp } from 'vue';
 import ElementPlus from 'element-plus';
-import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.14_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
+import { defaultNamespace } from '../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.17_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.mjs';
 import { IBizFullscreenToolbar } from '../../common/fullscreen-toolbar/fullscreen-toolbar.mjs';
 
 "use strict";

package/es/view-engine/calendar-view.engine.d.ts

@@ -1,7 +1,17 @@
-import { ViewController, ICalendarViewEvent, ICalendarViewState, MDViewEngine, EventBase } from '@ibiz-template/runtime';
+import { ViewController, ICalendarViewEvent, ICalendarViewState, MDViewEngine, EventBase, IUIActionResult } from '@ibiz-template/runtime';
 import { IAppDECalendarView } from '@ibiz/model-core';
 export declare class CalendarViewEngine extends MDViewEngine {
     protected view: ViewController<IAppDECalendarView, ICalendarViewState, ICalendarViewEvent>;
     protected onXDataActive(event: EventBase): Promise<void>;
     onCreated(): Promise<void>;
+    protected openData(args: {
+        data: IData[];
+        event?: MouseEvent;
+        context?: IContext;
+        params?: IParams;
+    }): Promise<IUIActionResult>;
+    protected newData(args: {
+        data: IData[];
+        event?: MouseEvent;
+    }): Promise<IUIActionResult>;
 }

package/es/view-engine/calendar-view.engine.mjs

@@ -13,6 +13,16 @@ class CalendarViewEngine extends MDViewEngine {
     }
     this.view.slotProps.calendar.mdctrlActiveMode = model.mdctrlActiveMode;
   }
+  async openData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.openData(data[0], event);
+    return result;
+  }
+  async newData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.newData(data[0], event);
+    return result;
+  }
 }
 
 export { CalendarViewEngine };

package/es/view-engine/chart-exp-view.engine.d.ts

@@ -1,6 +1,7 @@
-import { ViewController, ViewEngineBase, IChartExpBarController, IChartExpViewEvent, IChartExpViewState } from '@ibiz-template/runtime';
+import { ViewController, IChartExpViewEvent, IChartExpViewState } from '@ibiz-template/runtime';
 import { IAppDEChartExplorerView } from '@ibiz/model-core';
-export declare class ChartExpViewEngine extends ViewEngineBase {
+import { ExpViewEngine } from './exp-view.engine';
+export declare class ChartExpViewEngine extends ExpViewEngine {
     /**
      * 图表导航视图控制器
      *
@@ -14,11 +15,10 @@ export declare class ChartExpViewEngine extends ViewEngineBase {
      */
     protected view: ViewController<IAppDEChartExplorerView, IChartExpViewState, IChartExpViewEvent>;
     /**
-     * 图表导航栏
-     *
+     * @description 导航栏部件名称
      * @readonly
+     * @type {string}
      * @memberof ChartExpViewEngine
      */
-    get chartExpBar(): IChartExpBarController;
-    onCreated(): Promise<void>;
+    get expBarName(): string;
 }

package/es/view-engine/chart-exp-view.engine.mjs

@@ -1,24 +1,15 @@
-import { ViewEngineBase } from '@ibiz-template/runtime';
+import { ExpViewEngine } from './exp-view.engine.mjs';
 
 "use strict";
-class ChartExpViewEngine extends ViewEngineBase {
+class ChartExpViewEngine extends ExpViewEngine {
   /**
-   * 图表导航栏
-   *
+   * @description 导航栏部件名称
    * @readonly
+   * @type {string}
    * @memberof ChartExpViewEngine
    */
-  get chartExpBar() {
-    return this.view.getController("chartexpbar");
-  }
-  async onCreated() {
-    await super.onCreated();
-    const { childNames } = this.view;
-    childNames.push("chartexpbar");
-    if (!this.view.slotProps.chartexpbar) {
-      this.view.slotProps.chartexpbar = {};
-    }
-    this.view.slotProps.chartexpbar.srfnav = this.view.state.srfnav;
+  get expBarName() {
+    return "chartexpbar";
   }
 }
 

package/es/view-engine/gantt-view.engine.d.ts

@@ -1,9 +1,9 @@
-import { MDViewEngine, ViewController, IGanttViewState, IGanttViewEvent, IGanttController, EventBase, IApiGanttViewCall } from '@ibiz-template/runtime';
+import { ViewController, IGanttViewState, IGanttViewEvent, IGanttController, IApiGanttViewCall } from '@ibiz-template/runtime';
 import { IAppDEGanttView } from '@ibiz/model-core';
-export declare class GanttViewEngine extends MDViewEngine {
+import { TreeGridExViewEngine } from './tree-grid-ex-view.engine';
+export declare class GanttViewEngine extends TreeGridExViewEngine {
     protected view: ViewController<IAppDEGanttView, IGanttViewState, IGanttViewEvent>;
     get gantt(): IGanttController;
     call(key: keyof IApiGanttViewCall, args: any): Promise<IData | null | undefined>;
-    protected onXDataActive(event: EventBase): Promise<void>;
     onCreated(): Promise<void>;
 }

package/es/view-engine/gantt-view.engine.mjs

@@ -1,8 +1,8 @@
-import { RuntimeError } from '@ibiz-template/core';
-import { MDViewEngine, SysUIActionTag } from '@ibiz-template/runtime';
+import { SysUIActionTag } from '@ibiz-template/runtime';
+import { TreeGridExViewEngine } from './tree-grid-ex-view.engine.mjs';
 
 "use strict";
-class GanttViewEngine extends MDViewEngine {
+class GanttViewEngine extends TreeGridExViewEngine {
   get gantt() {
     return this.view.getController("gantt");
   }
@@ -23,51 +23,8 @@ class GanttViewEngine extends MDViewEngine {
       this.gantt.saveAll();
       return null;
     }
-    if (key === SysUIActionTag.EXPAND) {
-      const { srfcollapsetag } = args.params || {};
-      let tag = srfcollapsetag || "";
-      if (!tag) {
-        const { selectedData } = this.gantt.state;
-        const selectedGroup = selectedData.filter((x) => !x._leaf);
-        if (selectedGroup.length > 0) {
-          tag = selectedGroup[0].srfnodeid;
-        }
-      }
-      if (!tag) {
-        throw new RuntimeError(ibiz.i18n.t("viewEngine.noExpandTag"));
-      }
-      this.gantt.changeCollapse({ tag, expand: true });
-      return null;
-    }
-    if (key === SysUIActionTag.COLLAPSE) {
-      const { srfcollapsetag } = args.params || {};
-      let tag = srfcollapsetag || "";
-      if (!tag) {
-        const { selectedData } = this.gantt.state;
-        const selectedGroup = selectedData.filter((x) => !x._leaf);
-        if (selectedGroup.length > 0) {
-          tag = selectedGroup[0].srfnodeid;
-        }
-      }
-      if (!tag) {
-        throw new RuntimeError(ibiz.i18n.t("viewEngine.noCollapseTag"));
-      }
-      this.gantt.changeCollapse({ tag, expand: false });
-      return null;
-    }
-    if (key === SysUIActionTag.EXPANDALL) {
-      this.gantt.changeCollapse({ expand: true });
-      return null;
-    }
-    if (key === SysUIActionTag.COLLAPSEALL) {
-      this.gantt.changeCollapse({ expand: false });
-      return null;
-    }
     return super.call(key, args);
   }
-  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-  async onXDataActive(event) {
-  }
   async onCreated() {
     super.onCreated();
     const { model } = this.view;

package/es/view-engine/login-view.engine.mjs

@@ -30,6 +30,13 @@ class LoginViewEngine extends ViewEngineBase {
             }
           ]
         };
+        const targetID = event.target.dataset.id;
+        if (targetID) {
+          const targetPanelItem = this.view.layoutPanel.findPanelItemByName(targetID);
+          if (targetPanelItem) {
+            args.data = [targetPanelItem.data];
+          }
+        }
         await this.login(args);
       }
     });

package/es/view-engine/tab-exp-view.engine.mjs

@@ -167,7 +167,7 @@ class TabExpViewEngine extends ViewEngineBase {
   calcViewHeaderVisible() {
     let showHeader = super.calcViewHeaderVisible();
     const { tabLayout } = this.view.model;
-    if (tabLayout === void 0 || tabLayout === "TOP" && getControl(this.view.model, "tabexppanel")) {
+    if (tabLayout === void 0 || ["TOP", "TOP_DROPDOWNLIST"].includes(tabLayout) && getControl(this.view.model, "tabexppanel")) {
       showHeader = true;
     }
     return showHeader;

package/es/view-engine/tab-search-view.engine.mjs

@@ -113,8 +113,10 @@ class TabSearchViewEngine extends TabExpViewEngine {
         }
       }
     }
-    this.searchBar.placeHolder = caption || "";
-    this.searchBar.state.quickSearchPlaceHolder = caption || "";
+    if (this.searchBar) {
+      this.searchBar.placeHolder = caption || "";
+      this.searchBar.state.quickSearchPlaceHolder = caption || "";
+    }
   }
   async call(key, args) {
     if (key === SysUIActionTag.SEARCH) {

package/es/view-engine/tree-view.engine.d.ts

@@ -1,8 +1,18 @@
-import { ViewController, ITreeViewEvent, ITreeViewState, MDViewEngine, ITreeController, IApiTreeViewCall } from '@ibiz-template/runtime';
+import { ViewController, ITreeViewEvent, ITreeViewState, MDViewEngine, IApiTreeViewCall, IUIActionResult, ITreeController } from '@ibiz-template/runtime';
 import { IAppDETreeView } from '@ibiz/model-core';
 export declare class TreeViewEngine extends MDViewEngine {
     protected view: ViewController<IAppDETreeView, ITreeViewState, ITreeViewEvent>;
-    get tree(): ITreeController;
     onCreated(): Promise<void>;
+    get tree(): ITreeController;
     call(key: keyof IApiTreeViewCall, args: any): Promise<IData | null | undefined>;
+    protected openData(args: {
+        data: IData[];
+        event?: MouseEvent;
+        context?: IContext;
+        params?: IParams;
+    }): Promise<IUIActionResult>;
+    protected newData(args: {
+        data: IData[];
+        event?: MouseEvent;
+    }): Promise<IUIActionResult>;
 }

package/es/view-engine/tree-view.engine.mjs

@@ -3,31 +3,37 @@ import { RuntimeError } from '@ibiz-template/core';
 
 "use strict";
 class TreeViewEngine extends MDViewEngine {
-  get tree() {
-    return this.view.getController("tree");
-  }
   async onCreated() {
     await super.onCreated();
     if (!this.view.slotProps.tree) {
       this.view.slotProps.tree = {};
     }
   }
+  get tree() {
+    return this.view.getController("tree");
+  }
   async call(key, args) {
     var _a;
     if (key === SysUIActionTag.REFRESH_ALL) {
-      await this.tree.refresh();
+      await this.xdataControl.refresh();
       return null;
     }
     if (key === SysUIActionTag.REFRESH) {
       if ((_a = args == null ? void 0 : args.data) == null ? void 0 : _a[0]) {
-        await this.tree.refreshNodeChildren(args.data[0], false);
+        await this.xdataControl.refreshNodeChildren(
+          args.data[0],
+          false
+        );
       } else {
-        await this.tree.refresh();
+        await this.xdataControl.refresh();
       }
       return null;
     }
     if (key === SysUIActionTag.REFRESH_PARENT) {
-      await this.tree.refreshNodeChildren(args.data[0], true);
+      await this.xdataControl.refreshNodeChildren(
+        args.data[0],
+        true
+      );
       return null;
     }
     if (key === SysUIActionTag.EXPAND) {
@@ -40,7 +46,10 @@ class TreeViewEngine extends MDViewEngine {
       if (!tag) {
         throw new RuntimeError(ibiz.i18n.t("viewEngine.noExpandTag"));
       }
-      this.tree.changeCollapse({ tag, expand: true });
+      this.xdataControl.changeCollapse({
+        tag,
+        expand: true
+      });
       return null;
     }
     if (key === SysUIActionTag.COLLAPSE) {
@@ -53,19 +62,38 @@ class TreeViewEngine extends MDViewEngine {
       if (!tag) {
         throw new RuntimeError(ibiz.i18n.t("viewEngine.noCollapseTag"));
       }
-      this.tree.changeCollapse({ tag, expand: false });
+      this.xdataControl.changeCollapse({
+        tag,
+        expand: false
+      });
       return null;
     }
     if (key === SysUIActionTag.EXPANDALL) {
-      this.tree.changeCollapse({ expand: true });
+      this.xdataControl.changeCollapse({ expand: true });
       return null;
     }
     if (key === SysUIActionTag.COLLAPSEALL) {
-      this.tree.changeCollapse({ expand: false });
+      this.xdataControl.changeCollapse({ expand: false });
       return null;
     }
     return super.call(key, args);
   }
+  async openData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.openData(
+      data[0],
+      event
+    );
+    return result;
+  }
+  async newData(args) {
+    const { data, event } = args;
+    const result = await this.xdataControl.newData(
+      data[0],
+      event
+    );
+    return result;
+  }
 }
 
 export { TreeViewEngine };

package/lib/control/calendar/components/custom-calendar/custom-calendar.cjs

@@ -40,9 +40,6 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
       selectDate,
       selectLegend
     } = useCustomCalendar.useCustomCalendar(props, emit, "custom-calendar");
-    vue.onMounted(() => {
-      pickDay(dayjs(/* @__PURE__ */ new Date()));
-    });
     const renderWeek = () => {
       var _a;
       return vue.createVNode("div", {
@@ -129,7 +126,7 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "modelValue": realSelectedDay.value,
         "onUpdate:modelValue": ($event) => realSelectedDay.value = $event,
         "type": "date",
-        "placeholder": "\u9009\u62E9\u65E5\u671F",
+        "placeholder": ibiz.i18n.t("control.calendar.calendardaily.selectdate"),
         "shortcuts": shortcuts
       }, null)])]), vue.createVNode("div", {
         "class": ns.em("calendar-week", "text-secondary")
@@ -147,12 +144,32 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
       }, slots)]);
     };
     const renderUser = () => {
-      return vue.createVNode(index$2.IBizCalendarUser, {
+      const weekRange = useCustomCalendar.calcCurrentWeekRange(new Date(realSelectedDay.value));
+      return vue.createVNode("div", {
+        "class": [ns.e("calendar-user")]
+      }, [vue.createVNode("div", {
+        "class": [ns.e("calendar-user-header")]
+      }, [vue.createVNode("div", {
+        "class": ns.em("calendar-user-header", "left")
+      }, [weekRange.map((_date) => {
+        return dayjs(new Date(_date)).format("YYYY-MM-DD");
+      }).join(" ~ ")]), vue.createVNode("div", {
+        "class": ns.em("calendar-user-header", "right")
+      }, [vue.createVNode(vue.resolveComponent("el-date-picker"), {
+        "type": "week",
+        "clearable": false,
+        "popper-class": ns.em("calendar-user-header", "date-picker"),
+        "modelValue": realSelectedDay.value,
+        "onUpdate:modelValue": ($event) => realSelectedDay.value = $event,
+        "class": ns.em("calendar-user-header", "date-range"),
+        "placeholder": ibiz.i18n.t("control.calendar.calendarUser.selectWeekRange"),
+        "format": ibiz.i18n.t("control.calendar.calendarUser.weekFormat")
+      }, null)])]), vue.createVNode(index$2.IBizCalendarUser, {
         "selected-day": realSelectedDay.value,
         "events": events.value,
         "onEventClick": (value) => handleEVentClick(value),
         "onEventDblClick": (value) => handleEVentDblClick(value)
-      }, slots);
+      }, slots)]);
     };
     const renderContent = () => {
       switch (viewType.value) {

package/lib/control/calendar/components/custom-calendar/custom-calendar.css

@@ -1 +1 @@
-.ibiz-custom-calendar{width:100%;height:100%}.ibiz-custom-calendar__calendar-day{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;min-height:900px;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-day--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-day--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-day--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-day--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-day--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-day--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-day--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-day--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-week{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-week--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-week--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-week--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-week--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-week--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-week--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-week--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-week--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-custom-calendar__calendar-month--body{flex-grow:1;width:100%;height:calc(100% - 58px)}.ibiz-custom-calendar__calendar-month--legend{display:flex;align-items:center;justify-content:center;width:auto;height:100%}.ibiz-custom-calendar__calendar-month--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-month--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-month--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month--header{display:flex;align-items:center;justify-content:space-between;width:100%;min-height:58px;padding:12px 20px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-month--button-group{display:flex;align-items:center;justify-content:space-between;width:388px}.ibiz-custom-calendar__header--title{min-width:120px}.ibiz-custom-calendar .el-date-editor.el-input,.ibiz-custom-calendar .el-date-editor.el-input__wrapper{width:130px;height:32px}
+.ibiz-custom-calendar{width:100%;height:100%}.ibiz-custom-calendar__calendar-day{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;min-height:900px;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-day--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-day--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-day--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-day--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-day--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-day--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-day--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-day--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-day--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-week{display:flex;flex-direction:column;width:100%;min-width:380px;height:100%;border:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header{padding:0 40px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-week--header-top{display:flex;align-items:center;justify-content:space-between;height:70px}.ibiz-custom-calendar__calendar-week--title{min-width:80px;font-size:20px}.ibiz-custom-calendar__calendar-week--text-secondary{height:56px;line-height:56px;text-align:left}.ibiz-custom-calendar__calendar-week--select-time{width:130px;height:32px}.ibiz-custom-calendar__calendar-week--select-time .el-input__suffix{display:none}.ibiz-custom-calendar__calendar-week--legend{display:flex;flex-grow:1;align-items:center;justify-content:center;height:100%;overflow:auto}.ibiz-custom-calendar__calendar-week--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-week--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-week--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-custom-calendar__calendar-month--body{flex-grow:1;width:100%;height:calc(100% - 58px)}.ibiz-custom-calendar__calendar-month--legend{display:flex;align-items:center;justify-content:center;width:auto;height:100%}.ibiz-custom-calendar__calendar-month--legend-item{display:flex;align-items:center;width:auto;height:auto;padding:0 var(--ibiz-spacing-tight);line-height:1em;cursor:pointer}.ibiz-custom-calendar__calendar-month--legend-item-tip{display:inline-block;width:1.5em;height:.9em;margin-right:var(--ibiz-spacing-extra-tight);border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-custom-calendar__calendar-month--legend-item-text{display:inline-block;width:auto;max-width:100px;overflow:hidden;text-align:left;text-overflow:ellipsis;white-space:nowrap}.ibiz-custom-calendar__calendar-month--header{display:flex;align-items:center;justify-content:space-between;width:100%;min-height:58px;padding:12px 20px;border-bottom:1px solid var(--ibiz-color-border)}.ibiz-custom-calendar__calendar-month--button-group{display:flex;align-items:center;justify-content:space-between;width:388px}.ibiz-custom-calendar__header--title{min-width:120px}.ibiz-custom-calendar__calendar-user-header{display:flex;align-items:center;justify-content:space-between;width:100%;padding:0 var(--ibiz-spacing-base)}.ibiz-custom-calendar__calendar-user-header--right .el-date-editor.el-date-editor--week.el-input{width:250px}.ibiz-custom-calendar .el-date-editor.el-input,.ibiz-custom-calendar .el-date-editor.el-input__wrapper{width:130px;height:32px}

package/lib/control/calendar/components/custom-calendar/use-custom-calendar.cjs

@@ -266,5 +266,25 @@ const useCustomCalendar = (props, emit, _componentName) => {
     selectLegend
   };
 };
+function calcCurrentWeekRange(date) {
+  let monday;
+  let sunday;
+  const day = date.getDay();
+  if (day === 0) {
+    monday = dayjs(new Date(date.getTime() - 6 * 864e5)).format(
+      "YYYY-MM-DD"
+    );
+    sunday = dayjs(date).format("YYYY-MM-DD");
+  } else {
+    monday = dayjs(new Date(date.getTime() - (day - 1) * 864e5)).format(
+      "YYYY-MM-DD"
+    );
+    sunday = dayjs(new Date(date.getTime() + (7 - day) * 864e5)).format(
+      "YYYY-MM-DD"
+    );
+  }
+  return [monday, sunday];
+}
 
+exports.calcCurrentWeekRange = calcCurrentWeekRange;
 exports.useCustomCalendar = useCustomCalendar;

package/lib/control/data-view/data-view.cjs

@@ -4,6 +4,7 @@ var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 var qxUtil = require('qx-util');
+var draggable = require('vuedraggable');
 require('../../util/index.cjs');
 require('./data-view.css');
 var usePagination = require('../../util/pagination/use-pagination.cjs');
@@ -14,6 +15,9 @@ function _isSlot(s) {
 }
 const DataViewControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizDataViewControl",
+  components: {
+    draggable
+  },
   props: {
     /**
      * @description 数据视图（卡片）模型数据
@@ -166,6 +170,31 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
       event.stopPropagation();
       return c.onDbRowClick(item);
     };
+    let cacheInfo = null;
+    const onDraggableChange = (evt, groupKey) => {
+      if (evt.moved) {
+        c.onDragChange({
+          from: groupKey,
+          to: groupKey,
+          fromIndex: evt.moved.oldIndex,
+          toIndex: evt.moved.newIndex
+        });
+      }
+      if (evt.added) {
+        cacheInfo = {
+          to: groupKey,
+          toIndex: evt.added.newIndex
+        };
+      }
+      if (evt.removed) {
+        if (cacheInfo) {
+          cacheInfo.from = groupKey;
+          cacheInfo.fromIndex = evt.removed.oldIndex;
+          c.onDragChange(cacheInfo);
+        }
+        cacheInfo = null;
+      }
+    };
     const renderNewCard = (group) => {
       return vue.createVNode(vue.resolveComponent("el-card"), {
         "shadow": "hover",
@@ -241,7 +270,23 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
       }, {
         default: () => [vue.createVNode("div", {
           "class": ns.be("item", "content")
-        }, [cardStyle.value === "style2" && !c.state.singleSelect && vue.createVNode(vue.resolveComponent("el-checkbox"), {
+        }, [c.state.draggable && !c.state.readonly && vue.createVNode("svg", {
+          "viewBox": "0 0 16 16",
+          "xmlns": "http://www.w3.org/2000/svg",
+          "height": "1em",
+          "width": "1em",
+          "class": ns.e("drag-icon"),
+          "preserveAspectRatio": "xMidYMid meet",
+          "focusable": "false"
+        }, [vue.createVNode("g", {
+          "stroke-width": "1",
+          "fill-rule": "evenodd"
+        }, [vue.createVNode("g", {
+          "transform": "translate(5 1)",
+          "fill-rule": "nonzero"
+        }, [vue.createVNode("path", {
+          "d": "M1 2a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zM1 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm-4 4a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm4 0a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"
+        }, null)])])]), cardStyle.value === "style2" && !c.state.singleSelect && vue.createVNode(vue.resolveComponent("el-checkbox"), {
           "size": "large",
           "class": ns.bem("item", "content", "checkbox"),
           "modelValue": isSelected(item),
@@ -250,7 +295,7 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         }, null), panel ? renderPanelItem(item, panel) : renderDefaultItem(item)])]
       });
     };
-    const renderCardLayout = (items, group) => {
+    const renderCardLayout = (items, group, disabled = true) => {
       const {
         cardColXS,
         cardColSM,
@@ -258,22 +303,18 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         cardColLG
       } = c.model;
       if (cardColXS || cardColSM || cardColMD || cardColLG)
-        return vue.createVNode(vue.resolveComponent("el-row"), {
-          "class": ns.e("layout-row")
+        return vue.createVNode(draggable, {
+          "itemKey": "srfkey",
+          "modelValue": items,
+          "group": c.model.id,
+          "handle": ".".concat(ns.e("drag-icon")),
+          "class": ["el-row", ns.e("layout-row")],
+          "disabled": disabled || c.state.updating || c.state.readonly,
+          "onChange": (evt) => onDraggableChange(evt, group == null ? void 0 : group.key)
         }, {
-          default: () => [items.map((item) => {
-            return vue.createVNode(vue.resolveComponent("el-col"), {
-              "xs": cardColXS,
-              "sm": cardColSM,
-              "md": cardColMD,
-              "lg": cardColLG,
-              "class": ns.e("layout-col")
-            }, {
-              default: () => [vue.createVNode("div", {
-                "class": ns.b("scroll-item")
-              }, [renderCard(item)])]
-            });
-          }), c.enableNew && !c.state.readonly && vue.createVNode(vue.resolveComponent("el-col"), {
+          item: ({
+            element
+          }) => vue.createVNode(vue.resolveComponent("el-col"), {
             "xs": cardColXS,
             "sm": cardColSM,
             "md": cardColMD,
@@ -282,18 +323,43 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
           }, {
             default: () => [vue.createVNode("div", {
               "class": ns.b("scroll-item")
-            }, [renderNewCard(group)])]
-          })]
+            }, [renderCard(element)])]
+          }),
+          footer: () => {
+            if (c.enableNew && !c.state.readonly)
+              return vue.createVNode(vue.resolveComponent("el-col"), {
+                "xs": cardColXS,
+                "sm": cardColSM,
+                "md": cardColMD,
+                "lg": cardColLG,
+                "class": ns.e("layout-col")
+              }, {
+                default: () => [vue.createVNode("div", {
+                  "class": ns.b("scroll-item")
+                }, [renderNewCard(group)])]
+              });
+          }
         });
-      return vue.createVNode("div", {
-        "class": ns.e("layout-flex")
-      }, [items.map((item) => {
-        return vue.createVNode("div", {
+      return vue.createVNode(draggable, {
+        "itemKey": "srfkey",
+        "modelValue": items,
+        "group": c.model.id,
+        "class": [ns.e("layout-flex"), ns.em("layout-flex", "draggable")],
+        "disabled": disabled || c.state.updating || c.state.readonly,
+        "onChange": (evt) => onDraggableChange(evt, group == null ? void 0 : group.key)
+      }, {
+        item: ({
+          element
+        }) => vue.createVNode("div", {
           "class": ns.b("scroll-item")
-        }, [renderCard(item)]);
-      }), c.enableNew && !c.state.readonly && vue.createVNode("div", {
-        "class": ns.b("scroll-item")
-      }, [renderNewCard(group)])]);
+        }, [renderCard(element)]),
+        footer: () => {
+          if (c.enableNew && !c.state.readonly)
+            return vue.createVNode("div", {
+              "class": ns.b("scroll-item")
+            }, [renderNewCard(group)]);
+        }
+      });
     };
     const renderGroup = (group) => {
       const {
@@ -314,7 +380,7 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
         "onActionClick": (detail, event) => {
           c.onGroupToolbarClick(detail, event, group);
         }
-      }, null)])]), group.children.length > 0 ? renderCardLayout(group.children, group) : vue.createVNode("div", {
+      }, null)])]), group.children.length > 0 ? renderCardLayout(group.children, group, !c.state.draggable) : vue.createVNode("div", {
         "class": ns.bem("group-content", "item", "empty")
       }, [ibiz.i18n.t("app.noData")])]);
     };
@@ -326,7 +392,7 @@ const DataViewControl = /* @__PURE__ */ vue.defineComponent({
           return renderGroup(group);
         })]);
       }
-      return renderCardLayout(isCollapse.value ? c.state.items.slice(0, c.state.size) : c.state.items);
+      return renderCardLayout(isCollapse.value ? c.state.items.slice(0, c.state.size) : c.state.items, void 0, !c.enableEditOrder);
     };
     const scrollToTop = () => {
       var _a;