@pisell/materials 1.0.621 → 1.0.622

package/es/components/Pagination/index.d.ts

@@ -5,7 +5,7 @@ export declare const paginationConfig: {
     className: string;
     defaultCurrent: number;
     showTotal: (total: number, range: [number, number]) => string;
-    itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
+    itemRender: (page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
     responsive: boolean;
     size: string;
 };

package/es/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -67,7 +67,7 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
         (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFields(transformFormObjToArrayWithUntouched(formattedValues));
       });
     }
-  }, [renderMode, dataSource, formatInitialValues]);
+  }, [renderMode, dataSource]);
 
   // 检查表单是否可以关闭
   var checkFormClose = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingProvider.js

@@ -26,7 +26,7 @@ var FormSettingProvider = function FormSettingProvider(props) {
       formatInitialValues: formatInitialValues,
       customSubmit: customSubmit
     };
-  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish, formatSubmitValues, formatInitialValues, customSubmit]);
+  }, [renderMode, groupInfoPosition, currentValue, size]);
   return /*#__PURE__*/React.createElement(FormSettingContext.Provider, {
     value: value
   }, children);

package/es/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -34,9 +34,9 @@ export declare const isValidDomain: (value: string) => boolean;
  * @Date: 2024-11-23 17:14:25
  */
 export declare const withFormItem: <P extends object>(WrappedComponent: React.ComponentType<P>, overlayProps?: {
-    otherFormItemProps?: Record<string, any>;
-    innerProps?: Record<string, any>;
-}) => React.FC<P & WithFormItemProps>;
+    otherFormItemProps?: Record<string, any> | ((props: Record<string, any>) => Record<string, any>) | undefined;
+    innerProps?: Record<string, any> | undefined;
+} | undefined) => React.FC<P & WithFormItemProps>;
 export declare const withDataSource: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     dataSource?: any;
 }) => React.JSX.Element;

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -17,7 +17,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 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, { useEffect, useMemo } from 'react';
-import { isArr, isNumber, isString } from '@pisell/utils';
+import { isArr, isFunction, isNumber, isString } from '@pisell/utils';
 import classNames from 'classnames';
 import { parsePhoneNumberFromString } from 'libphonenumber-js';
 import { getText } from "../../../locales";
@@ -322,6 +322,12 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
       }
       return propsLabelCol;
     }, [hideLabel, propsLabelCol]);
+    var otherFormItemProps = useMemo(function () {
+      if (isFunction(overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps)) {
+        return overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps(otherProps);
+      }
+      return (overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps) || {};
+    }, [overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /*#__PURE__*/React.createElement(Form.Item, _extends({
       required: required,
       style: _objectSpread(_objectSpread({
@@ -344,7 +350,7 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
       className: classNames('pisell-data-source-form-item', {
         'pisell-data-source-form-item-view': effectiveMode === 'view'
       })
-    }, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps), renderComponent);
+    }, otherFormItemProps), renderComponent);
   };
 };
 export var withDataSource = function withDataSource(WrappedComponent) {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/es/components/dataSourceComponents/fields/DatePicker/index.js

@@ -1,10 +1,23 @@
 import { withFormItem } from "../../dataSourceForm/utils";
 import DatePickerWithMode from "./WithMode";
+import dayjs from 'dayjs';
 var DatePicker = withFormItem(DatePickerWithMode, {
   innerProps: {
     style: {
       width: '100%'
     }
+  },
+  otherFormItemProps: function otherFormItemProps(props) {
+    return {
+      normalize: function normalize(value) {
+        return value && dayjs(value).format(props.submitFormat || "YYYY-MM-DD");
+      },
+      getValueProps: function getValueProps(value) {
+        return {
+          value: value && dayjs(value)
+        };
+      }
+    };
   }
 });
 export default DatePicker;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -59,7 +59,7 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<any> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;

package/es/components/pisellAppCard/PisellAppCard.js

@@ -14,7 +14,8 @@ var PisellAppCard = function PisellAppCard(_ref) {
     title = _ref.title,
     description = _ref.description,
     bottomButtons = _ref.bottomButtons,
-    moreActions = _ref.moreActions;
+    moreActions = _ref.moreActions,
+    icon = _ref.icon;
   return /*#__PURE__*/React.createElement(PisellCard, {
     className: classNames('pisell-lowcode-app-card', className),
     style: style
@@ -22,14 +23,18 @@ var PisellAppCard = function PisellAppCard(_ref) {
     className: "pisell-lowcode-app-card-header"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-app-card-header-left"
-  }, avatar && /*#__PURE__*/React.createElement(PisellAvatar, {
+  }, (avatar || icon) && /*#__PURE__*/React.createElement(PisellAvatar, {
+    icon: icon && /*#__PURE__*/React.createElement(Icon, {
+      type: icon
+    }),
     src: avatar,
     alt: title,
     size: "xl",
     shape: "square",
     style: {
       border: 'none'
-    }
+    },
+    borderRadius: 10
   })), /*#__PURE__*/React.createElement("div", null, moreActions && moreActions.length > 0 && /*#__PURE__*/React.createElement(Dropdown, {
     menu: {
       items: moreActions.map(function (action, index) {

package/es/components/pisellAppCard/PisellAppCard.less

@@ -1,6 +1,7 @@
 .pisell-lowcode-app-card {
   background: #fff;
   border: 1px solid #f0f0f0;
+  cursor: auto;
 
   .pisell-lowcode-card-body {
     display: flex;
@@ -18,6 +19,11 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    .pisell-lowcode-app-card-header-left {
+      .anticon {
+        font-size: 32px !important;
+      }
+    }
   }
 
   .pisell-lowcode-app-card-content {

package/es/components/pisellAppCard/types.d.ts

@@ -6,6 +6,8 @@ export interface PisellAppCardProps {
     style?: CSSProperties;
     /** 头像地址 */
     avatar?: string;
+    /** icon */
+    icon?: string;
     /** 标签列表 */
     tags?: Array<{
         label: string;

package/lib/components/Pagination/index.d.ts

@@ -5,7 +5,7 @@ export declare const paginationConfig: {
     className: string;
     defaultCurrent: number;
     showTotal: (total: number, range: [number, number]) => string;
-    itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
+    itemRender: (page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
     responsive: boolean;
     size: string;
 };

package/lib/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -87,7 +87,7 @@ var BaseForm = (0, import_react.forwardRef)(
           (_a2 = formRef.current) == null ? void 0 : _a2.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(formattedValues));
         });
       }
-    }, [renderMode, dataSource, formatInitialValues]);
+    }, [renderMode, dataSource]);
     const checkFormClose = (0, import_ahooks.useMemoizedFn)(async () => {
       var _a2;
       const isFormChanged = (_a2 = formRef.current) == null ? void 0 : _a2.isFieldsTouched();

package/lib/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingProvider.js

@@ -57,7 +57,7 @@ var FormSettingProvider = (props) => {
       formatInitialValues,
       customSubmit
     };
-  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish, formatSubmitValues, formatInitialValues, customSubmit]);
+  }, [renderMode, groupInfoPosition, currentValue, size]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_FormSettingContext.default.Provider,
     {

package/lib/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -34,9 +34,9 @@ export declare const isValidDomain: (value: string) => boolean;
  * @Date: 2024-11-23 17:14:25
  */
 export declare const withFormItem: <P extends object>(WrappedComponent: React.ComponentType<P>, overlayProps?: {
-    otherFormItemProps?: Record<string, any>;
-    innerProps?: Record<string, any>;
-}) => React.FC<P & WithFormItemProps>;
+    otherFormItemProps?: Record<string, any> | ((props: Record<string, any>) => Record<string, any>) | undefined;
+    innerProps?: Record<string, any> | undefined;
+} | undefined) => React.FC<P & WithFormItemProps>;
 export declare const withDataSource: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     dataSource?: any;
 }) => React.JSX.Element;

package/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -364,6 +364,12 @@ var withFormItem = (WrappedComponent, overlayProps) => {
       }
       return propsLabelCol;
     }, [hideLabel, propsLabelCol]);
+    const otherFormItemProps = (0, import_react.useMemo)(() => {
+      if ((0, import_utils.isFunction)(overlayProps == null ? void 0 : overlayProps.otherFormItemProps)) {
+        return overlayProps == null ? void 0 : overlayProps.otherFormItemProps(otherProps);
+      }
+      return (overlayProps == null ? void 0 : overlayProps.otherFormItemProps) || {};
+    }, [overlayProps == null ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /* @__PURE__ */ import_react.default.createElement(
       import_form.default.Item,
       {
@@ -388,7 +394,7 @@ var withFormItem = (WrappedComponent, overlayProps) => {
         className: (0, import_classnames.default)("pisell-data-source-form-item", {
           "pisell-data-source-form-item-view": effectiveMode === "view"
         }),
-        ...overlayProps == null ? void 0 : overlayProps.otherFormItemProps
+        ...otherFormItemProps
       },
       renderComponent
     );

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/lib/components/dataSourceComponents/fields/DatePicker/index.js

@@ -34,11 +34,20 @@ __export(DatePicker_exports, {
 module.exports = __toCommonJS(DatePicker_exports);
 var import_utils = require("../../dataSourceForm/utils");
 var import_WithMode = __toESM(require("./WithMode"));
+var import_dayjs = __toESM(require("dayjs"));
 var DatePicker = (0, import_utils.withFormItem)(import_WithMode.default, {
   innerProps: {
     style: {
       width: "100%"
     }
+  },
+  otherFormItemProps: (props) => {
+    return {
+      normalize: (value) => value && (0, import_dayjs.default)(value).format(props.submitFormat || "YYYY-MM-DD"),
+      getValueProps: (value) => ({
+        value: value && (0, import_dayjs.default)(value)
+      })
+    };
   }
 });
 var DatePicker_default = DatePicker;

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -59,7 +59,7 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<any> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;

package/lib/components/pisellAppCard/PisellAppCard.js

@@ -48,7 +48,8 @@ var PisellAppCard = ({
   title,
   description,
   bottomButtons,
-  moreActions
+  moreActions,
+  icon
 }) => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_pisellCard.default,
@@ -56,14 +57,16 @@ var PisellAppCard = ({
       className: (0, import_classnames.default)("pisell-lowcode-app-card", className),
       style
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-app-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-app-card-header-left" }, avatar && /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-app-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-app-card-header-left" }, (avatar || icon) && /* @__PURE__ */ import_react.default.createElement(
       import_pisellAvatar.default,
       {
+        icon: icon && /* @__PURE__ */ import_react.default.createElement(import_icon.default, { type: icon }),
         src: avatar,
         alt: title,
         size: "xl",
         shape: "square",
-        style: { border: "none" }
+        style: { border: "none" },
+        borderRadius: 10
       }
     )), /* @__PURE__ */ import_react.default.createElement("div", null, moreActions && moreActions.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,

package/lib/components/pisellAppCard/PisellAppCard.less

@@ -1,6 +1,7 @@
 .pisell-lowcode-app-card {
   background: #fff;
   border: 1px solid #f0f0f0;
+  cursor: auto;
 
   .pisell-lowcode-card-body {
     display: flex;
@@ -18,6 +19,11 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    .pisell-lowcode-app-card-header-left {
+      .anticon {
+        font-size: 32px !important;
+      }
+    }
   }
 
   .pisell-lowcode-app-card-content {

package/lib/components/pisellAppCard/types.d.ts

@@ -6,6 +6,8 @@ export interface PisellAppCardProps {
     style?: CSSProperties;
     /** 头像地址 */
     avatar?: string;
+    /** icon */
+    icon?: string;
     /** 标签列表 */
     tags?: Array<{
         label: string;

package/lowcode/form-item-date-picker/meta.ts

@@ -161,6 +161,19 @@ export default {
         },
         defaultValue: 'HH:mm',
       },
+      {
+        name: "submitFormat",
+        title: {
+          label: {
+            type: 'i18n',
+            'en-US': 'Submit Format',
+            'zh-CN': '提交格式',
+          },
+        },
+        propType: 'string',
+        setter: 'StringSetter',
+        defaultValue: 'YYYY-MM-DD HH:mm:ss',
+      },
     ]),
     getFormItemValidateGroup([generalItemMap['requiredobj']]),
   ],

package/lowcode/pisell-app-card/meta.ts

@@ -2,6 +2,7 @@ import {
   IPublicTypeComponentMetadata,
   IPublicTypeSnippet,
 } from '@alilc/lowcode-types';
+import { AntdIconSetter } from "../_setters";
 
 const PisellAppCardMeta: IPublicTypeComponentMetadata = {
   componentName: 'PisellAppCard',
@@ -24,6 +25,11 @@ const PisellAppCardMeta: IPublicTypeComponentMetadata = {
         title: '头像',
         setter: 'StringSetter',
       },
+      {
+        name: "icon",
+        title: '图标',
+        setter: AntdIconSetter,
+      },
       {
         name: 'tags',
         title: '标签',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.621",
+  "version": "1.0.622",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",