@pisell/materials 1.0.355 → 1.0.357

package/es/components/date-picker/datePickerCpt.js

@@ -1,9 +1,13 @@
+var _excluded = ["mode", "onChange", "value", "format", "defaultValue"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import dayjs from 'dayjs';
 import { Button, ConfigProvider, DatePicker, Drawer, Input, Modal } from 'antd';
@@ -26,7 +30,9 @@ var DatePickerCpt = function DatePickerCpt(props) {
   var mode = props.mode,
     onChange = props.onChange,
     value = props.value,
-    propsFormat = props.format;
+    propsFormat = props.format,
+    defaultValue = props.defaultValue,
+    others = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(ConfigProvider.ConfigContext),
     locale = _useContext.locale;
   var _useState = useState(''),
@@ -54,6 +60,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
     error = _useState12[0],
     setError = _useState12[1];
   var ref = useRef(null);
+  var canClose = useRef(true);
 
   // const isDesktop = useMediaQuery('@media (pointer: fine)');
 
@@ -146,6 +153,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
     handleOpenChange(false);
   };
   var handleChange = function handleChange(val, valStr) {
+    canClose.current = true;
     setError(false);
     setCurrentShortcut('');
     setValue(val);
@@ -167,14 +175,15 @@ var DatePickerCpt = function DatePickerCpt(props) {
     }
   };
   if (!mode || mode === 'date') {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DatePicker, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DatePicker, _extends({}, others, {
       ref: ref,
+      defaultValue: defaultValue,
       showNow: false,
       onChange: handleChange,
       open: popupOpen,
       value: _value,
       onOpenChange: function onOpenChange(o) {
-        if (!o) {
+        if (!o && !canClose.current) {
           return;
         }
         handleOpenChange(o);
@@ -191,6 +200,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
         }, /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode-date-picker-custom-action",
           onMouseDown: function onMouseDown(e) {
+            canClose.current = false;
             e.stopPropagation();
           }
         }, /*#__PURE__*/React.createElement("div", {
@@ -273,7 +283,7 @@ var DatePickerCpt = function DatePickerCpt(props) {
           className: "pisell-lowcode-picker-panel-container pisell-lowcode-picker-date-panel-container"
         }, dom)));
       }
-    }));
+    })));
   }
   return /*#__PURE__*/React.createElement(DatePicker, props);
 };

package/es/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/date-picker/datePickerCpt.js

@@ -51,7 +51,7 @@ var isValidDate = (dateString, format) => {
   pc: 1080
 });
 var DatePickerCpt = (props) => {
-  const { mode, onChange, value, format: propsFormat } = props;
+  const { mode, onChange, value, format: propsFormat, defaultValue, ...others } = props;
   const { locale } = (0, import_react.useContext)(import_antd.ConfigProvider.ConfigContext);
   const [currentShortcut, setCurrentShortcut] = (0, import_react.useState)("");
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -60,6 +60,7 @@ var DatePickerCpt = (props) => {
   const [valueStr, setValueStr] = (0, import_react.useState)("");
   const [error, setError] = (0, import_react.useState)(false);
   const ref = (0, import_react.useRef)(null);
+  const canClose = (0, import_react.useRef)(true);
   const responsive = (0, import_useResponsive.default)();
   const isDesktop = !("ontouchstart" in window || navigator.maxTouchPoints);
   (0, import_react.useEffect)(() => {
@@ -159,6 +160,7 @@ var DatePickerCpt = (props) => {
     handleOpenChange(false);
   };
   const handleChange = (val, valStr) => {
+    canClose.current = true;
     setError(false);
     setCurrentShortcut("");
     setValue(val);
@@ -184,13 +186,15 @@ var DatePickerCpt = (props) => {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.DatePicker,
       {
+        ...others,
         ref,
+        defaultValue,
         showNow: false,
         onChange: handleChange,
         open: popupOpen,
         value: _value,
         onOpenChange: (o) => {
-          if (!o) {
+          if (!o && !canClose.current) {
             return;
           }
           handleOpenChange(o);
@@ -205,6 +209,7 @@ var DatePickerCpt = (props) => {
             {
               className: "pisell-lowcode-date-picker-custom-action",
               onMouseDown: (e) => {
+                canClose.current = false;
                 e.stopPropagation();
               }
             },

package/lib/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.355",
+  "version": "1.0.357",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@pisell/utils": "1.0.27",
-    "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.88"
+    "@pisell/date-picker": "1.0.88",
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",