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

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

@@ -1116,7 +1116,7 @@
   };
   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__ */ vue.defineComponent({
@@ -1224,7 +1224,7 @@
       };
     }
   });
-  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__ */ vue.defineComponent({
@@ -2099,8 +2099,8 @@
   });
   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__ */ vue.defineComponent({
     __name: "BSGridColumnSettingModal",
     props: {
@@ -2413,15 +2413,31 @@
     setup(__props, { emit: __emit }) {
       const props = __props;
       const emit = __emit;
-      const likeTextFilterItems = vue.computed(() => props.textFilterItems);
-      const inTextFilterItems = vue.computed(() => props.textFilterItems.filter((filter) => filter.allowMultiLineFilter));
-      const hasTextAreaFilterItem = vue.computed(() => inTextFilterItems.value.length > 0);
+      const likeTextFilterItems = vue.computed(
+        () => props.textFilterItems
+      );
+      const inTextFilterItems = vue.computed(
+        () => props.textFilterItems.filter((filter) => filter.allowMultiLineFilter)
+      );
+      const hasTextAreaFilterItem = vue.computed(
+        () => inTextFilterItems.value.length > 0
+      );
       const filterMode = vue.ref("INPUT");
       const changeFilterMode = (mode) => filterMode.value = mode;
-      const likeFilterItems = vue.computed(() => likeTextFilterItems.value.filter((item) => !item.filterCreator && item.filterType !== "NUMBER"));
-      const equalFilterItemPropertyIds = vue.computed(() => likeTextFilterItems.value.filter((item) => !item.filterCreator && item.filterType === "NUMBER").map((item) => item.propertyId));
-      const customFilterItems = vue.computed(() => likeTextFilterItems.value.filter((item) => item.filterCreator));
-      const inFilterItemPropertyIds = vue.computed(() => inTextFilterItems.value.map((filter) => filter.propertyId));
+      const likeFilterItems = vue.computed(
+        () => likeTextFilterItems.value.filter(
+          (item) => !item.filterCreator && item.filterType !== "NUMBER"
+        )
+      );
+      const equalFilterItemPropertyIds = vue.computed(
+        () => likeTextFilterItems.value.filter((item) => !item.filterCreator && item.filterType === "NUMBER").map((item) => item.propertyId)
+      );
+      const customFilterItems = vue.computed(
+        () => likeTextFilterItems.value.filter((item) => item.filterCreator)
+      );
+      const inFilterItemPropertyIds = vue.computed(
+        () => inTextFilterItems.value.map((filter) => filter.propertyId)
+      );
       const getFilterKeyword = (filter) => {
         const actualFilter = filter instanceof OrFilter ? filter.filters[0] : filter;
         if (actualFilter && "getFilterValueString" in actualFilter) {
@@ -2452,13 +2468,31 @@
       };
       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) => {
@@ -2468,13 +2502,15 @@
           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(openBlueseaCore.notNull);
           if (allFilters.length >= 2) return orFilter(allFilters);
           else return allFilters[0];
@@ -2507,7 +2543,7 @@
             ]),
             hasTextAreaFilterItem.value ? (vue.openBlock(), vue.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")) : vue.createCommentVNode("", true)
           ], 512), [
@@ -2522,7 +2558,7 @@
               [vue.vModelText, textareaText.value]
             ]),
             vue.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), [
@@ -2849,12 +2885,81 @@
       };
     }
   });
+  const _sfc_main$2 = /* @__PURE__ */ vue.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 = vue.ref();
+      const toValue = vue.ref();
+      vue.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 vue.openBlock(), vue.createBlock(vue.unref(openBlueseaCore.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__ */ vue.defineComponent({
+  const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     __name: "BSDateRangeFilters",
     props: {
       dateFilter: {},
@@ -2970,23 +3075,22 @@
         return props.dateFilter.filterItems.find((item) => item.propertyId === propertyId)?.filterWidth || props.filterWidth;
       };
       return (_ctx, _cache) => {
-        const _component_BSDateRangeFilter = vue.resolveComponent("BSDateRangeFilter");
         return __props.dateFilter.filterItems ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$1, [
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(dateFilterValues.value, (item, index) => {
             return vue.openBlock(), vue.createElementBlock("div", {
               key: index,
-              class: "bs-layout-horizontal mb-4 flex-align-center"
+              class: "flex gap-1 mb-1 flex-align-center"
             }, [
               index === 0 ? (vue.openBlock(), vue.createElementBlock("span", {
                 key: 0,
                 class: vue.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)) : (vue.openBlock(), vue.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)),
@@ -2996,11 +3100,10 @@
                 "model-value": item.propertyId,
                 style: vue.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"]),
-              vue.createVNode(_component_BSDateRangeFilter, {
+              vue.createVNode(_sfc_main$2, {
                 "display-format": dateFormatOfFilterItem(item.propertyId),
                 "from-id": `${item.propertyId}From`,
                 "model-value": item.value,
@@ -3022,8 +3125,7 @@
                   (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))
@@ -3031,9 +3133,9 @@
       };
     }
   });
-  const _hoisted_1 = { class: "bs-grid-lookup bs-layout-horizontal flex-align-start" };
-  const _hoisted_2 = { class: "text-nowrap" };
-  const _sfc_main$1 = /* @__PURE__ */ vue.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__ */ vue.defineComponent({
     __name: "BSGridLookup",
     props: {
       gridId: {},
@@ -3131,10 +3233,9 @@
               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"])) : vue.createCommentVNode("", true),
-          __props.config?.dateFilter ? (vue.openBlock(), vue.createBlock(_sfc_main$2, {
+          __props.config?.dateFilter ? (vue.openBlock(), vue.createBlock(_sfc_main$1, {
             key: 1,
             modelValue: dateFilterValue.value,
             "onUpdate:modelValue": [
@@ -3161,12 +3262,10 @@
             __props.config?.dateFilter ? (vue.openBlock(), vue.createBlock(vue.unref(openBlueseaCore.BSButton), {
               key: 0,
               caption: "Save",
-              class: "ml-4",
               onClick: saveSearchCondition
             })) : vue.createCommentVNode("", true),
             vue.createVNode(vue.unref(openBlueseaCore.BSButton), {
               caption: "Reset",
-              class: "ml-4",
               onClick: resetSearchCondition
             })
           ])
@@ -3174,79 +3273,10 @@
       };
     }
   });
-  const _sfc_main = /* @__PURE__ */ vue.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 = vue.ref();
-      const toValue = vue.ref();
-      vue.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 vue.openBlock(), vue.createBlock(vue.unref(openBlueseaCore.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"]);
-      };
-    }
-  });
   exports2.AbstractFilter = AbstractFilter;
   exports2.AndFilter = AndFilter;
-  exports2.BSDateRangeFilter = _sfc_main;
-  exports2.BSDateRangeFilters = _sfc_main$2;
+  exports2.BSDateRangeFilter = _sfc_main$2;
+  exports2.BSDateRangeFilters = _sfc_main$1;
   exports2.BSDateRangePresets = _sfc_main$3;
   exports2.BSGrid = _sfc_main$7;
   exports2.BSGridCell = _sfc_main$d;
@@ -3260,7 +3290,7 @@
   exports2.BSGridHeaderCellCheckbox = _sfc_main$f;
   exports2.BSGridHeaderCellResizeHandle = BSGridHeaderCellResizeHandle;
   exports2.BSGridHeaderCellSerialNo = BSGridHeaderCellSerialNo;
-  exports2.BSGridLookup = _sfc_main$1;
+  exports2.BSGridLookup = _sfc_main;
   exports2.BSGridRow = _sfc_main$8;
   exports2.BSTextFilter = _sfc_main$4;
   exports2.BetweenDateFilter = BetweenDateFilter;

package/package.json

@@ -3,7 +3,7 @@
   "description": "Vue Data Grid Component for Management Console.",
   "license": "Proprietary",
   "private": false,
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "type": "module",
   "engines": {
     "node": ">= 24.3.0"
@@ -39,7 +39,7 @@
     "dayjs": "^1.11.19",
     "tslib": "^2.8.1",
     "vue": "^3.5.22",
-    "@g1cloud/open-bluesea-core": "1.0.0-alpha.6"
+    "@g1cloud/open-bluesea-core": "1.0.0-alpha.8"
   },
   "peerDependencies": {
     "@g1cloud/open-bluesea-core": "^1.0.0",