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

package/ControlWrapper/index.d.ts

@@ -12,8 +12,6 @@ import {
 interface ExtraProps<T> {
   /** 标签文本 */
   label?: string;
-  /** 标签宽度 (Col span) */
-  labelSpan?: number;
   /** 自定义样式 */
   style?: React.CSSProperties;
   /** 受控值 */

package/ControlWrapper/index.js

@@ -1,12 +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 React from 'react';
-import PropTypes from 'prop-types';
-import { Row, Col, Input as OriginInput, Select as OriginSelect, Cascader as OriginCascader, DatePicker as OriginDatePicker, TreeSelect as OriginTreeSelect } from 'antd';
-import { tools } from '@cqsjjb/jjb-common-lib';
-import { getAlgorithm, getPrefixCls } from '../tools/index.js';
-import './index.less';
-const algorithm = getAlgorithm();
-const prefixCls = getPrefixCls();
+import { Input as OriginInput, Select as OriginSelect, Cascader as OriginCascader, DatePicker as OriginDatePicker, TreeSelect as OriginTreeSelect } from 'antd';
 
 /**
  * 通用包裹组件
@@ -17,8 +11,6 @@ function withLabel(WrappedComponent, extraProps = {}) {
   return function Wrapper(props) {
     const {
       label,
-      labelSpan,
-      style,
       onChange,
       ...restProps
     } = props;
@@ -28,23 +20,14 @@ function withLabel(WrappedComponent, extraProps = {}) {
         onChange(val === '' ? undefined : val, ...args);
       }
     };
-    return /*#__PURE__*/React.createElement("div", {
-      style: style,
-      className: tools.classNames(`${prefixCls}-form-item-control-label-wrapper`, `${prefixCls}-form-item-control-label-wrapper-${algorithm}`, label && `${prefixCls}-form-item-control-label-has`)
-    }, /*#__PURE__*/React.createElement(Row, {
-      align: "middle"
-    }, label && /*#__PURE__*/React.createElement(Col, {
-      span: labelSpan,
-      className: `${prefixCls}-form-item-control-label-span`
-    }, label), /*#__PURE__*/React.createElement(Col, {
-      flex: 1
-    }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
+    return /*#__PURE__*/React.createElement(WrappedComponent, _extends({
       style: {
         width: '100%'
-      }
+      },
+      prefix: label
     }, extraProps, restProps, {
       onChange: handleChange
-    })))));
+    }));
   };
 }
 

package/FileUploader/index.d.ts

@@ -8,8 +8,6 @@ import { AxiosResponse } from 'axios'
 export interface FileUploaderProps<T> {
   // 上传文件大小 单位KB 默认-5120
   size?: number;
-  // 版本 v1-才俊java v2-杨飞java 默认-v2
-  version?: 'v1' | 'v2';
   // 组件内部按钮属性-Ant.Button
   buttonProps?: ButtonProps;
   // Http上传携带其他数据

package/FileUploader/index.js

@@ -3,7 +3,7 @@ import MD5 from 'spark-md5';
 import React from 'react';
 import { Tooltip, Button, message } from 'antd';
 import { DeleteOutlined, PaperClipOutlined } from '@ant-design/icons';
-import { getAppKey, getToken, isHttpUrl, isVersion1, isVersion2 } from '../tools/index.js';
+import { getAppKey, getToken, isHttpUrl } from '../tools/index.js';
 import { tools } from '@cqsjjb/jjb-common-lib';
 import './index.less';
 const {
@@ -137,14 +137,6 @@ class FileUploader extends React.Component {
     }
   }
 
-  /**
-   * @description 获取版本
-   * @return {string}
-   */
-  get version() {
-    return this.props.version || 'v2';
-  }
-
   /**
    * @description 发起上传请求
    * @param file {File}
@@ -194,17 +186,13 @@ class FileUploader extends React.Component {
         Object.keys(this.httpConfig.data).forEach(key => form.append(key, this.httpConfig.data[key]));
         xhr.send(form);
       });
-      if (isVersion2(this.version)) {
-        const read = new FileReader();
-        read.onload = e => {
-          md5.appendBinary(e.target.result);
-          form.append('md5', md5.end());
-          fn();
-        };
-        read.readAsDataURL(file);
-      } else {
+      const read = new FileReader();
+      read.onload = e => {
+        md5.appendBinary(e.target.result);
+        form.append('md5', md5.end());
         fn();
-      }
+      };
+      read.readAsDataURL(file);
     });
   }
 
@@ -245,7 +233,7 @@ class FileUploader extends React.Component {
       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 : {
+      const data = {
         fileId: res.fileId || res.url,
         fileUrl: res.fileUrl || res.fileName
       };
@@ -282,7 +270,7 @@ class FileUploader extends React.Component {
       disabled: this.disabled,
       onChange: e => this.onUpload(e)
     }), /*#__PURE__*/React.createElement("span", null, children)), this.value.map((value, index) => {
-      const $value = this.version === 'v1' ? value : value.fileUrl;
+      const $value = value?.fileUrl;
       return /*#__PURE__*/React.createElement("div", {
         key: index,
         className: `${prefixCls}-upload-list-text-container`

package/ImageUploader/index.d.ts

@@ -1,8 +1,6 @@
 import React from 'react';
 
 export interface ImageUploaderProps {
-  // 版本 v1-才俊java v2-杨飞java 默认-v2
-  version?: 'v1' | 'v2';
   // 宽高 默认-50*50
   wh?: string;
   // 是否是svg 默认-false

package/ImageUploader/index.js

@@ -1,12 +1,11 @@
 import MD5 from 'spark-md5';
 import React, { useState, useRef, useCallback } from 'react';
-import PropTypes from 'prop-types';
 import { tools } from '@cqsjjb/jjb-common-lib';
 import { Button, Col, Image as ImageFunc, Modal, Row, message } from 'antd';
 import { PlusOutlined, EyeOutlined, DeleteOutlined, SyncOutlined, ScissorOutlined } from '@ant-design/icons';
 import ImageCropper from '../ImageCropper';
 import './index.less';
-import { getTenantCode, getToken, getViewAsp, isVersion1, isVersion2, getAppKey, isHttpUrl } from '../tools/index.js';
+import { getToken, getViewAsp, getAppKey, isHttpUrl } from '../tools/index.js';
 const {
   toObject,
   isPromise,
@@ -23,7 +22,6 @@ const ImageUploader = props => {
   const [resource, setResource] = useState(undefined);
   const cropperRef = useRef(null);
   const fileInputRef = useRef(null);
-  const version = props.version || 'v2';
   const algorithm = (() => {
     const value = document.documentElement.style.getPropertyValue('--saas-algorithm');
     return value ? value === '#FFF' ? 'default' : 'dark' : 'default';
@@ -36,7 +34,7 @@ const ImageUploader = props => {
     return new Promise(resolve => {
       const reader = new FileReader();
       reader.onload = e => {
-        if (version === 'v2') md5.appendBinary(e.target.result);
+        md5.appendBinary(e.target.result);
         const isImage = (svg ? FILE_TYPE_POWER : FILE_TYPE).includes(file.type);
         if (isImage) {
           const image = new Image();
@@ -46,7 +44,7 @@ const ImageUploader = props => {
             resolve({
               file,
               base64,
-              md5: isVersion2(version) ? md5.end() : null,
+              md5: md5.end(),
               size: file.size,
               type: file.type,
               name: file.name,
@@ -57,7 +55,7 @@ const ImageUploader = props => {
         } else {
           resolve({
             file,
-            md5: isVersion2(version) ? md5.end() : null,
+            md5: md5.end(),
             size: file.size,
             type: file.type,
             name: file.name,
@@ -69,7 +67,7 @@ const ImageUploader = props => {
       };
       reader.readAsDataURL(file);
     });
-  }, [props, version]);
+  }, [props]);
   const onCompression = useCallback(data => {
     const {
       compressionConfig
@@ -123,9 +121,10 @@ const ImageUploader = props => {
     const form = new FormData();
     const headers = toObject($headers);
     headers.appKey = getAppKey();
-    if (needToken) headers.token = getToken();
-    if (isVersion1(version)) headers.tenantCode = getTenantCode();
-    if (isVersion2(version) && transfer.md5) form.append('md5', transfer.md5);
+    if (needToken) {
+      headers.token = getToken();
+    }
+    transfer.md5 && form.append('md5', transfer.md5);
     setLoading(true);
     xhr.open('POST', requestURL);
     Object.keys(headers).forEach(key => xhr.setRequestHeader(key, headers[key]));
@@ -135,19 +134,22 @@ const ImageUploader = props => {
         const res = parseObject(xhr.responseText);
         if (isFunction(customRequest)) {
           const fn = customRequest(res);
-          if (isPromise(fn)) fn.then(value => onChange && onChange(value));
+          if (isPromise(fn)) {
+            fn.then(value => onChange && onChange(value));
+          }
         } else {
           const {
             success,
-            respCode,
             errMessage
           } = res;
-          if (respCode === '0000' || success) {
+          if (success) {
             const result = toObject(res.data);
-            if (typeof onChange === 'undefined') console.warn('ImageUploader警告:缺少必要的onChange回调,可能无法正确显示图片!');
-            onChange && onChange(isVersion1(version) ? result.url : {
-              fileId: result.fileId || result.url,
-              fileUrl: result.fileUrl || result.fileName
+            if (typeof onChange === 'undefined') {
+              console.warn('ImageUploader警告:缺少必要的onChange回调,可能无法正确显示图片!');
+            }
+            onChange && onChange({
+              fileId: result.fileId,
+              fileUrl: result.fileUrl
             });
             message.success('上传成功！');
           } else {
@@ -159,7 +161,7 @@ const ImageUploader = props => {
     form.append(fieldName, transfer.file);
     Object.keys(data).forEach(key => form.append(key, data[key]));
     xhr.send(form);
-  }, [props, version]);
+  }, [props]);
   const onUpload = useCallback(e => {
     const target = e.target;
     const files = target.files;
@@ -236,7 +238,7 @@ const ImageUploader = props => {
   }, value ? /*#__PURE__*/React.createElement("div", {
     className: `${prefixCls}_image-file-uploader-preview_`
   }, value && /*#__PURE__*/React.createElement(ImageFunc, {
-    src: version === 'v1' ? value : toObject(value).fileUrl,
+    src: toObject(value).fileUrl,
     preview: !disabled ? {
       visible: preview,
       onVisibleChange: () => setPreview(false)

package/package.json

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