@g1cloud/bluesea 5.0.0-beta.7 → 5.0.0-beta.8

package/dist/bluesea.umd.cjs

@@ -4688,6 +4688,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   });
   dayjs.extend(utc);
   dayjs.extend(timezone);
+  const createDateRangeFromPreset = (value, timeZone) => {
+    const from = value.from ? resolveMoment(value.from, true, timeZone) : void 0;
+    const to = value.to ? resolveMoment(value.to, false, timeZone) : void 0;
+    return { from: from == null ? void 0 : from.toISOString(), to: to == null ? void 0 : to.toISOString() };
+  };
   const resolveMoment = (setting, from, timeZone, baseDate) => {
     switch (setting.type) {
       case "TODAY":
@@ -4954,25 +4959,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const emit = __emit;
       const actualTimeZone = vue.computed(() => props.timeZone || blueseaConfig.timeZone);
       const currentPreset = vue.ref();
-      const createDateRange = (value) => {
-        const from = value.from ? resolveMoment(value.from, true, actualTimeZone.value) : void 0;
-        const to = value.to ? resolveMoment(value.to, false, actualTimeZone.value) : void 0;
-        return { from: from == null ? void 0 : from.toISOString(), to: to == null ? void 0 : to.toISOString() };
-      };
       const presetSelected = (value) => {
-        const range = value ? createDateRange(value) : void 0;
-        emit("update:modelValue", range);
+        const range = value ? createDateRangeFromPreset(value, actualTimeZone.value) : void 0;
+        emit("update:modelValue", range, value);
       };
-      const findPreset = (range) => {
+      const findPreset2 = (range) => {
         return props.presets.find((preset) => {
-          const presetValue = createDateRange(preset);
+          const presetValue = createDateRangeFromPreset(preset, actualTimeZone.value);
           return (range == null ? void 0 : range.from) === presetValue.from && (range == null ? void 0 : range.to) === presetValue.to;
         });
       };
       vue.watch(
         () => props.modelValue,
         () => {
-          currentPreset.value = findPreset(props.modelValue);
+          currentPreset.value = findPreset2(props.modelValue);
         },
         { immediate: true }
       );
@@ -6153,16 +6153,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         },
         clickRemoveButton: () => this.removeSelectedItem(),
         expandAll: () => {
-          const allParents = this.getAllParents();
-          if (this.expandedRows.size === allParents.size) {
-            this.expandedRows.clear();
-          } else {
-            allParents.forEach((item) => {
-              const key = option.getItemKey(item);
-              if (key) this.expandedRows.add(key);
-            });
-          }
-          this.updateAllExpanded();
+          this.expandAll(this.expandedRows.size !== this.getAllParents().size);
         }
       };
     }
@@ -6298,6 +6289,25 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }
       this.cleanUpExpandedRows(this.expandedRows, this.tree.data);
     }
+    expandAll(expandOrDepth) {
+      if (expandOrDepth === true) {
+        const allParents = this.getAllParents();
+        allParents.forEach((item) => {
+          const key = this.option.getItemKey(item);
+          if (key) this.expandedRows.add(key);
+        });
+      } else if (expandOrDepth === false) {
+        this.expandedRows.clear();
+      } else if (expandOrDepth > 1) {
+        const parents = /* @__PURE__ */ new Set();
+        this.collectParents(parents, this.tree.data, this.option.getChildren, expandOrDepth - 1);
+        parents.forEach((item) => {
+          const key = this.option.getItemKey(item);
+          if (key) this.expandedRows.add(key);
+        });
+      }
+      this.updateAllExpanded();
+    }
     forceRemoveItems(items) {
       items.forEach((item) => {
         var _a2, _b;
@@ -6334,12 +6344,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         }
       }
     }
-    collectParents(parents, list, childrenProvider) {
+    collectParents(parents, list, childrenProvider, maxDepth) {
       for (const item of list) {
         const children = childrenProvider(item);
         if (children && children.length > 0) {
           parents.add(item);
-          this.collectParents(parents, children, childrenProvider);
+          if (maxDepth === void 0 || maxDepth > 1) {
+            this.collectParents(parents, children, childrenProvider, maxDepth ? maxDepth - 1 : void 0);
+          }
         }
       }
     }
@@ -36198,6 +36210,7 @@ img.ProseMirror-separator {
       this.selectDeleteSupport.removeIfAddedRow = (row) => this.editableSupport.removeIfAddedRow(row);
     }
     setGridData(data) {
+      GridHandlerEditableSupport.cleanUpData(data);
       super.setGridData(data);
       this.editableSupport.clearAddedRows();
     }
@@ -36284,6 +36297,11 @@ img.ProseMirror-separator {
       };
       controlEventListener.clickAdd = () => this.createAndAddNewRow();
     }
+    static cleanUpData(data) {
+      data == null ? void 0 : data.forEach((row) => {
+        if (row && row[GRID_NEW_ROW_KEY]) delete row[GRID_NEW_ROW_KEY];
+      });
+    }
     getModifiedRows() {
       var _a2;
       const addedKeys = this.addedRows.map((row) => row[GRID_NEW_ROW_KEY]);
@@ -37805,6 +37823,35 @@ img.ProseMirror-separator {
       };
     }
   });
+  const serializeMomentSetting = (setting) => {
+    if (!setting) return "";
+    const value = setting.value === void 0 ? "" : `:${setting.value}`;
+    return `${setting.type}${value}`;
+  };
+  const convertDateRangePresetKey = (preset) => {
+    return `${serializeMomentSetting(preset.from)}~${serializeMomentSetting(preset.to)}`;
+  };
+  const findPreset = (presetKey, candidatePresets) => {
+    if (!presetKey) return void 0;
+    return candidatePresets == null ? void 0 : candidatePresets.find((preset) => convertDateRangePresetKey(preset) === presetKey);
+  };
+  class BetweenDateFilterWithPreset extends BetweenDateFilter {
+    constructor(name2, fromValue, toValue, preset) {
+      super(name2, fromValue, toValue);
+      __publicField(this, "presetKey");
+      this.name = name2;
+      this.fromValue = fromValue;
+      this.toValue = toValue;
+      this.presetKey = preset ? convertDateRangePresetKey(preset) : void 0;
+    }
+    // candidatePresets 중 presetKey 에 해당하는 preset 을 찾아, fromValue, toValue 를 설정한다.
+    // preset 을 찾을 수 없으면 undefined 를 리턴한다.
+    static createFromPresetKey(name2, presetKey, candidatePresets, timeZone) {
+      const preset = findPreset(presetKey, candidatePresets);
+      const range = preset ? createDateRangeFromPreset(preset, timeZone) : void 0;
+      return range ? new BetweenDateFilterWithPreset(name2, range.from, range.to, preset) : void 0;
+    }
+  }
   const _hoisted_1$N = {
     key: 0,
     class: "date-filters .bs-layout-vertical mr-16"
@@ -37863,9 +37910,10 @@ img.ProseMirror-separator {
         if (propertyId) item.propertyId = propertyId;
         emitValue();
       };
-      const setDateFilterValue = (index, value) => {
+      const setDateFilterValue = (index, value, preset) => {
         const item = dateFilterValues.value[index];
         item.value = value || {};
+        item.preset = preset;
         emitValue();
       };
       const addDateFilter = () => {
@@ -37890,7 +37938,7 @@ img.ProseMirror-separator {
       };
       const emitValue = () => {
         var _a2;
-        const filters = dateFilterValues.value.map((item) => betweenDateFilter(item.propertyId, item.value.from, item.value.to));
+        const filters = dateFilterValues.value.map((item) => new BetweenDateFilterWithPreset(item.propertyId, item.value.from, item.value.to, item.preset));
         const and = filters.length > 0 ? andFilter(filters) : void 0;
         if (((_a2 = props.modelValue) == null ? void 0 : _a2.toString()) !== (and == null ? void 0 : and.toString())) {
           emit("update:modelValue", and);
@@ -37957,10 +38005,11 @@ img.ProseMirror-separator {
               }, null, 8, ["display-format", "from-id", "model-value", "name-from", "name-to", "popup-display-format", "popup-end-year", "popup-start-year", "resolution", "time-zone", "to-id", "width", "onUpdate:modelValue"]),
               vue.createVNode(_sfc_main$1A, {
                 modelValue: item.value,
-                "onUpdate:modelValue": [($event) => item.value = $event, ($event) => setDateFilterValue(index, $event)],
+                "onUpdate:modelValue": [($event) => item.value = $event, (value, preset) => setDateFilterValue(index, value, preset)],
                 presets: _ctx.presets,
+                "time-zone": timeZoneOfFilterItem(item.propertyId),
                 class: "ml-4"
-              }, null, 8, ["modelValue", "onUpdate:modelValue", "presets"])
+              }, null, 8, ["modelValue", "onUpdate:modelValue", "presets", "time-zone"])
             ]);
           }), 128))
         ])) : vue.createCommentVNode("", true);
@@ -38016,12 +38065,23 @@ img.ProseMirror-separator {
         emitUpdateModelValue();
         emitSearch();
       };
+      const findDateFilterTimeZone = (name2, dateFilter) => {
+        var _a2;
+        return ((_a2 = dateFilter == null ? void 0 : dateFilter.filterItems.find((f) => f.propertyId === name2)) == null ? void 0 : _a2.timeZone) || blueseaConfig.timeZone;
+      };
       vue.watch(() => props.gridPreferenceDateFilterValues, () => {
         if (props.gridPreferenceDateFilterValues && props.gridPreferenceDateFilterValues.filters && props.gridPreferenceDateFilterValues.filters.length > 0) {
           const filters = props.gridPreferenceDateFilterValues.filters.map((filter) => {
-            const dateFilter = filter;
-            if (dateFilter.name && (dateFilter.fromValue || dateFilter.toValue)) {
-              return betweenDateFilter(dateFilter.name, dateFilter.fromValue, dateFilter.toValue);
+            var _a2, _b;
+            const f = filter;
+            if (f.name && (f.fromValue || f.toValue)) {
+              if (f.presetKey) {
+                const presets = props.dateRangePresets || ((_a2 = blueseaConfig.componentConfig.gridLookup) == null ? void 0 : _a2.dateRangePresets) || [];
+                const timeZone = findDateFilterTimeZone(f.name, (_b = props.config) == null ? void 0 : _b.dateFilter);
+                return BetweenDateFilterWithPreset.createFromPresetKey(f.name, f.presetKey, presets, timeZone);
+              } else {
+                return new BetweenDateFilterWithPreset(f.name, f.fromValue, f.toValue);
+              }
             }
           }).filter(notNull);
           if (filters.length > 0) {
@@ -72015,6 +72075,7 @@ img.ProseMirror-separator {
   exports2.BSYesNoGroup = _sfc_main$1x;
   exports2.BSYesNoSelect = _sfc_main$1V;
   exports2.BetweenDateFilter = BetweenDateFilter;
+  exports2.BetweenDateFilterWithPreset = BetweenDateFilterWithPreset;
   exports2.BetweenFilter = BetweenFilter;
   exports2.DEFAULT_GRID_COLUMN_WIDTH = DEFAULT_GRID_COLUMN_WIDTH;
   exports2.DefaultBody = _sfc_main$h;
@@ -72061,6 +72122,7 @@ img.ProseMirror-separator {
   exports2.closeAlarm = closeAlarm;
   exports2.configureBluesea = configureBluesea;
   exports2.contextMenuPluginKey = contextMenuPluginKey;
+  exports2.convertDateRangePresetKey = convertDateRangePresetKey;
   exports2.createContextMenuPlugin = createContextMenuPlugin;
   exports2.createDefaultFrameContext = createDefaultFrameContext;
   exports2.createInputGridHandler = createInputGridHandler;

package/dist/component/grid/DateFilterModel.d.ts

@@ -1,4 +1,19 @@
+import { BetweenDateFilter } from '../../model/FilterModel.ts';
+import { Dayjs } from 'dayjs';
+import { DateRangePreset } from '../input/DateRangePresetModel.ts';
+import { TimeZone } from '../../model/CommonTypes.ts';
+
 export type DateRange = {
     from?: string;
     to?: string;
 };
+export type DateRangePresetKey = string;
+export declare const convertDateRangePresetKey: (preset: DateRangePreset) => DateRangePresetKey;
+export declare class BetweenDateFilterWithPreset extends BetweenDateFilter {
+    readonly name: string;
+    readonly fromValue?: string | Date | Dayjs | undefined;
+    readonly toValue?: string | Date | Dayjs | undefined;
+    presetKey?: DateRangePresetKey;
+    constructor(name: string, fromValue?: string | Date | Dayjs | undefined, toValue?: string | Date | Dayjs | undefined, preset?: DateRangePreset);
+    static createFromPresetKey(name: string, presetKey: DateRangePresetKey, candidatePresets: DateRangePreset[], timeZone: TimeZone): BetweenDateFilterWithPreset | undefined;
+}

package/dist/component/grid/GridModel.d.ts

@@ -341,6 +341,7 @@ export declare class GridHandlerEditableSupport<T extends GridRowData> {
     private listener?;
     addedRows: T[];
     constructor(grid: UnwrapNestedRefs<GridBinding<T>>, gridEventListener: GridEventListener<T>, controlEventListener: GridControlEventListener, getRowKey: KeyProvider<T>, newRowCreator?: (() => T | undefined) | undefined, addRowToLast?: boolean | undefined, listener?: ((eventType: 'rowAdded' | 'rowRemoved') => void) | undefined);
+    static cleanUpData<T extends GridRowData>(data: T[]): void;
     getModifiedRows(): T[];
     getAddedRows(): T[];
     clearAddedRows(): void;

package/dist/component/input/BSDateRangePresets.vue.d.ts

@@ -8,7 +8,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>, {
     presets: () => DateRangePreset[];
 }>>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    "update:modelValue": (value: DateRange | undefined) => void;
+    "update:modelValue": (value: DateRange | undefined, preset: DateRangePreset | undefined) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
     modelValue?: DateRange | undefined;
     presets?: DateRangePreset[] | undefined;
@@ -16,7 +16,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>, {
     presets: () => DateRangePreset[];
 }>>> & Readonly<{
-    "onUpdate:modelValue"?: ((value: DateRange | undefined) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: DateRange | undefined, preset: DateRangePreset | undefined) => any) | undefined;
 }>, {
     presets: DateRangePreset[];
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;

package/dist/component/input/DateRangePresetModel.d.ts

@@ -1,5 +1,6 @@
 import { MultiLangText, TimeZone } from '../../model/CommonTypes.ts';
 import { Dayjs } from 'dayjs';
+import { DateRange } from '../grid/DateFilterModel.ts';
 
 export type MomentType = 'TODAY' | 'THIS_WEEK' | 'THIS_MONTH' | 'THIS_YEAR' | 'LAST_HOURS' | 'LAST_DAYS' | 'DAYS_AGO' | 'WEEKS_AGO' | 'MONTHS_AGO' | 'YEARS_AGO';
 export type MomentSetting = {
@@ -11,4 +12,5 @@ export type DateRangePreset = {
     from?: MomentSetting;
     to?: MomentSetting;
 };
+export declare const createDateRangeFromPreset: (value: DateRangePreset, timeZone: TimeZone) => DateRange;
 export declare const resolveMoment: (setting: MomentSetting, from: boolean, timeZone: TimeZone, baseDate?: Dayjs) => Dayjs | undefined;

package/dist/component/tree/TreeModel.d.ts

@@ -35,9 +35,28 @@ export interface TreeHandler<T> {
     treeEventListener: TreeEventListener<T>;
     control: UnwrapNestedRefs<TreeControlBinding<T>>;
     controlEventListener: TreeControlEventListener;
+    /**
+     * Tree 에 data 를 넣는다.
+     * @param data
+     * @param keepSelection true 이면 현재 선택된 항목이 유지된다.
+     * @param keepExpanded  true 이면 현재 expanded 인 항목이 유지된다.
+     * @param waitTime      이 값이 0보다 크면 이 시간동안 tree 를 비웠다가 다시 채운다. refresh 효과를 위해 사용한다. millisecond 단위.
+     */
     setTreeData(data: T[], keepSelection?: boolean, keepExpanded?: boolean, waitTime?: number): Promise<void>;
+    /**
+     * 항목을 선택한다.
+     * @param item
+     */
     selectItem(item: T | T[] | undefined): void;
+    /**
+     * `item` 의 parent 를 리턴한다.
+     * @param item
+     */
     getParent(item: T | undefined): T | undefined;
+    /**
+     * `item` 을 교체한다. item 이 변경된 경우, 변경된 객체를 tree 에 다시 표시할 때 사용한다.
+     * @param newItem
+     */
     replaceCurrentItem(newItem: T): void;
     /**
      * Tree 이 모든 항목을 순회하며 visitor 함수를 호출한다. visitor 함수가
@@ -63,7 +82,16 @@ export interface TreeHandler<T> {
      * @param index 추가할 위치. 0 보다 작으면 제일 마지막에 추가한다. 디폴트는 -1.
      */
     addChildItem(parent: T, index: number): void;
+    /**
+     * `items` 를 삭제한다.
+     * @param items
+     */
     removeItems(items: T[]): void;
+    /**
+     * Tree 전체를 펼치거나 접는다.
+     * @param expandOrDepth true 이면 전체를 펼치고, false 이면 접는다. 숫자이면 해당 depth 까지 표시되도록 펼친다.
+     */
+    expandAll(expandOrDepth: boolean | number): void;
 }
 export type TreeBinding<T> = {
     data: T[];