diginet-core-ui 1.3.75-beta.3 → 1.3.75-beta.4

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

@@ -536,10 +536,7 @@ const DatePicker = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     required: required,
     ...labelProps
   }, label), jsx(Tooltip, {
-    title: (ipRef === null || ipRef === void 0 ? void 0 : (_ipRef$current = ipRef.current) === null || _ipRef$current === void 0 ? void 0 : _ipRef$current.clientWidth) < 200 ? ipRef === null || ipRef === void 0 ? void 0 : (_ipRef$current2 = ipRef.current) === null || _ipRef$current2 === void 0 ? void 0 : _ipRef$current2.value : '',
-    style: {
-      width: 'none'
-    }
+    title: (ipRef === null || ipRef === void 0 ? void 0 : (_ipRef$current = ipRef.current) === null || _ipRef$current === void 0 ? void 0 : _ipRef$current.clientWidth) < 200 ? ipRef === null || ipRef === void 0 ? void 0 : (_ipRef$current2 = ipRef.current) === null || _ipRef$current2 === void 0 ? void 0 : _ipRef$current2.value : ''
   }, jsx(InputBase, {
     inputProps: {
       placeholder: !readOnly && !disabled ? placeholder : '',

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

@@ -57,6 +57,13 @@ const checkHasValue = value => {
   return Array.isArray(value) ? value.length > 0 : value === 0 || !!value;
 };
 
+const convertData = (dt, valueExpr) => {
+  let data = dt || [];
+  let valueTemp = Array.isArray(data) ? data : [data];
+  valueTemp = valueTemp.map(i => i[valueExpr] || i);
+  return valueTemp;
+};
+
 const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   viewType,
   itemMode,
@@ -130,10 +137,10 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
   const [openState, setOpenState] = useState(false);
   const [showClear, setShowClear] = useState(false);
   const [textValue, setTextValue] = useState('');
-  let valueTemp = valueProp || defaultValue || [];
+  let valueTemp = valueProp || defaultValue; // only mode multi
 
-  if (multiple && valueTemp && !Array.isArray(valueTemp)) {
-    valueTemp = [valueTemp];
+  if (multiple) {
+    valueTemp = convertData(valueTemp, valueExpr);
   }
 
   const [valueMulti, setValueMulti] = useState(valueTemp);
@@ -1212,7 +1219,7 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
     }
 
     if (multiple && valueProp) {
-      setValueMulti(!Array.isArray(valueProp) ? [valueProp] : valueProp);
+      setValueMulti(convertData(valueProp, valueExpr));
     } // Close dropdown treeview by children when select item
 
 
@@ -1370,10 +1377,18 @@ const Dropdown = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       let text = '';
 
       if (data) {
-        var _displayExpr4;
+        var _mask;
+
+        displayExpr = typeof renderSelectedItem === 'string' ? renderSelectedItem : displayExpr || valueExpr;
+        let mask = data === null || data === void 0 ? void 0 : data[displayExpr]; // convert {id} - {name} to {<data[id]>} - {<data[name]>}
+
+        if (!mask && regexBetween.test(displayExpr)) {
+          var _displayExpr4;
+
+          mask = (_displayExpr4 = displayExpr) === null || _displayExpr4 === void 0 ? void 0 : _displayExpr4.replace(regexBetween, _ => data[_]);
+        }
 
-        const mask = (data === null || data === void 0 ? void 0 : data[displayExpr]) || ((_displayExpr4 = displayExpr) === null || _displayExpr4 === void 0 ? void 0 : _displayExpr4.replace(regexBetween, _ => data[_]));
-        text = mask === null || mask === void 0 ? void 0 : mask.replace(regexInclude, '');
+        text = (_mask = mask) === null || _mask === void 0 ? void 0 : _mask.replace(regexInclude, '');
       }
 
       let item = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.3.75-beta.3",
+  "version": "1.3.75-beta.4",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",