@fctc/sme-widget-ui 1.0.5 → 1.0.6

package/dist/index.js

@@ -15139,9 +15139,10 @@ var Search = ({
       setPage(0);
       setSelectedRowKeys([]);
       const containSearchFilter = selectedTags?.length > 0 && selectedTags?.find(
-        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH || item?.type === SearchType.GROUP
+        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH
       );
-      if (containSearchFilter || Array.isArray(selectedTags) && selectedTags?.length === 0) {
+      const containGroup = selectedTags?.length > 0 && selectedTags?.some((item) => item?.type === SearchType.GROUP);
+      if (containSearchFilter && !containGroup || selectedTags?.length === 0) {
         setDomainList(domainSearch);
       }
     }
@@ -15152,8 +15153,9 @@ var Search = ({
       setDidInit(false);
       setIsReadyFormatDomain(false);
     };
-  }, [viewData]);
+  }, [aid]);
   (0, import_react18.useEffect)(() => {
+    if (!filterBy) return;
     if (didInit || selectedTags?.length > 0) return;
     const searchDefaults = Object.entries(context || {}).filter(
       ([key]) => key.startsWith("search_default_")
@@ -15181,7 +15183,7 @@ var Search = ({
       return item;
     });
     if (updatedFilter) setFilterBy(updatedFilter);
-    if (hasGroupBy) {
+    if (hasGroupBy && fieldsList?.length > 0) {
       viewData?.views?.search?.filters_by?.forEach((item, idx) => {
         const groupCtx = evalJSONContext(item?.context);
         handleAddTagSearch?.({
@@ -15190,13 +15192,14 @@ var Search = ({
           type: SearchType.GROUP,
           context: groupCtx,
           groupIndex: idx,
-          isDefault: true
+          isDefault: true,
+          fieldsGroup: fieldsList
         });
       });
       setDidInit(true);
     }
     setIsReadyFormatDomain(true);
-  }, [aid]);
+  }, [aid, filterBy, fieldsList]);
   return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
     "div",
     {
@@ -32612,19 +32615,7 @@ var FeeField = (props) => {
 var import_react54 = require("react");
 var import_jsx_runtime82 = require("react/jsx-runtime");
 var FileUploadField = (props) => {
-  const {
-    name: name2,
-    methods,
-    isForm,
-    model,
-    required,
-    idForm,
-    widget,
-    useUploadImage,
-    useUploadFile,
-    useGetImage,
-    isBase64File
-  } = props;
+  const { name: name2, methods, isForm, model, required, idForm, widget, useUploadImage, useUploadFile, useGetImage, isBase64File } = props;
   const fileInputRef = (0, import_react54.useRef)(null);
   const [selectedFiles, setSelectedFiles] = (0, import_react54.useState)([]);
   const [uploadError, setUploadError] = (0, import_react54.useState)();

package/dist/index.mjs

@@ -15020,9 +15020,10 @@ var Search = ({
       setPage(0);
       setSelectedRowKeys([]);
       const containSearchFilter = selectedTags?.length > 0 && selectedTags?.find(
-        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH || item?.type === SearchType.GROUP
+        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH
       );
-      if (containSearchFilter || Array.isArray(selectedTags) && selectedTags?.length === 0) {
+      const containGroup = selectedTags?.length > 0 && selectedTags?.some((item) => item?.type === SearchType.GROUP);
+      if (containSearchFilter && !containGroup || selectedTags?.length === 0) {
         setDomainList(domainSearch);
       }
     }
@@ -15033,8 +15034,9 @@ var Search = ({
       setDidInit(false);
       setIsReadyFormatDomain(false);
     };
-  }, [viewData]);
+  }, [aid]);
   useEffect6(() => {
+    if (!filterBy) return;
     if (didInit || selectedTags?.length > 0) return;
     const searchDefaults = Object.entries(context || {}).filter(
       ([key]) => key.startsWith("search_default_")
@@ -15062,7 +15064,7 @@ var Search = ({
       return item;
     });
     if (updatedFilter) setFilterBy(updatedFilter);
-    if (hasGroupBy) {
+    if (hasGroupBy && fieldsList?.length > 0) {
       viewData?.views?.search?.filters_by?.forEach((item, idx) => {
         const groupCtx = evalJSONContext(item?.context);
         handleAddTagSearch?.({
@@ -15071,13 +15073,14 @@ var Search = ({
           type: SearchType.GROUP,
           context: groupCtx,
           groupIndex: idx,
-          isDefault: true
+          isDefault: true,
+          fieldsGroup: fieldsList
         });
       });
       setDidInit(true);
     }
     setIsReadyFormatDomain(true);
-  }, [aid]);
+  }, [aid, filterBy, fieldsList]);
   return /* @__PURE__ */ jsxs39(
     "div",
     {
@@ -32493,19 +32496,7 @@ var FeeField = (props) => {
 import { useEffect as useEffect16, useRef as useRef14, useState as useState16 } from "react";
 import { jsx as jsx84, jsxs as jsxs59 } from "react/jsx-runtime";
 var FileUploadField = (props) => {
-  const {
-    name: name2,
-    methods,
-    isForm,
-    model,
-    required,
-    idForm,
-    widget,
-    useUploadImage,
-    useUploadFile,
-    useGetImage,
-    isBase64File
-  } = props;
+  const { name: name2, methods, isForm, model, required, idForm, widget, useUploadImage, useUploadFile, useGetImage, isBase64File } = props;
   const fileInputRef = useRef14(null);
   const [selectedFiles, setSelectedFiles] = useState16([]);
   const [uploadError, setUploadError] = useState16();

package/dist/widgets.js

@@ -14784,9 +14784,10 @@ var Search = ({
       setPage(0);
       setSelectedRowKeys([]);
       const containSearchFilter = selectedTags?.length > 0 && selectedTags?.find(
-        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH || item?.type === SearchType.GROUP
+        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH
       );
-      if (containSearchFilter || Array.isArray(selectedTags) && selectedTags?.length === 0) {
+      const containGroup = selectedTags?.length > 0 && selectedTags?.some((item) => item?.type === SearchType.GROUP);
+      if (containSearchFilter && !containGroup || selectedTags?.length === 0) {
         setDomainList(domainSearch);
       }
     }
@@ -14797,8 +14798,9 @@ var Search = ({
       setDidInit(false);
       setIsReadyFormatDomain(false);
     };
-  }, [viewData]);
+  }, [aid]);
   (0, import_react18.useEffect)(() => {
+    if (!filterBy) return;
     if (didInit || selectedTags?.length > 0) return;
     const searchDefaults = Object.entries(context || {}).filter(
       ([key]) => key.startsWith("search_default_")
@@ -14826,7 +14828,7 @@ var Search = ({
       return item;
     });
     if (updatedFilter) setFilterBy(updatedFilter);
-    if (hasGroupBy) {
+    if (hasGroupBy && fieldsList?.length > 0) {
       viewData?.views?.search?.filters_by?.forEach((item, idx) => {
         const groupCtx = evalJSONContext(item?.context);
         handleAddTagSearch?.({
@@ -14835,13 +14837,14 @@ var Search = ({
           type: SearchType.GROUP,
           context: groupCtx,
           groupIndex: idx,
-          isDefault: true
+          isDefault: true,
+          fieldsGroup: fieldsList
         });
       });
       setDidInit(true);
     }
     setIsReadyFormatDomain(true);
-  }, [aid]);
+  }, [aid, filterBy, fieldsList]);
   return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
     "div",
     {
@@ -32257,19 +32260,7 @@ var FeeField = (props) => {
 var import_react54 = require("react");
 var import_jsx_runtime82 = require("react/jsx-runtime");
 var FileUploadField = (props) => {
-  const {
-    name: name2,
-    methods,
-    isForm,
-    model,
-    required,
-    idForm,
-    widget,
-    useUploadImage,
-    useUploadFile,
-    useGetImage,
-    isBase64File
-  } = props;
+  const { name: name2, methods, isForm, model, required, idForm, widget, useUploadImage, useUploadFile, useGetImage, isBase64File } = props;
   const fileInputRef = (0, import_react54.useRef)(null);
   const [selectedFiles, setSelectedFiles] = (0, import_react54.useState)([]);
   const [uploadError, setUploadError] = (0, import_react54.useState)();

package/dist/widgets.mjs

@@ -14722,9 +14722,10 @@ var Search = ({
       setPage(0);
       setSelectedRowKeys([]);
       const containSearchFilter = selectedTags?.length > 0 && selectedTags?.find(
-        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH || item?.type === SearchType.GROUP
+        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH
       );
-      if (containSearchFilter || Array.isArray(selectedTags) && selectedTags?.length === 0) {
+      const containGroup = selectedTags?.length > 0 && selectedTags?.some((item) => item?.type === SearchType.GROUP);
+      if (containSearchFilter && !containGroup || selectedTags?.length === 0) {
         setDomainList(domainSearch);
       }
     }
@@ -14735,8 +14736,9 @@ var Search = ({
       setDidInit(false);
       setIsReadyFormatDomain(false);
     };
-  }, [viewData]);
+  }, [aid]);
   useEffect6(() => {
+    if (!filterBy) return;
     if (didInit || selectedTags?.length > 0) return;
     const searchDefaults = Object.entries(context || {}).filter(
       ([key]) => key.startsWith("search_default_")
@@ -14764,7 +14766,7 @@ var Search = ({
       return item;
     });
     if (updatedFilter) setFilterBy(updatedFilter);
-    if (hasGroupBy) {
+    if (hasGroupBy && fieldsList?.length > 0) {
       viewData?.views?.search?.filters_by?.forEach((item, idx) => {
         const groupCtx = evalJSONContext(item?.context);
         handleAddTagSearch?.({
@@ -14773,13 +14775,14 @@ var Search = ({
           type: SearchType.GROUP,
           context: groupCtx,
           groupIndex: idx,
-          isDefault: true
+          isDefault: true,
+          fieldsGroup: fieldsList
         });
       });
       setDidInit(true);
     }
     setIsReadyFormatDomain(true);
-  }, [aid]);
+  }, [aid, filterBy, fieldsList]);
   return /* @__PURE__ */ jsxs39(
     "div",
     {
@@ -32195,19 +32198,7 @@ var FeeField = (props) => {
 import { useEffect as useEffect16, useRef as useRef14, useState as useState16 } from "react";
 import { jsx as jsx84, jsxs as jsxs59 } from "react/jsx-runtime";
 var FileUploadField = (props) => {
-  const {
-    name: name2,
-    methods,
-    isForm,
-    model,
-    required,
-    idForm,
-    widget,
-    useUploadImage,
-    useUploadFile,
-    useGetImage,
-    isBase64File
-  } = props;
+  const { name: name2, methods, isForm, model, required, idForm, widget, useUploadImage, useUploadFile, useGetImage, isBase64File } = props;
   const fileInputRef = useRef14(null);
   const [selectedFiles, setSelectedFiles] = useState16([]);
   const [uploadError, setUploadError] = useState16();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/sme-widget-ui",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",