diginet-core-ui 1.4.55 → 1.4.56-beta.2

package/components/form-control/date-range-picker/index.js

@@ -1,13 +1,13 @@
 /** @jsxRuntime classic */
 /** @jsx jsx */
 import { css, jsx } from '@emotion/core';
-import { Button, ButtonIcon, Divider, HelperText, InputBase, Label, Typography } from "../..";
+import { Button, ButtonIcon, Divider, HelperText, InputBase, Label, Typography, CircularProgress, Popover } from "../..";
 import { getGlobal } from "../../../global";
 import locale from "../../../locale";
 import PropTypes from 'prop-types';
 import { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { render } from 'react-dom';
-import { bgColor, borderRadius4px, cursorPointer, displayBlock, displayFlex, displayNone, flexCol, flexRow, invisible, justifyBetween, justifyEnd, itemsCenter, left, parseHeight, parseMaxWidth, parseMinWidth, parseWidth, pointerEventsNone, positionFixed, shadowLarge, textCenter, top, userSelectNone, whiteSpaceNoWrap, z } from "../../../styles/general";
+import { bgColor, borderRadius4px, cursorPointer, displayBlock, displayFlex, displayNone, flexCol, flexRow, invisible, justifyBetween, justifyEnd, itemsCenter, left, parseHeight, parseMaxWidth, parseMinWidth, parseWidth, pointerEventsNone, positionFixed, shadowLarge, textCenter, top, userSelectNone, whiteSpaceNoWrap, z, justifyCenter, positionAbsolute, borderRadius, parseWidthHeight } from "../../../styles/general";
 import { useTheme } from "../../../theme";
 import { capitalizeSentenceCase, classNames, isEqual, date as moment, randomString, updatePosition } from "../../../utils";
 import { getColor } from "../../../styles/utils";
@@ -66,7 +66,7 @@ const isAfter = (max, time) => {
 const parseDate = day => {
   return Date.parse(new Date(day));
 };
-const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference) => {
+const DateRangePicker = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference) => {
   var _periodOptions$dataSo;
   // props priority: `inProps` > `themeDefaultProps`
   const props = useThemeProps({
@@ -131,9 +131,15 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
   const [, setValueFr] = useState(Date.now());
   const [, setValueTo] = useState(Date.now());
   const [, setSelected] = useState(Date.now());
+  const [loadingState, setLoadingState] = useState(periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.loading);
+  const [totalState, setTotalState] = useState(periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.total);
+  const [dataSourceState, setDataSourceState] = useState((periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.dataSource) || []);
+  const [openState, setOpenState] = useState(false);
   const selectedPeriodRef = useRef('');
   const selectedPeriodIndex = useRef(null);
   const focusBtnRef = useRef('today');
+  const loadMoreTimer = useRef(null);
+  const dropdownListRef = useRef(null);
   const [valueState, setValueState] = useState();
   const navigatorFromRefs = {
     doubleLeft: useRef(null),
@@ -218,6 +224,8 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
   const onDayClick = e => {
     const el = e.currentTarget;
     const v = parseInt(el.dataset.time, 10);
+    selectedPeriodRef.current = '';
+    focusBtnRef.current = '';
     if (values.current.length === 0) {
       //push
       el.classList.add(unique.day.active);
@@ -520,7 +528,8 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
   const setButtonState = () => {
     const isVisible = isEqual(values.current, tempValues.current);
     const query = function (selector) {
-      return footerRef.current.querySelector(selector);
+      var _footerRef$current;
+      return (_footerRef$current = footerRef.current) === null || _footerRef$current === void 0 ? void 0 : _footerRef$current.querySelector(selector);
     };
     const close = query(`.${unique.close}`);
     const cancel = query(`.${unique.cancel}`);
@@ -534,19 +543,20 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
       visibility: 'visible'
     };
     if (isVisible) {
-      Object.assign(close.style, visible);
-      Object.assign(cancel.style, hidden);
-      Object.assign(confirm.style, hidden);
+      Object.assign((close === null || close === void 0 ? void 0 : close.style) || {}, visible);
+      Object.assign((cancel === null || cancel === void 0 ? void 0 : cancel.style) || {}, hidden);
+      Object.assign((confirm === null || confirm === void 0 ? void 0 : confirm.style) || {}, hidden);
     } else {
-      Object.assign(cancel.style, visible);
-      Object.assign(confirm.style, visible);
-      Object.assign(close.style, hidden);
+      Object.assign((cancel === null || cancel === void 0 ? void 0 : cancel.style) || {}, visible);
+      Object.assign((confirm === null || confirm === void 0 ? void 0 : confirm.style) || {}, visible);
+      Object.assign((close === null || close === void 0 ? void 0 : close.style) || {}, hidden);
     }
   };
   const onCancel = () => {
     updateValues(tempValues.current);
     setButtonState();
     closePicker();
+    setOpenState(false);
   };
   const onConfirm = () => {
     setButtonState();
@@ -556,6 +566,7 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
       onChangeValue(values.current);
     }
     closePicker();
+    setOpenState(false);
   };
   const onSwap = open => {
     if (!isEnable) return;
@@ -701,6 +712,22 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
       controls && setButtonState();
     });
   };
+  const openPeriodPicker = () => {
+    // const arr = pickerRef.current.getElementsByTagName('td');
+    updateTempValues(values.current.length === 1 ? [values.current[0], values.current[0]] : values.current);
+    setOpenState(true);
+    setTimeout(() => {
+      renderPicker();
+      // pickerRef.current.addEventListener('mouseover', e => onPickerHover(e, arr));
+      window.addEventListener('resize', onResize);
+      window.addEventListener('scroll', onScroll);
+      document.addEventListener('mousedown', onClickOutside);
+      if (pressESCToClose) {
+        document.addEventListener('keydown', pressESCHandler);
+      }
+      controls && setButtonState();
+    });
+  };
   const closePicker = () => {
     const backGr = document.getElementById(unique.backGr);
     if (!backGr) return;
@@ -725,10 +752,12 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
     }
     ipRef.current && ipRef.current.blur();
     updateTempValues([]);
+    setOpenState(false);
   };
   const onClickOutside = e => {
     if (ipConRef.current && !ipConRef.current.contains(e.target) && ipRef.current && !ipRef.current.contains(e.target) && pickerRef.current && !pickerRef.current.contains(e.target)) {
       controls ? onCancel() : closePicker();
+      setOpenState(false);
     }
   };
   const triggerFocus = () => {
@@ -743,9 +772,13 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
   const onInputFocus = () => {
     if (!isEnable) return;
     const el = ipConRef.current;
-    if (!el.classList.contains(unique.focus)) {
-      el.classList.add(unique.focus);
-      openPicker();
+    if ((periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.enable) === true) {
+      openPeriodPicker();
+    } else {
+      if (!el.classList.contains(unique.focus)) {
+        el.classList.add(unique.focus);
+        openPicker();
+      }
     }
   };
   const setInputValue = (time, reset, unshift = false) => {
@@ -806,8 +839,8 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
           const firstday = new Date(currentDay.setDate(first)).setHours(0, 0, 0);
           const lastday = new Date(currentDay.setDate(last)).setHours(0, 0, 0);
           value = [firstday.valueOf(), lastday.valueOf()];
-          valueFr.current = firstday;
-          valueTo.current = lastday;
+          valueFr.current = new Date(firstday);
+          valueTo.current = new Date(lastday);
           break;
         }
       case 'thisMonth':
@@ -830,8 +863,8 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
             lastday = new Date(lastDayArray[2], lastDayArray[1], lastDayArray[0]);
           }
           value = [firstday.valueOf(), lastday.valueOf()];
-          valueFr.current = firstday;
-          valueTo.current = lastday;
+          valueFr.current = new Date(firstday);
+          valueTo.current = new Date(lastday);
           selectedPeriodIndex.current = `period${periodData === null || periodData === void 0 ? void 0 : periodData.idx}`;
           selectedPeriodRef.current = periodData === null || periodData === void 0 ? void 0 : periodData[periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.displayExpr];
           document.getElementById(selectedPeriodIndex.current).style.background = getColor('fill/hover');
@@ -915,6 +948,15 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
       closePicker();
     };
   }, [actionIconAt, clearAble, controls, disabled, displayFormat, max, min, pressESCToClose, readOnly, startFromZero, unitCount, viewType]);
+  useEffect(() => {
+    setLoadingState(periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.loading);
+  }, [periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.loading]);
+  useEffect(() => {
+    setTotalState(periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.total);
+  }, [periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.total]);
+  useEffect(() => {
+    setDataSourceState((periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.dataSource) || []);
+  }, [periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.dataSource]);
   useImperativeHandle(reference, () => {
     const currentRef = ref.current || {};
     currentRef.element = ref.current;
@@ -1030,6 +1072,33 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
     className: unique.table.table,
     ref: tableToRef
   }, renderHeader(unique), jsx("tbody", null))));
+  const onLoadMoreHandler = e => {
+    e.persist();
+    if (loadMoreTimer.current) {
+      clearTimeout(loadMoreTimer.current);
+    }
+    const {
+      onLoadMore,
+      limit
+    } = periodOptions;
+    loadMoreTimer.current = setTimeout(() => {
+      if (onLoadMore && (dataSourceState === null || dataSourceState === void 0 ? void 0 : dataSourceState.length) < totalState && !loadingState) {
+        const {
+          scrollTop,
+          scrollHeight,
+          offsetHeight
+        } = e.target;
+        if (scrollHeight <= Math.ceil(scrollTop + 2) + offsetHeight && dropdownListRef.current) {
+          var _dropdownListRef$curr;
+          const length = (_dropdownListRef$curr = dropdownListRef.current.children) === null || _dropdownListRef$curr === void 0 ? void 0 : _dropdownListRef$curr.length;
+          !!onLoadMore && onLoadMore({
+            skip: length,
+            limit: limit
+          });
+        }
+      }
+    }, 300);
+  };
   const rightCalendarPeriodComp = jsx("div", {
     css: _PeriodContainerCSS
   }, jsx(Typography, {
@@ -1038,7 +1107,20 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
     style: {
       marginBottom: 8
     }
-  }, selectPeriodText), periodOptions === null || periodOptions === void 0 ? void 0 : (_periodOptions$dataSo = periodOptions.dataSource) === null || _periodOptions$dataSo === void 0 ? void 0 : _periodOptions$dataSo.map((p, idx) => {
+  }, selectPeriodText), loadingState ? jsx("div", {
+    css: LoadingProgressCSS,
+    className: 'DGN-Dropdown-Loading-Progress'
+  }, jsx(CircularProgress, {
+    size: 24
+  })) : null, jsx("div", {
+    style: {
+      width: '100%',
+      maxHeight: 175,
+      overflowY: 'scroll'
+    },
+    ref: dropdownListRef,
+    onScroll: onLoadMoreHandler
+  }, periodOptions === null || periodOptions === void 0 ? void 0 : (_periodOptions$dataSo = periodOptions.dataSource) === null || _periodOptions$dataSo === void 0 ? void 0 : _periodOptions$dataSo.map((p, idx) => {
     const isSelected = (p === null || p === void 0 ? void 0 : p[periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.displayExpr]) === selectedPeriodRef.current;
     return jsx("div", {
       id: `period${idx}`,
@@ -1055,7 +1137,7 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
       color: 'inherit',
       type: 'p1'
     }, p === null || p === void 0 ? void 0 : p[periodOptions === null || periodOptions === void 0 ? void 0 : periodOptions.displayExpr]));
-  }));
+  })));
   const tooltipComp = jsx("div", {
     className: unique.tooltip,
     ref: tooltipRef
@@ -1087,7 +1169,40 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
     ...labelProps,
     disabled: disabled,
     required: required
-  }, label) : null, jsx(InputBase, {
+  }, label) : null, periodOptions !== null && periodOptions !== void 0 && periodOptions.enable ? jsx(Popover, {
+    open: openState,
+    className: 'DGN-UI-Popover-Period',
+    anchorOrigin: {
+      horizontal: 'left',
+      vertical: 'bottom'
+    },
+    anchor: jsx("div", null, jsx(InputBase, {
+      inputProps: {
+        placeholder: !readOnly && !disabled ? placeholder : '',
+        ...inputProps
+      },
+      readOnly: true,
+      ref: ipConRef,
+      inputRef: ipRef,
+      disabled: disabled,
+      viewType: viewType,
+      inputStyle: {
+        textAlign: textAlign,
+        textOverflow: 'ellipsis',
+        ...inputStyle
+      },
+      startIcon: startIcon,
+      startIconProps: {
+        className: 'non-effect allow-disabled'
+      },
+      endIcon: endIcon,
+      value: valueState
+    }), error ? jsx(HelperText, {
+      ...helperTextProps,
+      disabled: disabled
+    }, error) : null),
+    onOpen: openPeriodPicker
+  }, pickerComp) : jsx("div", null, jsx(InputBase, {
     inputProps: {
       placeholder: !readOnly && !disabled ? placeholder : '',
       ...inputProps
@@ -1112,7 +1227,7 @@ const DateRangePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, ref
   }), error ? jsx(HelperText, {
     ...helperTextProps,
     disabled: disabled
-  }, error) : null);
+  }, error) : null));
 }));
 const unique = {
   backGr: 'DGN-UI-Portal',
@@ -1304,7 +1419,18 @@ const pickerCSS = {
     transform: 'scale(0)'
   }
 };
-
+const LoadingProgressCSS = css`
+    ${displayFlex};
+    ${flexRow};
+    ${justifyCenter};
+    ${itemsCenter};
+    ${positionAbsolute};
+    ${borderRadius(4)};
+    ${parseWidthHeight('100%')}
+    ${bgColor('rgba(255, 255, 255, 0.6)')};
+    ${z(2)};
+    ${top(0)};
+`;
 // DateRangePicker.defaultProps = {
 //     actionIconAt: 'end',
 //     clearAble: false,
@@ -1365,7 +1491,12 @@ DateRangePicker.propTypes = {
    *  displayExpr: "DisplayName",
    *  valueFromExpr: "DateFrom",
    *  valueToExpr: "DateTo",
-   *  valueFormat: "DD/MM/YYYY"
+   *  valueFormat: "DD/MM/YYYY",
+   *  limit: 5,
+   *  skip: 0,
+   *  total: 100,
+   *  onLoadMore: () => {},
+   *  loading: false
    * }
    */
   periodOptions: PropTypes.object,

package/components/form-control/dropdown/index.js

@@ -11,6 +11,7 @@ import { animation, bgColor, border, borderBottom, borderBottomColor, borderColo
 import { useTheme } from "../../../theme";
 import useThemeProps from "../../../theme/utils/useThemeProps";
 import { classNames, getProp, isMobile, randomString } from "../../../utils";
+import { isEmpty, typeOf } from "../../../utils/type";
 const currentValue = {},
   isSearch = {},
   allValue = {};
@@ -47,7 +48,7 @@ const uniqBy = (arr, iteratee) => {
     return true;
   });
 };
-const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference) => {
+const Dropdown = /*#__PURE__*/memo(/*#__PURE__*/forwardRef((inProps, reference) => {
   if (!reference) reference = useRef(null);
   const theme = useTheme();
   const {
@@ -135,6 +136,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
   const loadMoreTimer = useRef(null);
   const dataChosen = useRef([]);
   const popupRef = useRef(null);
+  const valueObjectDefaultInit = useRef({});
   const filter = useRef({
     skip: skip || 0,
     limit: limit || 50
@@ -322,8 +324,9 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     let text = '';
     let isReplace = true;
     if (data || data === 0) {
+      var _data$displayExpr;
       displayExpr = displayExpr || valueExpr;
-      let mask = data === null || data === void 0 ? void 0 : data[displayExpr];
+      let mask = typeOf(data === null || data === void 0 ? void 0 : data[displayExpr], 'array') ? ((_data$displayExpr = data[displayExpr]) === null || _data$displayExpr === void 0 ? void 0 : _data$displayExpr[0]) || '' : data === null || data === void 0 ? void 0 : data[displayExpr];
       // convert {id} - {name} to {<data[id]>} - {<data[name]>}
       if (selectAll && (data === null || data === void 0 ? void 0 : data[valueExpr]) === 'all') {
         isReplace = false;
@@ -342,6 +345,43 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     var _dataSourceUsable2;
     const items = [];
     let dataSourceUsable = [...dataSourceState];
+    if (vlObjDefaultState && (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length) > 0 && isEmpty(txtSearch)) {
+      // Sẽ Xem Lại
+      // if (vlObjDefaultState && vlObjDefaultState?.length > 0) {
+      const length = vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length;
+      let existItemQuantity = 0;
+      for (let index = length - 1; index >= 0; index--) {
+        if ((vlObjDefaultState[index][valueExpr] || vlObjDefaultState[index][valueExpr] === 0) && !dataSourceUsable.some(data => data[valueExpr] === vlObjDefaultState[index][valueExpr])) {
+          if (isMultipleVal(vlObjDefaultState[index])) {
+            if (isEmpty(valueObjectDefaultInit.current)) {
+              let dataCloneDeep = {};
+              for (const name in vlObjDefaultState[index]) {
+                var _vlObjDefaultState$in;
+                if (name) dataCloneDeep[name] = (((_vlObjDefaultState$in = vlObjDefaultState[index]) === null || _vlObjDefaultState$in === void 0 ? void 0 : _vlObjDefaultState$in[name]) || []).map(item => item);
+              }
+              if (!isEmpty(dataCloneDeep)) valueObjectDefaultInit.current = dataCloneDeep;
+              const valueObjectDefaultOrigin = {
+                ...valueObjectDefaultInit.current
+              } || {};
+              const arr = (valueObjectDefaultOrigin === null || valueObjectDefaultOrigin === void 0 ? void 0 : valueObjectDefaultOrigin[valueExpr]) || [];
+              for (let i = 0; i < arr.length; i++) {
+                let objData = {};
+                for (const name in valueObjectDefaultOrigin) {
+                  var _valueObjectDefaultOr;
+                  if (name) objData[name] = (valueObjectDefaultOrigin === null || valueObjectDefaultOrigin === void 0 ? void 0 : (_valueObjectDefaultOr = valueObjectDefaultOrigin[name]) === null || _valueObjectDefaultOr === void 0 ? void 0 : _valueObjectDefaultOr[i]) || '';
+                }
+                dataSourceUsable.unshift(objData);
+              }
+            }
+          } else dataSourceUsable.unshift(vlObjDefaultState[index]);
+        } else {
+          // Nếu số lượng phần tử của valueObjectDefault tồn tại trong dataSource nhiều hơn hoặc bằng limit thì không remove nữa
+          if (++existItemQuantity > limit) {
+            continue;
+          }
+        }
+      }
+    }
 
     // search dataSource dựa trên txtSearch
     if (!onInput) {
@@ -358,20 +398,6 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
         });
       }
     }
-    if (vlObjDefaultState && (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length) > 0) {
-      const length = vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : vlObjDefaultState.length;
-      let existItemQuantity = 0;
-      for (let index = length - 1; index >= 0; index--) {
-        if ((vlObjDefaultState[index][valueExpr] || vlObjDefaultState[index][valueExpr] === 0) && !dataSourceUsable.some(data => data[valueExpr] === vlObjDefaultState[index][valueExpr])) {
-          dataSourceUsable.unshift(vlObjDefaultState[index]);
-        } else {
-          // Nếu số lượng phần tử của valueObjectDefault tồn tại trong dataSource nhiều hơn hoặc bằng limit thì không remove nữa
-          if (++existItemQuantity > limit) {
-            continue;
-          }
-        }
-      }
-    }
     const length = (_dataSourceUsable2 = dataSourceUsable) === null || _dataSourceUsable2 === void 0 ? void 0 : _dataSourceUsable2.length;
     for (let index = 0; index < length; index++) {
       const data = dataSourceUsable[index];
@@ -399,10 +425,11 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
         data,
         index
       }) : jsx(Typography, {
+        lineClamp: 1,
         type: 'p1'
       }, displayText);
       if (multiple && selectBox) {
-        let checked = valueMulti.includes(value);
+        let checked = typeOf(value, 'array') ? valueMulti.some(item => value.includes(item)) : valueMulti.includes(value);
         if (selectAll && value === 'all') checked = selectAll && value === 'all' && valueMulti.length > 0;
         const isMaximumSelection = maximumSelectionLength === (valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length);
         itemDisabled = itemDisabled || isMaximumSelection && !checked;
@@ -423,7 +450,12 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
           value: value,
           disabled: itemDisabled,
           onChange: e => onChangeValue(e, displayText, value, icon, data, index)
-        }, icon, text)));
+        }, jsx("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center'
+          }
+        }, icon, text))));
       } else {
         items.push(jsx("div", {
           key: index,
@@ -486,7 +518,9 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     const dataSourceUsable = [...dataSourceState];
     // Nếu có load more thì đẩy đội tượng mặc định lên đầu
     let notExistItem = 0;
-    if (onLoadMore && vlObjDefaultState !== null && vlObjDefaultState !== void 0 && vlObjDefaultState.length) {
+    if (onLoadMore && vlObjDefaultState !== null && vlObjDefaultState !== void 0 && vlObjDefaultState.length && isEmpty(txtSearch)) {
+      // Sẽ Xem Lại
+      // if (onLoadMore && vlObjDefaultState?.length) {
       const length = vlObjDefaultState.length;
       for (let index = length - 1; index >= 0; index--) {
         if (!dataSourceUsable.some(data => data[valueExpr] === vlObjDefaultState[index][valueExpr])) {
@@ -550,7 +584,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
       } else {
         item = jsx(Fragment, null, icon, text);
       }
-      if (!dropdownListRef.current) {
+      if (!dropdownListRef.current || isEmpty(txtSearch)) {
         return;
       }
       ReactDOM.render(item, dropdownListRef.current.appendChild(dropdownItem));
@@ -997,7 +1031,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     if (valueProp !== undefined && (!dropdownListRef.current || children || JSON.stringify(valueProp) !== JSON.stringify(currentValue[unique]))) {
       setValueIntoInput(valueProp);
       if (oneLiner && multiple) {
-        const valueArray = sortMultiple(valueProp);
+        const valueArray = sortMultiple(valueProp, true);
         setValueMultiDisplay(valueArray === null || valueArray === void 0 ? void 0 : valueArray.display);
         setValueMultiOverflow(valueArray === null || valueArray === void 0 ? void 0 : valueArray.overflow);
         if ((valueArray === null || valueArray === void 0 ? void 0 : valueArray.overflow.length) === 0 && openMultipleOverflow) {
@@ -1098,9 +1132,34 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     disabled: disabled,
     ...labelProps
   }, label) : null, [label, required, disabled, labelProps]);
+  const isMultipleVal = (objData = {}) => {
+    let status = false;
+    if (typeOf(objData === null || objData === void 0 ? void 0 : objData[valueExpr], 'array') && !isEmpty(objData === null || objData === void 0 ? void 0 : objData[valueExpr]) || typeOf(objData === null || objData === void 0 ? void 0 : objData[displayExpr], 'array') && !isEmpty(objData === null || objData === void 0 ? void 0 : objData[displayExpr])) {
+      status = true;
+    }
+    return status;
+  };
   const getData = () => {
+    var _valObjDefault;
     let dataFilter = JSON.parse(JSON.stringify(dataSourceState));
-    dataFilter = uniqBy([...vlObjDefaultState, ...dataFilter], data => data === null || data === void 0 ? void 0 : data[valueExpr]);
+    let valObjDefault = vlObjDefaultState;
+    if (isMultipleVal((_valObjDefault = valObjDefault) === null || _valObjDefault === void 0 ? void 0 : _valObjDefault[0])) {
+      var _vlObjDefaultState$;
+      valObjDefault = [];
+      const arr = (vlObjDefaultState === null || vlObjDefaultState === void 0 ? void 0 : (_vlObjDefaultState$ = vlObjDefaultState[0]) === null || _vlObjDefaultState$ === void 0 ? void 0 : _vlObjDefaultState$[valueExpr]) || [];
+      for (let i = 0; i < arr.length; i++) {
+        let objData = {};
+        for (const name in vlObjDefaultState[0]) {
+          var _vlObjDefaultState$2;
+          if (name) objData[name] = (_vlObjDefaultState$2 = vlObjDefaultState[0]) === null || _vlObjDefaultState$2 === void 0 ? void 0 : _vlObjDefaultState$2[name][i];
+        }
+        if (!isEmpty(objData)) valObjDefault.push(objData);
+      }
+    }
+    dataFilter = uniqBy([...valObjDefault, ...dataFilter], data => {
+      let result = data === null || data === void 0 ? void 0 : data[valueExpr];
+      return result;
+    });
     return dataFilter;
   };
   const getTextWidth = text => {
@@ -1127,8 +1186,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
     const inputWidth = inputElement === null || inputElement === void 0 ? void 0 : inputElement.clientWidth;
     const items = [];
     if ((valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length) > 0) {
+      const dataFilter = getData();
       value.map((vl, index) => {
-        const dataFilter = getData();
         const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
         if (data) {
           const displayText = displayValue(data);
@@ -1181,8 +1240,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
   const renderMultipleItem = value => {
     const items = [];
     if ((valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length) > 0) {
+      const dataFilter = getData();
       value.map((vl, index) => {
-        const dataFilter = getData();
         const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
         if (data) {
           const displayText = displayValue(data);
@@ -1251,8 +1310,8 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, reference)
   const renderOverflowPopover = value => {
     const items = [];
     if ((valueMulti === null || valueMulti === void 0 ? void 0 : valueMulti.length) > 0) {
+      const dataFilter = getData();
       value.map((vl, index) => {
-        const dataFilter = getData();
         const data = dataFilter.find(v => v[valueExpr] === vl || v === vl);
         if (data) {
           const displayText = displayValue(data);