@vtx/components 4.0.0-beta.56 → 4.0.0-beta.58

package/es/vtx-export/index.js

@@ -107,6 +107,7 @@ var VtxExport = function VtxExport(props) {
     var status = false;
     document.body.appendChild(div);
     downloadFile(downloadURL, {
+      timeout: timeout,
       data: postData,
       extraHeader: headers,
       success: function success() {

package/es/vtx-form-layout/FormItem.js

@@ -12,6 +12,7 @@ import PropTypes from 'prop-types';
 import { ConfigProvider, Tooltip, Col, Form } from 'antd';
 import classnames from 'classnames';
 import { StoreCtx } from "./context";
+import { useIntl } from "../vtx-provider";
 
 // 24 栅格
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -19,6 +20,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var SPAN = 24;
 export default function FormItem(props) {
   var _rest$rules;
+  var intl = useIntl();
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-item');
@@ -59,33 +61,34 @@ export default function FormItem(props) {
     }
   });
   var initPlaceholder = function initPlaceholder(placeholder, label, type) {
+    console.log('label, placeholder', placeholder, type === null || type === void 0 ? void 0 : type.displayName);
     if (placeholder) {
       return placeholder;
     }
-    if (typeof label === 'string') {
-      if (['Input', 'InputNumber', 'VtxInput', 'TextArea', 'VtxEditor'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        // return '请输入' + label
-        return '请输入';
-      }
-      if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid', 'VtxTreeSelect', 'VtxZtreeSelect', 'VtxSearchMapInput'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        // return '请选择' + label
-        return '请选择';
-      }
-      if (['DatePicker', 'RangePicker', 'TimePicker', 'VtxDatePicker', 'VtxRangePicker', 'VtxTimePicker', 'VtxTimeRangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return undefined;
-      }
+    if (['Input', 'InputNumber', 'VtxInput', 'TextArea', 'VtxEditor'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请输入' + label
+      return intl.getMessage('tableForm.inputPlaceholder', '请输入');
+    }
+    if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid', 'VtxTreeSelect', 'VtxZtreeSelect', 'VtxSearchMapInput'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请选择' + label
+      return intl.getMessage('tableForm.selectPlaceholder', '请选择');
+    }
+    if (['DatePicker', 'RangePicker', 'TimePicker', 'VtxDatePicker', 'VtxRangePicker', 'VtxTimePicker', 'VtxTimeRangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      return undefined;
     }
     return null;
   };
   var renderItem = function renderItem(child) {
     if ( /*#__PURE__*/isValidElement(child)) {
       var _child$props;
-      return /*#__PURE__*/React.cloneElement(child, {
+      console.log('initPlaceholder', child, label);
+      return /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, child.props), {}, {
         placeholder: initPlaceholder(child === null || child === void 0 || (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
-      });
+      }));
     }
     return child;
   };
+  console.log('disableHtmlFor', disableHtmlFor, props.children);
   return /*#__PURE__*/_jsx(Col, {
     span: SPAN * weights / cols,
     className: "".concat(prefixCls, "-col"),

package/es/vtx-modal/index.js

@@ -195,18 +195,20 @@ function VtxModal(props) {
     destroyOnHidden: (_props$destroyOnClose = props.destroyOnClose) !== null && _props$destroyOnClose !== void 0 ? _props$destroyOnClose : true
   };
   var newProps = _objectSpread(_objectSpread(_objectSpread({
-    // maskClosable: false,
     mask: {
       closable: false
     },
-    // destroyOnClose: true,
-    width: 700
+    width: 700,
+    focusable: {
+      autoFocusButton: null,
+      focusTriggerAfterClose: true,
+      trap: false
+    }
   }, props), legacyProps), {}, {
     closable: false,
     open: open,
     title: title,
     wrapClassName: classnames(prefixCls, hashId, wrapClassName, _defineProperty({}, "".concat(prefixCls, "-maxClass"), isFull ? true : false), classId.current),
-    // bodyStyle,
     onCancel: onCancel,
     style: _objectSpread(_objectSpread({}, props.style), isFull ? {} : transformStyle)
   });

package/lib/vtx-export/index.js

@@ -114,6 +114,7 @@ var VtxExport = exports.VtxExport = function VtxExport(props) {
     var status = false;
     document.body.appendChild(div);
     (0, _downloadFile.default)(downloadURL, {
+      timeout: timeout,
       data: postData,
       extraHeader: headers,
       success: function success() {

package/lib/vtx-form-layout/FormItem.js

@@ -10,6 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _antd = require("antd");
 var _classnames7 = _interopRequireDefault(require("classnames"));
 var _context = require("./context");
+var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["weights", "label", "inline", "hideTooltip", "disableHtmlFor", "tooltip", "hidden", "nameExtra"]; // 24 栅格
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,6 +26,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var SPAN = 24;
 function FormItem(props) {
   var _rest$rules;
+  var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-form-layout-item');
@@ -65,33 +67,34 @@ function FormItem(props) {
     }
   });
   var initPlaceholder = function initPlaceholder(placeholder, label, type) {
+    console.log('label, placeholder', placeholder, type === null || type === void 0 ? void 0 : type.displayName);
     if (placeholder) {
       return placeholder;
     }
-    if (typeof label === 'string') {
-      if (['Input', 'InputNumber', 'VtxInput', 'TextArea', 'VtxEditor'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        // return '请输入' + label
-        return '请输入';
-      }
-      if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid', 'VtxTreeSelect', 'VtxZtreeSelect', 'VtxSearchMapInput'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        // return '请选择' + label
-        return '请选择';
-      }
-      if (['DatePicker', 'RangePicker', 'TimePicker', 'VtxDatePicker', 'VtxRangePicker', 'VtxTimePicker', 'VtxTimeRangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
-        return undefined;
-      }
+    if (['Input', 'InputNumber', 'VtxInput', 'TextArea', 'VtxEditor'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请输入' + label
+      return intl.getMessage('tableForm.inputPlaceholder', '请输入');
+    }
+    if (['Select', 'VtxColorPicker', 'VtxSelect', 'VtxCombogrid', 'VtxTreeSelect', 'VtxZtreeSelect', 'VtxSearchMapInput'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      // return '请选择' + label
+      return intl.getMessage('tableForm.selectPlaceholder', '请选择');
+    }
+    if (['DatePicker', 'RangePicker', 'TimePicker', 'VtxDatePicker', 'VtxRangePicker', 'VtxTimePicker', 'VtxTimeRangePicker'].includes(type === null || type === void 0 ? void 0 : type.displayName)) {
+      return undefined;
     }
     return null;
   };
   var renderItem = function renderItem(child) {
     if ( /*#__PURE__*/(0, _react.isValidElement)(child)) {
       var _child$props;
-      return /*#__PURE__*/_react.default.cloneElement(child, {
+      console.log('initPlaceholder', child, label);
+      return /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({}, child.props), {}, {
         placeholder: initPlaceholder(child === null || child === void 0 || (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.placeholder, label, child === null || child === void 0 ? void 0 : child.type)
-      });
+      }));
     }
     return child;
   };
+  console.log('disableHtmlFor', disableHtmlFor, props.children);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, {
     span: SPAN * weights / cols,
     className: "".concat(prefixCls, "-col"),

package/lib/vtx-modal/index.js

@@ -202,18 +202,20 @@ function VtxModal(props) {
     destroyOnHidden: (_props$destroyOnClose = props.destroyOnClose) !== null && _props$destroyOnClose !== void 0 ? _props$destroyOnClose : true
   };
   var newProps = _objectSpread(_objectSpread(_objectSpread({
-    // maskClosable: false,
     mask: {
       closable: false
     },
-    // destroyOnClose: true,
-    width: 700
+    width: 700,
+    focusable: {
+      autoFocusButton: null,
+      focusTriggerAfterClose: true,
+      trap: false
+    }
   }, props), legacyProps), {}, {
     closable: false,
     open: open,
     title: title,
     wrapClassName: (0, _classnames2.default)(prefixCls, hashId, wrapClassName, _defineProperty({}, "".concat(prefixCls, "-maxClass"), isFull ? true : false), classId.current),
-    // bodyStyle,
     onCancel: onCancel,
     style: _objectSpread(_objectSpread({}, props.style), isFull ? {} : transformStyle)
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.56",
+  "version": "4.0.0-beta.58",
   "description": "React components for Vortex",
   "keywords": [
     "react",