@cqsjjb/jjb-react-admin-component 3.2.0-beta.1 → 3.2.0-rc.0

package/BMap/index.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useRef, useState, useCallback } from 'react';
-import PropTypes from 'prop-types';
 import { Button, Col, message, Modal, Result, Row } from 'antd';
 import './index.less';
 const _B_MAP_SEARCH_ = '_B_MAP_SEARCH_';
@@ -10,8 +9,8 @@ const _B_MAP_DEFAULT_POINT_ = {
 const BMap = ({
   lng: propLng,
   lat: propLat,
-  title,
-  width,
+  title = '百度地图',
+  width = 700,
   onOk,
   onCancel
 }) => {
@@ -165,21 +164,4 @@ const BMap = ({
     title: "\u52A0\u8F7D\u5730\u56FE\u5931\u8D25\uFF0C\u7F3A\u5C11\u5FC5\u8981\u7684\u6587\u4EF6\uFF01"
   }));
 };
-BMap.defaultProps = {
-  lng: 0,
-  lat: 0,
-  title: '百度地图',
-  width: 700
-};
-BMap.propTypes = {
-  lng: PropTypes.number,
-  lat: PropTypes.number,
-  width: PropTypes.number,
-  // 地图宽度
-  title: PropTypes.string,
-  // 标题
-  onOk: PropTypes.func,
-  // 确认事件
-  onCancel: PropTypes.func // 取消事件
-};
 export default BMap;

package/ControlWrapper/index.js

@@ -73,17 +73,6 @@ DatePicker.WeekPicker = withLabel(OriginDatePicker.WeekPicker);
 DatePicker.MonthPicker = withLabel(OriginDatePicker.MonthPicker);
 DatePicker.QuarterPicker = withLabel(OriginDatePicker.QuarterPicker);
 DatePicker.YearPicker = withLabel(OriginDatePicker.YearPicker);
-
-// ============ PropTypes 公共扩展 ============
-const commonPropTypes = {
-  label: PropTypes.string,
-  labelSpan: PropTypes.number,
-  style: PropTypes.object,
-  onChange: PropTypes.func
-};
-[Input, Select, Cascader, TreeSelect, DatePicker, DatePicker.RangePicker, DatePicker.TimePicker, DatePicker.WeekPicker, DatePicker.MonthPicker, DatePicker.QuarterPicker, DatePicker.YearPicker].forEach(cmp => {
-  cmp.propTypes = commonPropTypes;
-});
 export default {
   Input,
   Select,

package/Editor/{index.ts → index.d.ts}

@@ -18,6 +18,8 @@ interface EditorProps {
   mode?: 'default' | 'simple';
   // 高度 默认-300px
   height?: number;
+  // 层级 默认-1000
+  zIndex?: number;
   // 是否禁用 默认-false
   disabled?: boolean;
   // 上传地址 默认-${window.process.env.app.API_HOST}/attachment/files/upload-speed-simple

package/Editor/index.js

@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import '@wangeditor-next/editor/dist/css/style.css';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { message } from 'antd';
@@ -99,7 +98,8 @@ const RCEditor = /*#__PURE__*/forwardRef(function RCEditor(props, ref) {
     bordered = true,
     mode = 'default',
     height = 300,
-    disabled,
+    disabled = false,
+    zIndex = 1000,
     uploadUrl = `${window.process.env.app.API_HOST}/attachment/files/upload-speed-simple`,
     uploadFileName = 'file',
     uploadHeaders = {},
@@ -111,9 +111,9 @@ const RCEditor = /*#__PURE__*/forwardRef(function RCEditor(props, ref) {
     borderColor = '#e8e8e8',
     borderWidth = 1,
     borderRadius = 2,
-    onBlur,
-    onFocus,
-    onChange
+    onBlur = tools.noop,
+    onFocus = tools.noop,
+    onChange = tools.noop
   } = props;
 
   // 编辑器
@@ -289,6 +289,7 @@ const RCEditor = /*#__PURE__*/forwardRef(function RCEditor(props, ref) {
   }));
   return /*#__PURE__*/React.createElement("div", {
     style: {
+      zIndex,
       border: bordered ? `${borderWidth}px ${borderStyle} ${borderColor}` : 'none',
       overflow: 'hidden',
       borderRadius
@@ -306,25 +307,4 @@ const RCEditor = /*#__PURE__*/forwardRef(function RCEditor(props, ref) {
     }
   }));
 });
-RCEditor.propTypes = {
-  bordered: PropTypes.bool,
-  borderStyle: PropTypes.string,
-  borderColor: PropTypes.string,
-  borderWidth: PropTypes.number,
-  borderRadius: PropTypes.number,
-  mode: PropTypes.string,
-  value: PropTypes.string,
-  height: PropTypes.number,
-  disabled: PropTypes.bool,
-  uploadUrl: PropTypes.string,
-  uploadFileName: PropTypes.string,
-  uploadImageFileSize: PropTypes.number,
-  uploadVideoFileSize: PropTypes.number,
-  uploadHeaders: PropTypes.object,
-  uploadCustomRequest: PropTypes.func,
-  placeholder: PropTypes.string,
-  onBlur: PropTypes.func,
-  onFocus: PropTypes.func,
-  onChange: PropTypes.func
-};
 export default RCEditor;

package/FileUploader/index.js

@@ -1,7 +1,6 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import MD5 from 'spark-md5';
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Tooltip, Button, message } from 'antd';
 import { DeleteOutlined, PaperClipOutlined } from '@ant-design/icons';
 import { getAppKey, getToken, isHttpUrl, isVersion1, isVersion2 } from '../tools/index.js';
@@ -26,10 +25,10 @@ class FileUploader extends React.Component {
    */
   get httpConfig() {
     const {
-      data,
+      data = {},
       action,
-      headers,
-      fieldName
+      headers = {},
+      fieldName = 'file'
     } = this.props;
     const {
       API_HOST
@@ -39,7 +38,7 @@ class FileUploader extends React.Component {
       data,
       action,
       headers: {
-        ...headers,
+        ...tools.toObject(headers),
         token: getToken(),
         appKey: getAppKey()
       },
@@ -64,9 +63,9 @@ class FileUploader extends React.Component {
    */
   get disabled() {
     const {
-      multiple,
-      maxCount,
-      disabled
+      multiple = false,
+      maxCount = 99,
+      disabled = false
     } = this.props;
     if (disabled) {
       return disabled;
@@ -143,7 +142,7 @@ class FileUploader extends React.Component {
    * @return {string}
    */
   get version() {
-    return this.props.version;
+    return this.props.version || 'v2';
   }
 
   /**
@@ -241,9 +240,9 @@ class FileUploader extends React.Component {
       type: fileType
     } = file;
     const {
-      accept,
-      multiple,
-      size: maxSize
+      accept = '*',
+      multiple = false,
+      size: maxSize = 5120
     } = this.props;
     this.verifyFileAccept(fileType, accept).then(() => this.verifyFileSize(fileSize, maxSize).then(() => this.onFormRequest(file).then(res => {
       const data = isVersion1(this.version) ? res.url : {
@@ -256,10 +255,10 @@ class FileUploader extends React.Component {
   }
   render() {
     const {
-      accept,
-      preview,
-      showDelete,
-      buttonProps,
+      accept = '*',
+      preview = false,
+      showDelete = true,
+      buttonProps = {},
       // ---------
       children
     } = this.props;
@@ -268,7 +267,7 @@ class FileUploader extends React.Component {
     } = this.state;
     return /*#__PURE__*/React.createElement("div", {
       className: `${prefixCls}_file-uploader_`
-    }, /*#__PURE__*/React.createElement(Button, _extends({}, buttonProps, {
+    }, /*#__PURE__*/React.createElement(Button, _extends({}, tools.toObject(buttonProps), {
       loading: loading,
       disabled: this.disabled,
       className: `${prefixCls}_file-uploader-select_`,
@@ -314,66 +313,6 @@ class FileUploader extends React.Component {
     }));
   }
 }
-FileUploader.defaultProps = {
-  size: 5120,
-  data: {},
-  accept: '*',
-  headers: {},
-  version: 'v2',
-  preview: false,
-  maxCount: 99,
-  buttonProps: {
-    icon: undefined,
-    size: 'middle',
-    type: 'default',
-    block: false,
-    shape: 'default',
-    ghost: false,
-    danger: false
-  },
-  disabled: false,
-  multiple: false,
-  fieldName: 'file',
-  showDelete: true
-};
-FileUploader.propTypes = {
-  // 版本 v1旧版 / v2新版
-  version: PropTypes.string,
-  // 上传资源文件大小 默认5MB
-  size: PropTypes.number,
-  // 按钮图标
-  buttonProps: PropTypes.object,
-  // http上传携带的其他数据 默认{}
-  data: PropTypes.object,
-  // 填充值 默认undefined
-  value: PropTypes.any,
-  // 上传资源类型
-  accept: PropTypes.string,
-  // http上传接口
-  action: PropTypes.string.isRequired,
-  // 预览 默认false
-  preview: PropTypes.bool,
-  // http请求头配置 默认{}
-  headers: PropTypes.object,
-  // 最大上传数 multiple模式下有效 默认最大上传数99
-  maxCount: PropTypes.any,
-  // 开启多个文件上传 默认false
-  multiple: PropTypes.bool,
-  // 是否禁用上传 默认false
-  disabled: PropTypes.bool,
-  // 上传字段 默认ossFile
-  fieldName: PropTypes.string,
-  // 显示删除按钮 默认true
-  showDelete: PropTypes.bool,
-  // 数据回调
-  onChange: PropTypes.func,
-  // 上传之前验证资源大小回调
-  onBeforeUploadVerifySize: PropTypes.func,
-  // 上传之前验证资源类型回调
-  onBeforeUploadVerifyAccept: PropTypes.func,
-  // 可以自定义自己的上传实现
-  customRequest: PropTypes.func
-};
 export default FileUploader;
 export const getValueProps = value => ({
   value: value ? {

package/FormilyDescriptions/index.js

@@ -24,7 +24,6 @@ export default function FormilyDescriptions({
   const dataSource = tools.getDynamicFormilyFields(schema, values, {
     regions
   });
-  console.log(schema, values);
   if (!dataSource.length) return /*#__PURE__*/React.createElement(Empty, {
     image: Empty.PRESENTED_IMAGE_SIMPLE
   });

package/ImageCropper/index.js

@@ -1,22 +1,20 @@
 import MD5 from 'spark-md5';
 import React, { useEffect, useRef, useState, forwardRef, useImperativeHandle } from 'react';
 import Cropper from 'react-cropper';
-import PropTypes from 'prop-types';
 import 'cropperjs/dist/cropper.css';
 import { Empty } from 'antd';
 import { tools } from '@cqsjjb/jjb-common-lib';
 import { isHttpUrl } from '../tools/index.js';
 const ImageCropper = /*#__PURE__*/forwardRef((props, ref) => {
   const {
-    width,
-    height,
-    aspect,
-    locked,
+    width = 400,
+    height = 400,
+    aspect = 16 / 9,
+    locked = false,
     resource
   } = props;
   const cropRef = useRef(null);
   const [src, setSrc] = useState(undefined);
-  console.log('props', locked);
 
   // 更新 src
   const onUpdateSrc = () => {
@@ -115,17 +113,4 @@ const ImageCropper = /*#__PURE__*/forwardRef((props, ref) => {
     description: "\u672A\u5BFC\u5165\u56FE\u7247\u8D44\u6E90\uFF0C\u65E0\u6CD5\u88C1\u526A"
   }));
 });
-ImageCropper.defaultProps = {
-  width: 400,
-  height: 400,
-  aspect: 16 / 9,
-  locked: false
-};
-ImageCropper.propTypes = {
-  width: PropTypes.number,
-  height: PropTypes.number,
-  locked: PropTypes.bool,
-  aspect: PropTypes.number,
-  resource: PropTypes.any.isRequired
-};
 export default ImageCropper;

package/ImageUploader/index.js

@@ -23,7 +23,7 @@ const ImageUploader = props => {
   const [resource, setResource] = useState(undefined);
   const cropperRef = useRef(null);
   const fileInputRef = useRef(null);
-  const version = props.version;
+  const version = props.version || 'v2';
   const algorithm = (() => {
     const value = document.documentElement.style.getPropertyValue('--saas-algorithm');
     return value ? value === '#FFF' ? 'default' : 'dark' : 'default';
@@ -31,7 +31,7 @@ const ImageUploader = props => {
   const onLoadFile = useCallback(file => {
     const md5 = new MD5();
     const {
-      svg
+      svg = false
     } = props;
     return new Promise(resolve => {
       const reader = new FileReader();
@@ -110,12 +110,12 @@ const ImageUploader = props => {
       API_HOST
     } = window.process.env.app;
     const {
-      data,
+      data = {},
       action,
-      headers: $headers,
-      needToken,
+      headers: $headers = {},
+      needToken = true,
       customRequest,
-      fieldName,
+      fieldName = 'file',
       onChange
     } = props;
     const requestURL = isHttpUrl(action) ? action : `${API_HOST}${action}`;
@@ -165,11 +165,11 @@ const ImageUploader = props => {
     const files = target.files;
     const file = files[0];
     const {
-      wh,
-      svg,
-      size,
-      cropper,
-      compression
+      wh = '50*50',
+      svg = false,
+      size = 5120,
+      cropper = false,
+      compression = false
     } = props;
     onLoadFile(file).then(load => {
       const [w, h] = getViewAsp(wh);
@@ -205,19 +205,20 @@ const ImageUploader = props => {
     });
   }, [props, onLoadFile, onCompression, onUploadHttp]);
   const {
-    tip,
-    svg,
+    tip = '点击上传',
+    svg = false,
     value,
-    disabled,
-    width,
-    height,
-    cropper,
-    borderStyle,
-    borderColor,
-    borderWidth,
-    borderRadius,
-    backgroundColor,
-    cropperConfig: $cropperConfig,
+    disabled = false,
+    width = 120,
+    height = 120,
+    preview: _preview = true,
+    cropper = false,
+    borderStyle = 'dashed',
+    borderColor = '#d9d9d9',
+    borderWidth = 1,
+    borderRadius = 2,
+    backgroundColor = '#fafafa',
+    cropperConfig: $cropperConfig = {},
     onChange
   } = props;
   const cropperConfig = toObject($cropperConfig);
@@ -242,7 +243,7 @@ const ImageUploader = props => {
     } : true
   }), !disabled && /*#__PURE__*/React.createElement("div", {
     className: `${prefixCls}_image-file-uploader-preview-control_`
-  }, props.preview && /*#__PURE__*/React.createElement(EyeOutlined, {
+  }, _preview && /*#__PURE__*/React.createElement(EyeOutlined, {
     title: "\u9884\u89C8",
     onClick: () => setPreview(true)
   }), /*#__PURE__*/React.createElement(DeleteOutlined, {
@@ -296,61 +297,6 @@ const ImageUploader = props => {
     resource: resource
   })));
 };
-ImageUploader.defaultProps = {
-  wh: '50*50',
-  tip: '点击上传',
-  svg: false,
-  size: 5120,
-  data: {},
-  width: 120,
-  height: 120,
-  headers: {},
-  preview: true,
-  cropper: false,
-  version: 'v2',
-  disabled: false,
-  fieldName: 'file',
-  borderColor: '#d9d9d9',
-  borderWidth: 1,
-  borderStyle: 'dashed',
-  borderRadius: 2,
-  cropperConfig: {},
-  backgroundColor: '#fafafa',
-  compression: false,
-  compressionConfig: {
-    quality: 0.6,
-    backType: 'file'
-  },
-  needToken: true
-};
-ImageUploader.propTypes = {
-  version: PropTypes.string,
-  wh: PropTypes.string,
-  svg: PropTypes.bool,
-  tip: PropTypes.string,
-  size: PropTypes.number,
-  data: PropTypes.object,
-  value: PropTypes.any,
-  width: PropTypes.number,
-  height: PropTypes.number,
-  action: PropTypes.string.isRequired,
-  preview: PropTypes.bool,
-  cropper: PropTypes.bool,
-  headers: PropTypes.object,
-  disabled: PropTypes.bool,
-  fieldName: PropTypes.string,
-  borderStyle: PropTypes.string,
-  borderColor: PropTypes.string,
-  borderWidth: PropTypes.number,
-  borderRadius: PropTypes.number,
-  cropperConfig: PropTypes.object,
-  backgroundColor: PropTypes.string,
-  customRequest: PropTypes.func,
-  onChange: PropTypes.func,
-  compression: PropTypes.bool,
-  compressionConfig: PropTypes.object,
-  needToken: PropTypes.bool
-};
 export default ImageUploader;
 export const getValueProps = value => ({
   value: value ? {

package/PageLayout/index.js

@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import React, { memo, useCallback } from 'react';
 import { PageHeader } from '@ant-design/pro-layout';
 import './index.less';
@@ -58,28 +57,4 @@ const PageLayout = /*#__PURE__*/memo(props => {
     style: footerStyle
   }, footer));
 });
-PageLayout.propTypes = {
-  style: PropTypes.object,
-  title: PropTypes.string,
-  extra: PropTypes.node,
-  header: PropTypes.node,
-  footer: PropTypes.any,
-  history: PropTypes.object,
-  noStyle: PropTypes.bool,
-  noBorder: PropTypes.bool,
-  formLine: PropTypes.node,
-  previous: PropTypes.bool,
-  transparent: PropTypes.bool,
-  formLineStyle: PropTypes.object,
-  contentStyle: PropTypes.object,
-  footerStyle: PropTypes.object,
-  pageHeaderStyle: PropTypes.object,
-  onBack: PropTypes.func
-};
-PageLayout.defaultProps = {
-  style: {},
-  history: {},
-  noBorder: false,
-  previous: false
-};
 export default PageLayout;

package/SearchForm/index.js

@@ -1,5 +1,4 @@
 import React, { useState, useRef, useEffect } from 'react';
-import PropTypes from 'prop-types';
 import { Form, Button, Space, Row, Col } from 'antd';
 import { SearchOutlined, DoubleRightOutlined, UndoOutlined } from '@ant-design/icons';
 const SearchForm = ({
@@ -93,20 +92,4 @@ const SearchForm = ({
     noStyle: true
   }, getButtons()))));
 };
-SearchForm.propTypes = {
-  form: PropTypes.object,
-  style: PropTypes.object,
-  expand: PropTypes.bool,
-  // 受控
-  defaultExpand: PropTypes.bool,
-  // 内部默认展开
-  colSize: PropTypes.number,
-  loading: PropTypes.bool,
-  formLine: PropTypes.array,
-  initialValues: PropTypes.object,
-  onRef: PropTypes.func,
-  onReset: PropTypes.func,
-  onFinish: PropTypes.func,
-  onExpand: PropTypes.func
-};
 export default SearchForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.2.0-beta.1",
+  "version": "3.2.0-rc.0",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",