@ccs-ui/rc-pro 1.1.25-beta-19 → 1.1.25-beta-21

package/es/dialog/DialogRequestButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogRequestButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "onRequestBefore"> & {
+declare const DialogRequestButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onRequestBefore" | "onCancel"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/editor/index.d.ts

@@ -4,13 +4,14 @@ import './index.less';
 import JavaScriptEditor from './javascript';
 import JsonEditor from './json';
 import SqlEditor from './sql';
-export type EditorPropsType = ReactCodeMirrorProps & {
+export type EditorPropsType = Omit<ReactCodeMirrorProps, 'height'> & {
     value?: string;
     className?: string;
     style?: CSSProperties;
     placeholder?: string;
     bordered?: boolean;
     isPreview?: boolean;
+    height?: number | string;
     onChange?: (e: string) => void;
 };
 declare function Editor({}: {}): import("react/jsx-runtime").JSX.Element;

package/es/editor/javascript.js

@@ -41,8 +41,9 @@ export default function JavaScriptEditor(_ref) {
     });
     previewProps.className = "".concat(classNames(className, 'ccs-editor', 'ccs-editor-preview'));
   }
+  var newHeight = typeof height === 'number' ? "".concat(height, "px") : height;
   return /*#__PURE__*/_jsx(CodeMirror, _objectSpread(_objectSpread({
-    height: height,
+    height: newHeight,
     extensions: [javascript({
       jsx: true
     })],

package/es/editor/json.js

@@ -65,9 +65,10 @@ export default function JsonEditor(_ref) {
     });
     previewProps.className = "".concat(classNames(className, 'ccs-editor', 'ccs-editor-preview'));
   }
+  var newHeight = typeof height === 'number' ? "".concat(height, "px") : height;
   return /*#__PURE__*/_jsx(CodeMirror, _objectSpread(_objectSpread({
     value: value,
-    height: height,
+    height: newHeight,
     placeholder: placeholder || defaultPlaceholder,
     extensions: [json(), regexpLinter],
     onChange: function onChange(e) {

package/es/editor/sql.js

@@ -41,8 +41,9 @@ export default function SqlEditor(_ref) {
     });
     previewProps.className = "".concat(classNames(className, 'ccs-editor', 'ccs-editor-preview'));
   }
+  var newHeight = typeof height === 'number' ? "".concat(height, "px") : height;
   return /*#__PURE__*/_jsx(CodeMirror, _objectSpread(_objectSpread({
-    height: height,
+    height: newHeight,
     extensions: [sql()],
     placeholder: placeholder,
     theme: isDark ? 'dark' : 'light'

package/es/ellipsis/index.js

@@ -21,7 +21,7 @@ export default function CcsLinesEllipsis(_ref) {
       onClick: function onClick() {
         return setIsShowMore(false);
       },
-      children: "... \u6536\u8D77"
+      children: " \u6536\u8D77"
     })]
   }) : /*#__PURE__*/_jsx(LinesEllipsis, {
     text: text,

package/es/theme-dialog.js

@@ -6,6 +6,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { message, Modal } from 'antd';
 import _debounce from 'lodash/debounce';
 var ThemeDialog = /*#__PURE__*/function () {
   function ThemeDialog() {
@@ -28,10 +29,12 @@ var ThemeDialog = /*#__PURE__*/function () {
   }, {
     key: "easyMessage",
     value: function easyMessage(result, successText, failText) {
+      var _this$message;
+      var msg = (_this$message = this.message) !== null && _this$message !== void 0 ? _this$message : message;
       if (result !== null && result !== void 0 && result.success) {
-        ThemeDialog.message.success(successText || '操作成功');
+        msg.success(successText || '操作成功');
       } else {
-        ThemeDialog.message.error(failText || (result === null || result === void 0 ? void 0 : result.msg) || '操作失败');
+        msg.error(failText || (result === null || result === void 0 ? void 0 : result.msg) || '操作失败');
       }
     }
 
@@ -50,7 +53,9 @@ _defineProperty(ThemeDialog, "modal", void 0);
 _defineProperty(ThemeDialog, "easyConfirm", _debounce(function () {
   var content = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   return new Promise(function (resolve) {
-    _class.modal.confirm({
+    var _class$modal;
+    var mod = (_class$modal = _class.modal) !== null && _class$modal !== void 0 ? _class$modal : Modal;
+    mod.confirm({
       title: '操作确认',
       content: content,
       okText: '确定',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.25-beta-19",
+  "version": "1.1.25-beta-21",
   "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;",
   "license": "MIT",
   "author": {