@pisell/materials 1.0.509 → 1.0.511

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

@@ -1,4 +1,4 @@
-var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className"];
+var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish"];
 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 _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; }
@@ -25,6 +25,7 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     children = props.children,
     currentValue = props.currentValue,
     className = props.className,
+    onDataSourceFinish = props.onDataSourceFinish,
     others = _objectWithoutProperties(props, _excluded);
   var formRef = useRef(null);
   var _useDataSource = useDataSource(),
@@ -51,7 +52,8 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     renderMode: renderMode,
     groupInfoPosition: groupInfoPosition,
     currentValue: currentValue,
-    size: others.size
+    size: others.size,
+    onDataSourceFinish: onDataSourceFinish
   }, /*#__PURE__*/React.createElement(Form, _extends({}, others, {
     className: classNames('pisell-lowcode-data-source-form', className),
     ref: formRef,

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingContext.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { ModeType } from '../../type';
 export interface FormSettingContextType {
+    onDataSourceFinish?: (values: any, result: any) => void;
     renderMode?: ModeType;
     groupInfoPosition?: 'top' | 'side';
     children?: React.ReactNode;

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

@@ -10,15 +10,17 @@ var FormSettingProvider = function FormSettingProvider(props) {
     renderMode = props.renderMode,
     groupInfoPosition = props.groupInfoPosition,
     currentValue = props.currentValue,
-    size = props.size;
+    size = props.size,
+    onDataSourceFinish = props.onDataSourceFinish;
   var value = React.useMemo(function () {
     return {
       renderMode: renderMode,
       groupInfoPosition: groupInfoPosition,
       currentValue: currentValue,
-      size: size
+      size: size,
+      onDataSourceFinish: onDataSourceFinish
     };
-  }, [renderMode, groupInfoPosition, currentValue, size]);
+  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish]);
   return /*#__PURE__*/React.createElement(FormSettingContext.Provider, {
     value: value
   }, children);

package/es/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -39,7 +39,8 @@ var SubmitButton = function SubmitButton(props) {
     contextHolder = _notification$useNoti2[1];
   var form = Form.useFormInstance();
   var _useFormSetting = useFormSetting(),
-    renderMode = _useFormSetting.renderMode;
+    renderMode = _useFormSetting.renderMode,
+    onDataSourceFinish = _useFormSetting.onDataSourceFinish;
   var _useCtxActions = useCtxActions(),
     setVisible = _useCtxActions.setVisible,
     refreshTableData = _useCtxActions.refreshTableData;
@@ -56,33 +57,33 @@ var SubmitButton = function SubmitButton(props) {
             setLoading(true);
             _context.prev = 1;
             if (!(renderMode === 'edit')) {
-              _context.next = 7;
+              _context.next = 8;
               break;
             }
             _context.next = 5;
             return update.runAsync(values);
           case 5:
-            _context.next = 12;
-            break;
-          case 7:
+            return _context.abrupt("return", _context.sent);
+          case 8:
             if (!(renderMode === 'add')) {
-              _context.next = 12;
+              _context.next = 14;
               break;
             }
-            _context.next = 10;
+            _context.next = 11;
             return create.runAsync(values);
-          case 10:
+          case 11:
             res = _context.sent;
             form === null || form === void 0 ? void 0 : form.resetFields();
-          case 12:
-            _context.prev = 12;
+            return _context.abrupt("return", res);
+          case 14:
+            _context.prev = 14;
             setLoading(false);
-            return _context.finish(12);
-          case 15:
+            return _context.finish(14);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 12, 15]]);
+      }, _callee, null, [[1,, 14, 17]]);
     }));
     return function onSubmit(_x2) {
       return _ref.apply(this, arguments);
@@ -116,7 +117,7 @@ var SubmitButton = function SubmitButton(props) {
   // 验证表单并提交
   var handleValideFieldsSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
-      var allValues, afterSubmitFunc;
+      var allValues, result, afterSubmitFunc;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -137,6 +138,11 @@ var SubmitButton = function SubmitButton(props) {
             _context2.next = 8;
             return onSubmit(values);
           case 8:
+            result = _context2.sent;
+            // 数据源提交成功
+            if (onDataSourceFinish) {
+              onDataSourceFinish(values, result);
+            }
             if (refreshData) {
               refreshTableData === null || refreshTableData === void 0 ? void 0 : refreshTableData();
             }
@@ -151,19 +157,19 @@ var SubmitButton = function SubmitButton(props) {
                 afterSubmitFunc();
               }
             }
-            _context2.next = 16;
+            _context2.next = 18;
             break;
-          case 13:
-            _context2.prev = 13;
+          case 15:
+            _context2.prev = 15;
             _context2.t0 = _context2["catch"](0);
             PisellToast({
               content: "".concat(_context2.t0.message)
             });
-          case 16:
+          case 18:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 13]]);
+      }, _callee2, null, [[0, 15]]);
     }));
     return function handleValideFieldsSubmit(_x3) {
       return _ref2.apply(this, arguments);
@@ -216,7 +222,8 @@ var SubmitButton = function SubmitButton(props) {
     size: "large",
     loading: loading,
     onClick: onSubmitClick,
-    disabled: isDisabled
+    disabled: isDisabled,
+    htmlType: "submit"
   }, childrenString), contextHolder));
 };
 export default SubmitButton;

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

@@ -14,5 +14,6 @@ export interface DataSourceFormProps {
     children: React.ReactNode;
     className?: string;
     size?: 'small' | 'middle' | 'large';
+    onDataSourceFinish?: (values: any, result: any) => void;
     __designMode?: string;
 }

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

@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/fields/Input.Phone/WithMode.js

@@ -109,15 +109,17 @@ var PhoneInput = function PhoneInput(_ref) {
     },
     onBlur: handleBlur,
     popupMatchSelectWidth: false,
-    optionLabelProp: "label",
-    showSearch: true
-  }, countries.map(function (country) {
-    return /*#__PURE__*/React.createElement(Option, {
-      key: country.code,
-      value: country.code,
-      label: country.prefix
-    }, translationOriginal(country.name), " (", country.prefix, ")");
-  })), /*#__PURE__*/React.createElement(Input, _extends({}, props, {
+    optionLabelProp: "inputValue",
+    optionFilterProp: "label",
+    showSearch: true,
+    options: countries.map(function (country) {
+      return {
+        value: country.code,
+        label: "".concat(translationOriginal(country.name), " (").concat(country.prefix, ")"),
+        inputValue: country.prefix
+      };
+    })
+  }), /*#__PURE__*/React.createElement(Input, _extends({}, props, {
     status: status,
     type: "tel",
     value: phoneNumber,

package/es/components/pisellViewGrid/index.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from 'react';
-import { Loading } from '@alifd/next';
+import Loading from "../pisellLoading";
 import classNames from 'classnames';
 import "./index.less";
 var PisellViewGrid = function PisellViewGrid(_ref) {
@@ -58,8 +58,8 @@ var PisellViewGrid = function PisellViewGrid(_ref) {
     });
   };
   return /*#__PURE__*/React.createElement(Loading, {
-    visible: loading,
-    fullScreen: false,
+    loading: loading,
+    fullscreen: false,
     style: {
       width: '100%'
     }

package/es/components/select/index.js

@@ -41,7 +41,7 @@ var SelectBase = /*#__PURE__*/forwardRef(function (props, ref) {
     setSearchValue = _useState2[1];
   var filteredOptions = useMemo(function () {
     if (!searchValue) return options;
-    return options.filter(function (option) {
+    return (options || []).filter(function (option) {
       var _option$optionFilterP;
       var optionValue = ((_option$optionFilterP = option[optionFilterProp]) === null || _option$optionFilterP === void 0 ? void 0 : _option$optionFilterP.toString().toLowerCase()) || '';
       return optionValue.includes(searchValue.toLowerCase());

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

@@ -52,6 +52,7 @@ var BaseForm = (0, import_react.forwardRef)(
       children,
       currentValue,
       className,
+      onDataSourceFinish,
       ...others
     } = props;
     const formRef = (0, import_react.useRef)(null);
@@ -78,7 +79,8 @@ var BaseForm = (0, import_react.forwardRef)(
         renderMode,
         groupInfoPosition,
         currentValue,
-        size: others.size
+        size: others.size,
+        onDataSourceFinish
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_form.default,

package/lib/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingContext.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { ModeType } from '../../type';
 export interface FormSettingContextType {
+    onDataSourceFinish?: (values: any, result: any) => void;
     renderMode?: ModeType;
     groupInfoPosition?: 'top' | 'side';
     children?: React.ReactNode;

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

@@ -35,15 +35,16 @@ module.exports = __toCommonJS(FormSettingProvider_exports);
 var import_react = __toESM(require("react"));
 var import_FormSettingContext = __toESM(require("./FormSettingContext"));
 var FormSettingProvider = (props) => {
-  const { children, renderMode, groupInfoPosition, currentValue, size } = props;
+  const { children, renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish } = props;
   const value = import_react.default.useMemo(() => {
     return {
       renderMode,
       groupInfoPosition,
       currentValue,
-      size
+      size,
+      onDataSourceFinish
     };
-  }, [renderMode, groupInfoPosition, currentValue, size]);
+  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_FormSettingContext.default.Provider,
     {

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -57,7 +57,7 @@ var SubmitButton = (props) => {
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [api, contextHolder] = import_antd.notification.useNotification();
   const form = import_antd.Form.useFormInstance();
-  const { renderMode } = (0, import_useFormSetting.default)();
+  const { renderMode, onDataSourceFinish } = (0, import_useFormSetting.default)();
   const { setVisible, refreshTableData } = (0, import_useCtxActions.default)();
   const { create, update } = (0, import_useDataSource.default)();
   const isDisabled = status === "disabled";
@@ -65,10 +65,11 @@ var SubmitButton = (props) => {
     setLoading(true);
     try {
       if (renderMode === "edit") {
-        await update.runAsync(values);
+        return await update.runAsync(values);
       } else if (renderMode === "add") {
         const res = await create.runAsync(values);
         form == null ? void 0 : form.resetFields();
+        return res;
       }
     } finally {
       setLoading(false);
@@ -110,7 +111,10 @@ var SubmitButton = (props) => {
           content: toastConfig.title
         });
       }
-      await onSubmit(values);
+      const result = await onSubmit(values);
+      if (onDataSourceFinish) {
+        onDataSourceFinish(values, result);
+      }
       if (refreshData) {
         refreshTableData == null ? void 0 : refreshTableData();
       }
@@ -156,7 +160,8 @@ var SubmitButton = (props) => {
       size: "large",
       loading,
       onClick: onSubmitClick,
-      disabled: isDisabled
+      disabled: isDisabled,
+      htmlType: "submit"
     },
     childrenString
   ), contextHolder));

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

@@ -14,5 +14,6 @@ export interface DataSourceFormProps {
     children: React.ReactNode;
     className?: string;
     size?: 'small' | 'middle' | 'large';
+    onDataSourceFinish?: (values: any, result: any) => void;
     __designMode?: string;
 }

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

@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/lib/components/dataSourceComponents/fields/Input.Phone/WithMode.js

@@ -111,21 +111,15 @@ var PhoneInput = ({ value: propsValue, onChange, isVerification, ...props }) =>
       style: { width: "90px" },
       onBlur: handleBlur,
       popupMatchSelectWidth: false,
-      optionLabelProp: "label",
-      showSearch: true
-    },
-    countries.map((country) => /* @__PURE__ */ import_react.default.createElement(
-      Option,
-      {
-        key: country.code,
+      optionLabelProp: "inputValue",
+      optionFilterProp: "label",
+      showSearch: true,
+      options: countries.map((country) => ({
         value: country.code,
-        label: country.prefix
-      },
-      translationOriginal(country.name),
-      " (",
-      country.prefix,
-      ")"
-    ))
+        label: `${translationOriginal(country.name)} (${country.prefix})`,
+        inputValue: country.prefix
+      }))
+    }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Input,
     {

package/lib/components/pisellViewGrid/index.js

@@ -33,7 +33,7 @@ __export(pisellViewGrid_exports, {
 });
 module.exports = __toCommonJS(pisellViewGrid_exports);
 var import_react = __toESM(require("react"));
-var import_next = require("@alifd/next");
+var import_pisellLoading = __toESM(require("../pisellLoading"));
 var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var PisellViewGrid = ({
@@ -87,7 +87,7 @@ var PisellViewGrid = ({
       (dataSource == null ? void 0 : dataSource.length) ? renderItem == null ? void 0 : renderItem(item, index) : index
     ));
   };
-  return /* @__PURE__ */ import_react.default.createElement(import_next.Loading, { visible: loading, fullScreen: false, style: { width: "100%" } }, /* @__PURE__ */ import_react.default.createElement("div", { className: classes, style }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_pisellLoading.default, { loading, fullscreen: false, style: { width: "100%" } }, /* @__PURE__ */ import_react.default.createElement("div", { className: classes, style }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-view-grid-content",

package/lib/components/select/index.js

@@ -63,7 +63,7 @@ var SelectBase = (0, import_react.forwardRef)((props, ref) => {
   const filteredOptions = (0, import_react.useMemo)(() => {
     if (!searchValue)
       return options;
-    return options.filter(
+    return (options || []).filter(
       (option) => {
         var _a;
         const optionValue = ((_a = option[optionFilterProp]) == null ? void 0 : _a.toString().toLowerCase()) || "";

package/lowcode/data-source-form/meta.ts

@@ -704,6 +704,13 @@ const dataSourceForm: MetaType = {
           tip: '字段值更新时触发回调事件',
         },
       },
+      {
+        name: 'onDataSourceFinish',
+        title: {
+          label: '数据源提交成功',
+          tip: '数据源提交成功',
+        },
+      },
     ],
     component: { isContainer: true },
     supports: {
@@ -729,6 +736,11 @@ const dataSourceForm: MetaType = {
           template:
             "onValuesChange(changedValues,allValues,${extParams}){\n// 字段值更新时触发回调事件\nconsole.log('onValuesChange',changedValues,allValues);}",
         },
+        {
+          name: 'onDataSourceFinish',
+          template:
+            "onDataSourceFinish(values,result,${extParams}){\n// 数据源提交成功\nconsole.log('onDataSourceFinish',values,result);}",
+        },
       ],
     },
     advanced: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.509",
+  "version": "1.0.511",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -68,9 +68,9 @@
     "styled-components": "^6.0.0-rc.3",
     "libphonenumber-js": "^1.11.17",
     "swiper": "^8.4.7",
-    "@pisell/icon": "0.0.10",
     "@pisell/utils": "1.0.43",
-    "@pisell/date-picker": "1.0.114"
+    "@pisell/date-picker": "1.0.114",
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",