funda-ui 4.7.335 → 4.7.445

package/lib/cjs/MultipleCheckboxes/index.js

@@ -462,6 +462,14 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           return (/* binding */_extractContentsOfBrackets
           );
         },
+        /* harmony export */"extractContentsOfMixedCharactersWithBraces": function extractContentsOfMixedCharactersWithBraces() {
+          return (/* binding */_extractContentsOfMixedCharactersWithBraces
+          );
+        },
+        /* harmony export */"extractContentsOfMixedCharactersWithComma": function extractContentsOfMixedCharactersWithComma() {
+          return (/* binding */_extractContentsOfMixedCharactersWithComma
+          );
+        },
         /* harmony export */"extractContentsOfParentheses": function extractContentsOfParentheses() {
           return (/* binding */_extractContentsOfParentheses
           );
@@ -545,6 +553,69 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         }
       }
 
+      /**
+       * Parses a braces-separated string of `{label[value]}` pairs into an array of objects.
+       *
+       * Example:
+       *   Input: "{Poor[c]}{Sub-option 4[c-2]}{Empty[]}"
+       *   Input: "{{Poor[c]}{Sub-option 4[c-2]}{Empty[]}[]}"
+       * 
+       *   Output: [
+       *     { label: "Poor", value: "c" },
+       *     { label: "Sub-option 4", value: "c-2" },
+       *     { label: "Empty", value: "" }
+       *   ]
+       *
+       * @param {string} str - The input string containing one or more `{label[value]}` segments.
+       * @returns {Array<{label: string, value: string}>} - An array of extracted label-value objects.
+       */
+      function _extractContentsOfMixedCharactersWithBraces(str) {
+        // Fix the extra '{' at the beginning
+        var cleaned = str.replace(/^{{/, '{');
+
+        // Remove empty {} or {[]} tail
+        var trimmed = cleaned.replace(/\{\[\]\}$/, '');
+
+        // The match is like {label[value]}
+        var pattern = /\{(.*?)\[(.*?)\]\}/g;
+        var matches = Array.from(trimmed.matchAll(pattern));
+        return matches.map(function (match) {
+          return {
+            label: match[1],
+            value: match[2]
+          };
+        });
+      }
+
+      /**
+       * Parses a comma-separated string of `label[value]` pairs into an array of objects.
+       *
+       * Example:
+       *   Input: "Poor[c],Sub-option 4[c-2],Empty[]"
+       *   Output: [
+       *     { label: "Poor", value: "c" },
+       *     { label: "Sub-option 4", value: "c-2" },
+       *     { label: "Empty", value: "" }
+       *   ]
+       *
+       * @param {string} str - A string containing label-value pairs in the format `label[value]`, separated by commas.
+       * @returns {Array<{ label: string, value: string }>} - An array of parsed objects.
+       */
+      function _extractContentsOfMixedCharactersWithComma(str) {
+        return str.split(",").map(function (item) {
+          return item.trim();
+        }).map(function (item) {
+          var match = item.match(/^(.*?)\[(.*?)\]$/);
+          if (match) {
+            return {
+              label: match[1],
+              value: match[2]
+            };
+          }
+          return null;
+        }).filter(Boolean);
+      }
+
       /******/
       return __webpack_exports__;
       /******/

package/lib/cjs/MultipleSelect/index.js

@@ -2269,6 +2269,14 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           return (/* binding */_extractContentsOfBrackets
           );
         },
+        /* harmony export */"extractContentsOfMixedCharactersWithBraces": function extractContentsOfMixedCharactersWithBraces() {
+          return (/* binding */_extractContentsOfMixedCharactersWithBraces
+          );
+        },
+        /* harmony export */"extractContentsOfMixedCharactersWithComma": function extractContentsOfMixedCharactersWithComma() {
+          return (/* binding */_extractContentsOfMixedCharactersWithComma
+          );
+        },
         /* harmony export */"extractContentsOfParentheses": function extractContentsOfParentheses() {
           return (/* binding */_extractContentsOfParentheses
           );
@@ -2352,6 +2360,69 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         }
       }
 
+      /**
+       * Parses a braces-separated string of `{label[value]}` pairs into an array of objects.
+       *
+       * Example:
+       *   Input: "{Poor[c]}{Sub-option 4[c-2]}{Empty[]}"
+       *   Input: "{{Poor[c]}{Sub-option 4[c-2]}{Empty[]}[]}"
+       * 
+       *   Output: [
+       *     { label: "Poor", value: "c" },
+       *     { label: "Sub-option 4", value: "c-2" },
+       *     { label: "Empty", value: "" }
+       *   ]
+       *
+       * @param {string} str - The input string containing one or more `{label[value]}` segments.
+       * @returns {Array<{label: string, value: string}>} - An array of extracted label-value objects.
+       */
+      function _extractContentsOfMixedCharactersWithBraces(str) {
+        // Fix the extra '{' at the beginning
+        var cleaned = str.replace(/^{{/, '{');
+
+        // Remove empty {} or {[]} tail
+        var trimmed = cleaned.replace(/\{\[\]\}$/, '');
+
+        // The match is like {label[value]}
+        var pattern = /\{(.*?)\[(.*?)\]\}/g;
+        var matches = Array.from(trimmed.matchAll(pattern));
+        return matches.map(function (match) {
+          return {
+            label: match[1],
+            value: match[2]
+          };
+        });
+      }
+
+      /**
+       * Parses a comma-separated string of `label[value]` pairs into an array of objects.
+       *
+       * Example:
+       *   Input: "Poor[c],Sub-option 4[c-2],Empty[]"
+       *   Output: [
+       *     { label: "Poor", value: "c" },
+       *     { label: "Sub-option 4", value: "c-2" },
+       *     { label: "Empty", value: "" }
+       *   ]
+       *
+       * @param {string} str - A string containing label-value pairs in the format `label[value]`, separated by commas.
+       * @returns {Array<{ label: string, value: string }>} - An array of parsed objects.
+       */
+      function _extractContentsOfMixedCharactersWithComma(str) {
+        return str.split(",").map(function (item) {
+          return item.trim();
+        }).map(function (item) {
+          var match = item.match(/^(.*?)\[(.*?)\]$/);
+          if (match) {
+            return {
+              label: match[1],
+              value: match[2]
+            };
+          }
+          return null;
+        }).filter(Boolean);
+      }
+
       /******/
       return __webpack_exports__;
       /******/

package/lib/cjs/Table/index.js

@@ -2087,6 +2087,8 @@ function useTableSort(_ref, deps) {
     data = _ref.data,
     spyElement = _ref.spyElement,
     fieldType = _ref.fieldType,
+    _ref$isReverse = _ref.isReverse,
+    isReverse = _ref$isReverse === void 0 ? false : _ref$isReverse,
     onColSort = _ref.onColSort,
     onClick = _ref.onClick;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
@@ -2125,7 +2127,17 @@ function useTableSort(_ref, deps) {
         node.classList.add('newsort');
       });
       setInverse(!inverse);
-      return txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+
+      // result
+      if (filterType == 'text') {
+        return isReverse ? txt1.localeCompare(txt2, 'zh-CN', {
+          sensitivity: 'base'
+        }) : txt2.localeCompare(txt1, 'zh-CN', {
+          sensitivity: 'base'
+        });
+      } else {
+        return isReverse ? txt1 < txt2 ? -1 : txt1 > txt2 ? 1 : 0 : txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+      }
     };
     targetComparator.sort(sortBy);
 
@@ -2177,6 +2189,8 @@ var SortSprite = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_re
   var fieldType = props.fieldType,
     className = props.className,
     icon = props.icon,
+    _props$isReverse = props.isReverse,
+    isReverse = _props$isReverse === void 0 ? false : _props$isReverse,
     onClick = props.onClick;
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(TableContext),
     originData = _useContext.originData,
@@ -2191,6 +2205,7 @@ var SortSprite = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_re
       spyElement: rootRef.current,
       fieldType: fieldType,
       onColSort: onColSort,
+      isReverse: isReverse,
       onClick: onClick
     }, [rootRef]),
     handleSortList = _useTableSort.handleSortList;

package/lib/cjs/TagInput/index.js

@@ -462,6 +462,14 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           return (/* binding */_extractContentsOfBrackets
           );
         },
+        /* harmony export */"extractContentsOfMixedCharactersWithBraces": function extractContentsOfMixedCharactersWithBraces() {
+          return (/* binding */_extractContentsOfMixedCharactersWithBraces
+          );
+        },
+        /* harmony export */"extractContentsOfMixedCharactersWithComma": function extractContentsOfMixedCharactersWithComma() {
+          return (/* binding */_extractContentsOfMixedCharactersWithComma
+          );
+        },
         /* harmony export */"extractContentsOfParentheses": function extractContentsOfParentheses() {
           return (/* binding */_extractContentsOfParentheses
           );
@@ -545,6 +553,69 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         }
       }
 
+      /**
+       * Parses a braces-separated string of `{label[value]}` pairs into an array of objects.
+       *
+       * Example:
+       *   Input: "{Poor[c]}{Sub-option 4[c-2]}{Empty[]}"
+       *   Input: "{{Poor[c]}{Sub-option 4[c-2]}{Empty[]}[]}"
+       * 
+       *   Output: [
+       *     { label: "Poor", value: "c" },
+       *     { label: "Sub-option 4", value: "c-2" },
+       *     { label: "Empty", value: "" }
+       *   ]
+       *
+       * @param {string} str - The input string containing one or more `{label[value]}` segments.
+       * @returns {Array<{label: string, value: string}>} - An array of extracted label-value objects.
+       */
+      function _extractContentsOfMixedCharactersWithBraces(str) {
+        // Fix the extra '{' at the beginning
+        var cleaned = str.replace(/^{{/, '{');
+
+        // Remove empty {} or {[]} tail
+        var trimmed = cleaned.replace(/\{\[\]\}$/, '');
+
+        // The match is like {label[value]}
+        var pattern = /\{(.*?)\[(.*?)\]\}/g;
+        var matches = Array.from(trimmed.matchAll(pattern));
+        return matches.map(function (match) {
+          return {
+            label: match[1],
+            value: match[2]
+          };
+        });
+      }
+
+      /**
+       * Parses a comma-separated string of `label[value]` pairs into an array of objects.
+       *
+       * Example:
+       *   Input: "Poor[c],Sub-option 4[c-2],Empty[]"
+       *   Output: [
+       *     { label: "Poor", value: "c" },
+       *     { label: "Sub-option 4", value: "c-2" },
+       *     { label: "Empty", value: "" }
+       *   ]
+       *
+       * @param {string} str - A string containing label-value pairs in the format `label[value]`, separated by commas.
+       * @returns {Array<{ label: string, value: string }>} - An array of parsed objects.
+       */
+      function _extractContentsOfMixedCharactersWithComma(str) {
+        return str.split(",").map(function (item) {
+          return item.trim();
+        }).map(function (item) {
+          var match = item.match(/^(.*?)\[(.*?)\]$/);
+          if (match) {
+            return {
+              label: match[1],
+              value: match[2]
+            };
+          }
+          return null;
+        }).filter(Boolean);
+      }
+
       /******/
       return __webpack_exports__;
       /******/

package/lib/cjs/Utils/extract.d.ts

@@ -25,4 +25,42 @@ declare function extractContentsOfBraces(str: string, commaSeparated?: boolean):
  * @returns {Array<string>|string} such as: ['1,2','f','c']
  */
 declare function extractContentsOfParentheses(str: string, commaSeparated?: boolean): Array<string> | string;
-export { extractorExist, extractContentsOfBrackets, extractContentsOfBraces, extractContentsOfParentheses };
+/**
+ * Parses a braces-separated string of `{label[value]}` pairs into an array of objects.
+ *
+ * Example:
+ *   Input: "{Poor[c]}{Sub-option 4[c-2]}{Empty[]}"
+ *   Input: "{{Poor[c]}{Sub-option 4[c-2]}{Empty[]}[]}"
+ *
+ *   Output: [
+ *     { label: "Poor", value: "c" },
+ *     { label: "Sub-option 4", value: "c-2" },
+ *     { label: "Empty", value: "" }
+ *   ]
+ *
+ * @param {string} str - The input string containing one or more `{label[value]}` segments.
+ * @returns {Array<{label: string, value: string}>} - An array of extracted label-value objects.
+ */
+declare function extractContentsOfMixedCharactersWithBraces(str: string): {
+    label: string;
+    value: string | number;
+}[];
+/**
+ * Parses a comma-separated string of `label[value]` pairs into an array of objects.
+ *
+ * Example:
+ *   Input: "Poor[c],Sub-option 4[c-2],Empty[]"
+ *   Output: [
+ *     { label: "Poor", value: "c" },
+ *     { label: "Sub-option 4", value: "c-2" },
+ *     { label: "Empty", value: "" }
+ *   ]
+ *
+ * @param {string} str - A string containing label-value pairs in the format `label[value]`, separated by commas.
+ * @returns {Array<{ label: string, value: string }>} - An array of parsed objects.
+ */
+declare function extractContentsOfMixedCharactersWithComma(str: string): {
+    label: string;
+    value: string | number;
+}[];
+export { extractorExist, extractContentsOfBrackets, extractContentsOfBraces, extractContentsOfParentheses, extractContentsOfMixedCharactersWithBraces, extractContentsOfMixedCharactersWithComma };

package/lib/cjs/Utils/extract.js

@@ -48,6 +48,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "extractContentsOfBraces": () => (/* binding */ extractContentsOfBraces),
 /* harmony export */   "extractContentsOfBrackets": () => (/* binding */ extractContentsOfBrackets),
+/* harmony export */   "extractContentsOfMixedCharactersWithBraces": () => (/* binding */ extractContentsOfMixedCharactersWithBraces),
+/* harmony export */   "extractContentsOfMixedCharactersWithComma": () => (/* binding */ extractContentsOfMixedCharactersWithComma),
 /* harmony export */   "extractContentsOfParentheses": () => (/* binding */ extractContentsOfParentheses),
 /* harmony export */   "extractorExist": () => (/* binding */ extractorExist)
 /* harmony export */ });
@@ -124,6 +126,69 @@ function extractContentsOfParentheses(str) {
   }
 }
 
+/**
+ * Parses a braces-separated string of `{label[value]}` pairs into an array of objects.
+ *
+ * Example:
+ *   Input: "{Poor[c]}{Sub-option 4[c-2]}{Empty[]}"
+ *   Input: "{{Poor[c]}{Sub-option 4[c-2]}{Empty[]}[]}"
+ * 
+ *   Output: [
+ *     { label: "Poor", value: "c" },
+ *     { label: "Sub-option 4", value: "c-2" },
+ *     { label: "Empty", value: "" }
+ *   ]
+ *
+ * @param {string} str - The input string containing one or more `{label[value]}` segments.
+ * @returns {Array<{label: string, value: string}>} - An array of extracted label-value objects.
+ */
+function extractContentsOfMixedCharactersWithBraces(str) {
+  // Fix the extra '{' at the beginning
+  var cleaned = str.replace(/^{{/, '{');
+
+  // Remove empty {} or {[]} tail
+  var trimmed = cleaned.replace(/\{\[\]\}$/, '');
+
+  // The match is like {label[value]}
+  var pattern = /\{(.*?)\[(.*?)\]\}/g;
+  var matches = Array.from(trimmed.matchAll(pattern));
+  return matches.map(function (match) {
+    return {
+      label: match[1],
+      value: match[2]
+    };
+  });
+}
+
+/**
+ * Parses a comma-separated string of `label[value]` pairs into an array of objects.
+ *
+ * Example:
+ *   Input: "Poor[c],Sub-option 4[c-2],Empty[]"
+ *   Output: [
+ *     { label: "Poor", value: "c" },
+ *     { label: "Sub-option 4", value: "c-2" },
+ *     { label: "Empty", value: "" }
+ *   ]
+ *
+ * @param {string} str - A string containing label-value pairs in the format `label[value]`, separated by commas.
+ * @returns {Array<{ label: string, value: string }>} - An array of parsed objects.
+ */
+function extractContentsOfMixedCharactersWithComma(str) {
+  return str.split(",").map(function (item) {
+    return item.trim();
+  }).map(function (item) {
+    var match = item.match(/^(.*?)\[(.*?)\]$/);
+    if (match) {
+      return {
+        label: match[1],
+        value: match[2]
+      };
+    }
+    return null;
+  }).filter(Boolean);
+}
+
 /******/ 	return __webpack_exports__;
 /******/ })()
 ;

package/lib/cjs/Utils/useDragDropPosition.d.ts

@@ -3,9 +3,6 @@
  *
  * @usage:
 
-import { useState, useCallback } from 'react';
-import { useDragDropPosition } from '@/utils/hooks/useDragDropPosition';
-
 const App = () => {
 
     const [show, setShow] = useState<boolean>(false);

package/lib/cjs/Utils/useDragDropPosition.js

@@ -101,9 +101,6 @@ __webpack_require__.r(__webpack_exports__);
  * 
  * @usage:
 
-import { useState, useCallback } from 'react';
-import { useDragDropPosition } from '@/utils/hooks/useDragDropPosition';
-
 const App = () => {
 
     const [show, setShow] = useState<boolean>(false);