@g1cloud/open-bluesea-grid 1.0.0-alpha.1 → 1.0.0-alpha.2

package/dist/open-bluesea-grid.es.js

@@ -1,4 +1,4 @@
-import { markRaw, reactive, ref, nextTick, defineComponent, createElementBlock, openBlock, withDirectives, createElementVNode, normalizeStyle, unref, vShow, computed, useSlots, withModifiers, normalizeClass, renderSlot, createVNode, createCommentVNode, toDisplayString, watch, createTextVNode, createBlock, Fragment, renderList, createSlots, withCtx, watchEffect, onBeforeUnmount, onMounted, mergeProps, toHandlers, defineAsyncComponent, withKeys, vModelText, resolveComponent } from "vue";
+import { markRaw, reactive, ref, nextTick, defineComponent, createElementBlock, openBlock, withDirectives, createElementVNode, normalizeStyle, unref, vShow, computed, useSlots, withModifiers, normalizeClass, renderSlot, createVNode, createCommentVNode, toDisplayString, watch, createTextVNode, createBlock, Fragment, renderList, createSlots, withCtx, watchEffect, onBeforeUnmount, onMounted, mergeProps, toHandlers, defineAsyncComponent, withKeys, vModelText } from "vue";
 import dayjs from "dayjs";
 import { notNull, formatUtil, waitDuring, useContextMenu, vTooltip, componentUtil, provideSavePoint, provideFieldContext, emptyKeyProvider, useSavePoint, cancelProvidedSavePoint, BSLoadingIcon, BSPageNavigation, useModalHandle, BSModalFrame, BSButton, BSNumberInput, BSCheckbox, useModal, BSSelect, useBlueseaConfig, BSRadioButtonGroup, BSDateRange } from "@g1cloud/open-bluesea-core";
 class AbstractFilter {
@@ -1115,7 +1115,7 @@ const _export_sfc = (sfc, props) => {
 };
 const BSGridHeaderCellResizeHandle = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-3bda3a20"]]);
 const _hoisted_1$d = ["data-property-id"];
-const _hoisted_2$8 = { class: "bs-layout-horizontal align-items-center" };
+const _hoisted_2$8 = { class: "flex align-items-center" };
 const _hoisted_3$4 = ["textContent"];
 const _hoisted_4$4 = ["textContent"];
 const _sfc_main$g = /* @__PURE__ */ defineComponent({
@@ -1223,7 +1223,7 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BSGridHeaderCell = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-e140e95e"]]);
+const BSGridHeaderCell = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-fbb8ef01"]]);
 const _hoisted_1$c = { class: "checkbox bs-clickable" };
 const _hoisted_2$7 = { class: "font-icon" };
 const _sfc_main$f = /* @__PURE__ */ defineComponent({
@@ -2098,8 +2098,8 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
 });
 const _hoisted_1$4 = { class: "text-center" };
 const _hoisted_2$4 = { class: "text-center" };
-const _hoisted_3$2 = { class: "bs-layout-horizontal" };
-const _hoisted_4$2 = { class: "bs-layout-horizontal grow justify-content-end gap-8" };
+const _hoisted_3$2 = { class: "flex" };
+const _hoisted_4$2 = { class: "flex grow justify-content-end gap-8" };
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "BSGridColumnSettingModal",
   props: {
@@ -2408,15 +2408,31 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const likeTextFilterItems = computed(() => props.textFilterItems);
-    const inTextFilterItems = computed(() => props.textFilterItems.filter((filter) => filter.allowMultiLineFilter));
-    const hasTextAreaFilterItem = computed(() => inTextFilterItems.value.length > 0);
+    const likeTextFilterItems = computed(
+      () => props.textFilterItems
+    );
+    const inTextFilterItems = computed(
+      () => props.textFilterItems.filter((filter) => filter.allowMultiLineFilter)
+    );
+    const hasTextAreaFilterItem = computed(
+      () => inTextFilterItems.value.length > 0
+    );
     const filterMode = ref("INPUT");
     const changeFilterMode = (mode) => filterMode.value = mode;
-    const likeFilterItems = computed(() => likeTextFilterItems.value.filter((item) => !item.filterCreator && item.filterType !== "NUMBER"));
-    const equalFilterItemPropertyIds = computed(() => likeTextFilterItems.value.filter((item) => !item.filterCreator && item.filterType === "NUMBER").map((item) => item.propertyId));
-    const customFilterItems = computed(() => likeTextFilterItems.value.filter((item) => item.filterCreator));
-    const inFilterItemPropertyIds = computed(() => inTextFilterItems.value.map((filter) => filter.propertyId));
+    const likeFilterItems = computed(
+      () => likeTextFilterItems.value.filter(
+        (item) => !item.filterCreator && item.filterType !== "NUMBER"
+      )
+    );
+    const equalFilterItemPropertyIds = computed(
+      () => likeTextFilterItems.value.filter((item) => !item.filterCreator && item.filterType === "NUMBER").map((item) => item.propertyId)
+    );
+    const customFilterItems = computed(
+      () => likeTextFilterItems.value.filter((item) => item.filterCreator)
+    );
+    const inFilterItemPropertyIds = computed(
+      () => inTextFilterItems.value.map((filter) => filter.propertyId)
+    );
     const getFilterKeyword = (filter) => {
       const actualFilter = filter instanceof OrFilter ? filter.filters[0] : filter;
       if (actualFilter && "getFilterValueString" in actualFilter) {
@@ -2447,13 +2463,31 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
     const makeLikeFilters = (items, keyword) => {
       if (items.length === 0) return [];
-      const prefixSuffix = items.map((item) => (item.prefix === false ? "f" : "t") + (item.suffix === false ? "f" : "t"));
+      const prefixSuffix = items.map(
+        (item) => (item.prefix === false ? "f" : "t") + (item.suffix === false ? "f" : "t")
+      );
       if (prefixSuffix.every((val) => val === prefixSuffix[0])) {
         const likeNames = likeFilterItems.value.map((item) => item.propertyId);
         const first = items[0];
-        return [likeFilter(likeNames, keyword, first.prefix !== false, first.suffix !== false, true)];
+        return [
+          likeFilter(
+            likeNames,
+            keyword,
+            first.prefix !== false,
+            first.suffix !== false,
+            true
+          )
+        ];
       } else {
-        return items.map((item) => likeFilter([item.propertyId], keyword, item.prefix !== false, item.suffix !== false, true));
+        return items.map(
+          (item) => likeFilter(
+            [item.propertyId],
+            keyword,
+            item.prefix !== false,
+            item.suffix !== false,
+            true
+          )
+        );
       }
     };
     const createFilter = async (text) => {
@@ -2463,13 +2497,15 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         const like = makeLikeFilters(likeFilterItems.value, keyword);
         const equalNames = equalFilterItemPropertyIds.value;
         const equal = equalNames.length > 0 && !Number.isNaN(Number(keyword)) ? equalFilter(equalNames, Number(keyword), true) : void 0;
-        const customFilters = (await Promise.all(customFilterItems.value.map(async (item) => {
-          let created = item.filterCreator?.(item.propertyId, keyword);
-          if (created && created instanceof Promise) {
-            created = await created;
-          }
-          return created || [];
-        }))).flatMap((item) => item);
+        const customFilters = (await Promise.all(
+          customFilterItems.value.map(async (item) => {
+            let created = item.filterCreator?.(item.propertyId, keyword);
+            if (created && created instanceof Promise) {
+              created = await created;
+            }
+            return created || [];
+          })
+        )).flatMap((item) => item);
         const allFilters = [...like, equal, ...customFilters].filter(notNull);
         if (allFilters.length >= 2) return orFilter(allFilters);
         else return allFilters[0];
@@ -2502,7 +2538,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
           ]),
           hasTextAreaFilterItem.value ? (openBlock(), createElementBlock("span", {
             key: 0,
-            class: "filter-mode-btn font-icon bs-clickable mr-4 mt-5",
+            class: "filter-mode-btn font-icon bs-clickable pr-2 pt-1",
             onClick: _cache[2] || (_cache[2] = ($event) => changeFilterMode("TEXTAREA"))
           }, "south")) : createCommentVNode("", true)
         ], 512), [
@@ -2517,7 +2553,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
             [vModelText, textareaText.value]
           ]),
           createElementVNode("span", {
-            class: "font-icon bs-clickable mr-4 mt-5",
+            class: "filter-mode-btn font-icon bs-clickable pr-2 pt-1",
             onClick: _cache[4] || (_cache[4] = ($event) => changeFilterMode("INPUT"))
           }, "north")
         ], 512), [
@@ -2844,12 +2880,81 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const _sfc_main$2 = /* @__PURE__ */ defineComponent({
+  __name: "BSDateRangeFilter",
+  props: {
+    idFrom: {},
+    idTo: {},
+    nameFrom: {},
+    nameTo: {},
+    modelValue: {},
+    disabled: { type: Boolean },
+    width: { default: "300px" },
+    resolution: { default: "DAY" },
+    displayFormat: {},
+    popupDisplayFormat: {},
+    popupStartYear: {},
+    popupEndYear: {},
+    timeZone: {}
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const fromValue = ref();
+    const toValue = ref();
+    watch(
+      () => props.modelValue,
+      () => {
+        fromValue.value = props.modelValue?.from;
+        toValue.value = props.modelValue?.to;
+      },
+      { immediate: true }
+    );
+    const emitValue = () => {
+      const value = {
+        from: fromValue.value,
+        to: toValue.value
+      };
+      emit("update:modelValue", value);
+    };
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(BSDateRange), {
+        "from-value": fromValue.value,
+        "onUpdate:fromValue": [
+          _cache[0] || (_cache[0] = ($event) => fromValue.value = $event),
+          emitValue
+        ],
+        "to-value": toValue.value,
+        "onUpdate:toValue": [
+          _cache[1] || (_cache[1] = ($event) => toValue.value = $event),
+          emitValue
+        ],
+        "disabled-from": __props.disabled,
+        "disabled-to": __props.disabled,
+        "display-format": __props.displayFormat,
+        "id-from": __props.idFrom,
+        "id-to": __props.idTo,
+        "name-from": __props.nameFrom,
+        "name-to": __props.nameTo,
+        "popup-display-format": __props.popupDisplayFormat,
+        "popup-end-year": __props.popupEndYear,
+        "popup-start-year": __props.popupStartYear,
+        resolution: __props.resolution,
+        "time-zone": __props.timeZone,
+        "validate-date-order": false,
+        width: __props.width,
+        "hide-extra-date": ""
+      }, null, 8, ["from-value", "to-value", "disabled-from", "disabled-to", "display-format", "id-from", "id-to", "name-from", "name-to", "popup-display-format", "popup-end-year", "popup-start-year", "resolution", "time-zone", "width"]);
+    };
+  }
+});
 const _hoisted_1$1 = {
   key: 0,
-  class: "date-filters .bs-layout-vertical mr-16"
+  class: "date-filters flex flex-col"
 };
 const _hoisted_2$1 = ["onClick"];
-const _sfc_main$2 = /* @__PURE__ */ defineComponent({
+const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "BSDateRangeFilters",
   props: {
     dateFilter: {},
@@ -2965,23 +3070,22 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       return props.dateFilter.filterItems.find((item) => item.propertyId === propertyId)?.filterWidth || props.filterWidth;
     };
     return (_ctx, _cache) => {
-      const _component_BSDateRangeFilter = resolveComponent("BSDateRangeFilter");
       return __props.dateFilter.filterItems ? (openBlock(), createElementBlock("div", _hoisted_1$1, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(dateFilterValues.value, (item, index) => {
           return openBlock(), createElementBlock("div", {
             key: index,
-            class: "bs-layout-horizontal mb-4 flex-align-center"
+            class: "flex gap-1 mb-1 flex-align-center"
           }, [
             index === 0 ? (openBlock(), createElementBlock("span", {
               key: 0,
               class: normalizeClass([{
                 disabled: dateFilterValues.value.length >= __props.dateFilter.filterItems.length
-              }, "font-icon bs-clickable mr-4"]),
+              }, "font-icon bs-clickable"]),
               "data-id": "addDateFilterBtn",
               onClick: addDateFilter
             }, "add", 2)) : (openBlock(), createElementBlock("span", {
               key: 1,
-              class: "font-icon bs-clickable mr-4",
+              class: "font-icon bs-clickable",
               "data-id": "removeDateFilterBtn",
               onClick: ($event) => removeDateFilter(index)
             }, "remove", 8, _hoisted_2$1)),
@@ -2991,11 +3095,10 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
               "model-value": item.propertyId,
               style: normalizeStyle({ minWidth: __props.captionMinWidth }),
               "value-provider": (filter) => filter.propertyId,
-              class: "mr-4",
               "data-id": "filterItemSelect",
               "onUpdate:modelValue": ($event) => setDateFilterPropertyId(index, $event)
             }, null, 8, ["items", "label-provider", "model-value", "style", "value-provider", "onUpdate:modelValue"]),
-            createVNode(_component_BSDateRangeFilter, {
+            createVNode(_sfc_main$2, {
               "display-format": dateFormatOfFilterItem(item.propertyId),
               "from-id": `${item.propertyId}From`,
               "model-value": item.value,
@@ -3017,8 +3120,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                 (value, preset) => setDateFilterValue(index, value, preset)
               ],
               presets: __props.presets,
-              "time-zone": timeZoneOfFilterItem(item.propertyId),
-              class: "ml-4"
+              "time-zone": timeZoneOfFilterItem(item.propertyId)
             }, null, 8, ["modelValue", "onUpdate:modelValue", "presets", "time-zone"])
           ]);
         }), 128))
@@ -3026,9 +3128,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1 = { class: "bs-grid-lookup bs-layout-horizontal flex-align-start" };
-const _hoisted_2 = { class: "text-nowrap" };
-const _sfc_main$1 = /* @__PURE__ */ defineComponent({
+const _hoisted_1 = { class: "bs-grid-lookup flex flex-align-start" };
+const _hoisted_2 = { class: "text-nowrap flex gap-1" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "BSGridLookup",
   props: {
     gridId: {},
@@ -3126,10 +3228,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             emitUpdateModelValueAndSearch
           ],
           keyword: __props.keyword,
-          "text-filter-items": __props.config.textFilter.filterItems,
-          class: "mr-16"
+          "text-filter-items": __props.config.textFilter.filterItems
         }, null, 8, ["modelValue", "keyword", "text-filter-items"])) : createCommentVNode("", true),
-        __props.config?.dateFilter ? (openBlock(), createBlock(_sfc_main$2, {
+        __props.config?.dateFilter ? (openBlock(), createBlock(_sfc_main$1, {
           key: 1,
           modelValue: dateFilterValue.value,
           "onUpdate:modelValue": [
@@ -3156,12 +3257,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           __props.config?.dateFilter ? (openBlock(), createBlock(unref(BSButton), {
             key: 0,
             caption: "Save",
-            class: "ml-4",
             onClick: saveSearchCondition
           })) : createCommentVNode("", true),
           createVNode(unref(BSButton), {
             caption: "Reset",
-            class: "ml-4",
             onClick: resetSearchCondition
           })
         ])
@@ -3169,80 +3268,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "BSDateRangeFilter",
-  props: {
-    idFrom: {},
-    idTo: {},
-    nameFrom: {},
-    nameTo: {},
-    modelValue: {},
-    disabled: { type: Boolean },
-    width: { default: "300px" },
-    resolution: { default: "DAY" },
-    displayFormat: {},
-    popupDisplayFormat: {},
-    popupStartYear: {},
-    popupEndYear: {},
-    timeZone: {}
-  },
-  emits: ["update:modelValue"],
-  setup(__props, { emit: __emit }) {
-    const props = __props;
-    const emit = __emit;
-    const fromValue = ref();
-    const toValue = ref();
-    watch(
-      () => props.modelValue,
-      () => {
-        fromValue.value = props.modelValue?.from;
-        toValue.value = props.modelValue?.to;
-      },
-      { immediate: true }
-    );
-    const emitValue = () => {
-      const value = {
-        from: fromValue.value,
-        to: toValue.value
-      };
-      emit("update:modelValue", value);
-    };
-    return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(BSDateRange), {
-        "from-value": fromValue.value,
-        "onUpdate:fromValue": [
-          _cache[0] || (_cache[0] = ($event) => fromValue.value = $event),
-          emitValue
-        ],
-        "to-value": toValue.value,
-        "onUpdate:toValue": [
-          _cache[1] || (_cache[1] = ($event) => toValue.value = $event),
-          emitValue
-        ],
-        "disabled-from": __props.disabled,
-        "disabled-to": __props.disabled,
-        "display-format": __props.displayFormat,
-        "id-from": __props.idFrom,
-        "id-to": __props.idTo,
-        "name-from": __props.nameFrom,
-        "name-to": __props.nameTo,
-        "popup-display-format": __props.popupDisplayFormat,
-        "popup-end-year": __props.popupEndYear,
-        "popup-start-year": __props.popupStartYear,
-        resolution: __props.resolution,
-        "time-zone": __props.timeZone,
-        "validate-date-order": false,
-        width: __props.width,
-        "hide-extra-date": ""
-      }, null, 8, ["from-value", "to-value", "disabled-from", "disabled-to", "display-format", "id-from", "id-to", "name-from", "name-to", "popup-display-format", "popup-end-year", "popup-start-year", "resolution", "time-zone", "width"]);
-    };
-  }
-});
 export {
   AbstractFilter,
   AndFilter,
-  _sfc_main as BSDateRangeFilter,
-  _sfc_main$2 as BSDateRangeFilters,
+  _sfc_main$2 as BSDateRangeFilter,
+  _sfc_main$1 as BSDateRangeFilters,
   _sfc_main$3 as BSDateRangePresets,
   _sfc_main$7 as BSGrid,
   _sfc_main$d as BSGridCell,
@@ -3256,7 +3286,7 @@ export {
   _sfc_main$f as BSGridHeaderCellCheckbox,
   BSGridHeaderCellResizeHandle,
   BSGridHeaderCellSerialNo,
-  _sfc_main$1 as BSGridLookup,
+  _sfc_main as BSGridLookup,
   _sfc_main$8 as BSGridRow,
   _sfc_main$4 as BSTextFilter,
   BetweenDateFilter,