@titaui/pc 1.8.1 → 1.8.5

package/lib/components/form/form-fields/input/index.js

@@ -159,7 +159,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(preCls, _defineProperty({}, "".concat(preCls, "-row"), layout === 'row'), className)
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, !!label && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__label"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__label-text"))

package/lib/components/table/index.css

@@ -9,6 +9,7 @@
 .tita-pc__table {
   width: 100%;
   overflow: auto;
+  min-height: 200px;
 }
 
 .tita-pc__table-pagination {

package/lib/components/upload-photo-modal/constant.js

@@ -7,23 +7,29 @@ exports.List = void 0;
 var List = [{
   id: 'person',
   accept: '.jpg,.jpeg,.gif,.png',
-  autoCropArea: 0.5,
+  autoCropArea: 1,
   initialAspectRatio: 1,
   tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
-  previewTitle: '预览'
+  previewTitle: '预览',
+  minCropBoxHeight: 200,
+  minCropBoxWidth: 200
 }, {
   id: 'enterprise',
   accept: '.jpg,.jpeg,.gif,.png',
   autoCropArea: 1,
   initialAspectRatio: 5,
   tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
-  previewTitle: 'logo 预览'
+  previewTitle: 'logo 预览',
+  minCropBoxHeight: 20,
+  minCropBoxWidth: 20
 }, {
   id: 'browser',
   accept: '',
   autoCropArea: 0.5,
   initialAspectRatio: 1,
   tips: '图标尺寸 18*18，超过将被浏览器压缩',
-  previewTitle: '浏览器图标预览'
+  previewTitle: '浏览器图标预览',
+  minCropBoxHeight: 20,
+  minCropBoxWidth: 20
 }];
 exports.List = List;

package/lib/components/upload-photo-modal/index.js

@@ -27,8 +27,6 @@ var _constant = require("./constant");
 
 require("./index.css");
 
-var _uuid = _interopRequireDefault(require("uuid"));
-
 var _bsGlobal = require("../../utils/bs-global");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -37,10 +35,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -82,23 +76,21 @@ var ChangePhoto = function ChangePhoto(props) {
       cropData = _useState6[0],
       setCropData = _useState6[1];
 
-  var _useState7 = (0, _react.useState)({
-    Avatar: ''
-  }),
-      _useState8 = _slicedToArray(_useState7, 2),
-      userInfo = _useState8[0],
-      setUserInfo = _useState8[1];
-
-  var _useState9 = (0, _react.useState)(_constant.List.find(function (item) {
+  var _useState7 = (0, _react.useState)(_constant.List.find(function (item) {
     return item.id === type;
   })),
-      _useState10 = _slicedToArray(_useState9, 1),
-      item = _useState10[0];
+      _useState8 = _slicedToArray(_useState7, 1),
+      item = _useState8[0];
 
-  var _useState11 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isEnter = _useState10[0],
+      setIsEnter = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(''),
       _useState12 = _slicedToArray(_useState11, 2),
-      isEnter = _useState12[0],
-      setIsEnter = _useState12[1];
+      fileName = _useState12[0],
+      setFileName = _useState12[1];
 
   var cropperRef = (0, _react.useRef)(null);
 
@@ -112,6 +104,7 @@ var ChangePhoto = function ChangePhoto(props) {
       files = e.target.files;
     }
 
+    setFileName(files[0].name);
     var reader = new FileReader();
 
     reader.onload = function () {
@@ -141,19 +134,14 @@ var ChangePhoto = function ChangePhoto(props) {
     var imageElement = cropperRef.current;
     var cropper = imageElement.cropper;
     setCropData(cropper.getCroppedCanvas().toDataURL());
-    setUserInfo(cropper.getCroppedCanvas().toDataURL());
     var base64Url = cropper.getCroppedCanvas().toDataURL();
-    var newFile = dataURLtoFile(base64Url, 'test1234');
-    console.log(newFile);
+    var newFile = dataURLtoFile(base64Url, fileName);
     var formData = new FormData();
     formData.append('file', newFile);
-    console.log(formData);
     setCropper(formData);
   };
 
   var handleSaveInfo = function handleSaveInfo() {
-    var timestamp = new Date().getTime(); // 给每个文件加一个时间戳
-
     if (!image) {
       return;
     } else {
@@ -172,7 +160,6 @@ var ChangePhoto = function ChangePhoto(props) {
           }
         });
       } else if (type === "enterprise") {
-        // console.log(cropper);
         (0, _requestApi.saveTenantLogo)(cropper).then(function (resp) {
           if (resp.Code === 1) {
             _toast["default"].Success('保存成功', {
@@ -185,13 +172,7 @@ var ChangePhoto = function ChangePhoto(props) {
               canClose: false
             });
           }
-        }); // axios({headers: {
-        //   'Content-Type': 'multipart/form-data',
-        // },
-        // method: 'post',
-        // data: cropper,
-        // url: `${apiServer}/api/v1/${tenantId}/${userid}/tenant/update/logo?format=json&timestamp=${timestamp}`})
-        // dealSelectFiles(image)
+        });
       } else {
         (0, _requestApi.saveBrowserIcon)(cropper).then(function (resp) {
           if (resp.Code === 1) {
@@ -210,83 +191,6 @@ var ChangePhoto = function ChangePhoto(props) {
     }
   };
 
-  var _useState13 = (0, _react.useState)(),
-      _useState14 = _slicedToArray(_useState13, 2),
-      uploadSuccessFile = _useState14[0],
-      setUploadSuccessFile = _useState14[1];
-
-  var dealSelectFiles = function dealSelectFiles(uploadSelectFile) {
-    var uploadStartFiles = []; // 开始上传的文件
-
-    var formData = new FormData(); // FormData 对象
-
-    var uploadStartFile;
-    var timestamp = new Date().getTime(); // 给每个文件加一个时间戳
-    // let uploadFileType = uploadSelectFile.name.substring(uploadSelectFile.name.lastIndexOf('.') + 1);
-
-    uploadStartFile = {
-      FileName: uploadSelectFile.name,
-      // FileType: _dealAttachmentType(uploadFileType).FileType,
-      FileSize: uploadSelectFile.size,
-      FileLastModified: uploadSelectFile.lastModified,
-      // IsImage: _dealAttachmentType(uploadFileType).IsImage,
-      percentComplete: 0,
-      uploadStatus: 1,
-      // 开始上传
-      IsSuccess: false,
-      uid: (0, _uuid["default"])(),
-      _smallImageUrl: '',
-      _bigImageUrl: '',
-      MediaType: '',
-      UserId: 0,
-      MaxDocCount: 0,
-      DfsPath: '',
-      ClientUrl: '',
-      SmallImageUrl: '',
-      BigImageUrl: '',
-      DownloadUrl: '',
-      Msg: '',
-      AllowUploadAttachmentSize: 50,
-      Deleteable: true,
-      requestXHR: new XMLHttpRequest() //在这创建是为了取消用
-
-    }; // uploadStartFiles.push(uploadStartFile);
-    // _dealUploadStart(uploadStartFiles); // 处理开始上传的文件
-
-    formData.append('file', uploadSelectFile);
-    var url = "".concat(apiServer, "/api/v1/").concat(tenantId, "/").concat(userid, "/tenant/update/logo");
-
-    _dealUploadXHRRequest(formData, url, uploadStartFile);
-  };
-  /**
-   * 处理文件上传请求
-   *
-   * @formData
-   * @url 上传文件请求地址
-   * @uploadStartFile 上传的文件
-   *
-   * @memberof Upload
-   */
-
-
-  var _dealUploadXHRRequest = function _dealUploadXHRRequest(formData, url, uploadStartFile) {
-    var xhr = uploadStartFile.requestXHR;
-
-    xhr.onreadystatechange = function () {
-      if (xhr.readyState == 4 && xhr.status == 200) {
-        var result = Object.assign({}, _objectSpread({}, JSON.parse(xhr.responseText).Result[0])); // 上传成功接口返回数据
-
-        result.percentComplete = 100;
-        result.IsSuccess = !!result.IsSuccess;
-        result.uploadStatus = result.IsSuccess ? 3 : 4; // 3上传成功；4上传失败
-        // _dealUploadSuccess({ ...uploadStartFile, ...result });
-      }
-    };
-
-    xhr.open('POST', url, true);
-    xhr.send(formData); //开始上传，发送form数据
-  };
-
   var handleEnterAgain = function handleEnterAgain() {
     setIsEnter(true);
   };
@@ -372,15 +276,12 @@ var ChangePhoto = function ChangePhoto(props) {
     responsive: true,
     autoCropArea: item === null || item === void 0 ? void 0 : item.autoCropArea,
     checkOrientation: true,
-    minCropBoxHeight: 10,
-    minCropBoxWidth: 10,
+    minCropBoxHeight: item === null || item === void 0 ? void 0 : item.minCropBoxHeight,
+    minCropBoxWidth: item === null || item === void 0 ? void 0 : item.minCropBoxWidth,
     initialAspectRatio: item === null || item === void 0 ? void 0 : item.initialAspectRatio,
     guides: true,
     preview: ".img-preview",
-    ref: cropperRef // onInitialized={(instance) => {
-    // 	setCropper(instance);
-    // }}
-    ,
+    ref: cropperRef,
     crop: onCrop
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__preview-box"), _defineProperty({}, "".concat(preCls, "__preview-box-bgc"), type === "enterprise"), _defineProperty({}, "".concat(preCls, "__preview-box-browser"), type === "browser"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.8.01",
+  "version": "1.8.5",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/form/form-fields/input/index.tsx

@@ -110,10 +110,10 @@ export default forwardRef((props: Props, ref) => {
   }))
 
   return <div className={classNames(preCls,{[`${preCls}-row`]:layout==='row'},className)}>
-    <div className={classNames(`${preCls}__label`)}>
+    {!!label && <div className={classNames(`${preCls}__label`)}>
       <span className={classNames(`${preCls}__label-text`)}>{label}</span>
       {require && <span className={classNames(`${preCls}__label-require`)}>*</span>}
-    </div>
+    </div>}
     <div className={classNames(`${preCls}__border`, {
       [`${preCls}__border--error`]: hasError,
       [`${preCls}__border--active`]: hasActive,

package/src/components/table/index.scss

@@ -9,6 +9,7 @@
   &__table {
     width: 100%;
     overflow: auto;
+    min-height: 200px;
     &-pagination {
       padding: 10px 0 0 0;
       display: flex;

package/src/components/upload-photo-modal/constant.ts

@@ -3,10 +3,12 @@ export const List = [
 	{
 		id: 'person',
 		accept: '.jpg,.jpeg,.gif,.png',
-		autoCropArea: 0.5,
+		autoCropArea: 1,
 		initialAspectRatio: 1,
 		tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
 		previewTitle: '预览',
+    minCropBoxHeight: 200,
+    minCropBoxWidth: 200,
 	},
   {
 		id: 'enterprise',
@@ -15,6 +17,8 @@ export const List = [
 		initialAspectRatio: 5,
 		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
 		previewTitle: 'logo 预览',
+    minCropBoxHeight: 20,
+    minCropBoxWidth: 20,
 	},
   {
 		id: 'browser',
@@ -23,5 +27,7 @@ export const List = [
 		initialAspectRatio: 1,
 		tips: '图标尺寸 18*18，超过将被浏览器压缩',
 		previewTitle: '浏览器图标预览',
+    minCropBoxHeight: 20,
+    minCropBoxWidth: 20,
 	}
 ];

package/src/components/upload-photo-modal/index.tsx

@@ -4,13 +4,11 @@ import Cropper from 'react-cropper';
 import 'cropperjs/dist/cropper.css';
 import Toast from '../../components/toast';
 import ConditionRender from '../condition-render';
-import { saveUserInfo, saveTenantLogo, saveBrowserIcon, saveUserPhoto } from './request-api';
+import { saveTenantLogo, saveBrowserIcon, saveUserPhoto } from './request-api';
 import Dialog from '../../components/dialog';
 import { List } from './constant'
 import './index.scss';
 import uuid from 'uuid';
-import { rput, rpost } from "../../utils/request";
-import axios from 'axios';
 import { getBSGlobal, getUserInfo, getTenantInfo } from '../../utils/bs-global';
 const apiServer = getBSGlobal("apiPath")
 const userid = getUserInfo().Id;
@@ -33,23 +31,24 @@ const ChangePhoto = (props: Props) => {
 	const [ image, setImage ] = useState('');
 	const [ cropper, setCropper ] = useState<any>();
 	const [ cropData, setCropData ] = useState('#');
-	const [ userInfo, setUserInfo ] = useState({ Avatar: '' });
   const [item] = useState(List.find(item => item.id === type));
   const [isEnter, setIsEnter] = useState(false);
+  const [fileName, setFileName] = useState('')
 
 	const cropperRef = useRef<HTMLImageElement>(null);
 
-	const onChange = (e: any) => {
+	const onChange = (e: any) => {    
 		e.preventDefault();
 		let files;
 		if (e.dataTransfer) {
 			files = e.dataTransfer.files;
 		} else if (e.target) {
 			files = e.target.files;
-		}
-		const reader = new FileReader();
+		}    
+    setFileName(files[0].name)
+		const reader = new FileReader();    
 		reader.onload = () => {
-			setImage(reader.result as any);      
+			setImage(reader.result as any);            
 		};
 		reader.readAsDataURL(files[0]);
 	};
@@ -65,30 +64,24 @@ const ChangePhoto = (props: Props) => {
 }
 
 
-	const onCrop = () => {
-
+	const onCrop = () => {   
 		const imageElement: any = cropperRef.current;
-		const cropper: any = imageElement.cropper;
+		const cropper: any = imageElement.cropper;    
 
 		setCropData(cropper.getCroppedCanvas().toDataURL());
-		setUserInfo(cropper.getCroppedCanvas().toDataURL());
-
-    let base64Url = cropper.getCroppedCanvas().toDataURL();
-
-    const newFile = dataURLtoFile(base64Url, 'test1234');
-    console.log(newFile);
     
+    let base64Url = cropper.getCroppedCanvas().toDataURL();
+        
+    const newFile = dataURLtoFile(base64Url, fileName);    
 
     let formData = new FormData();
 
     formData.append('file', newFile);
 
-    console.log(formData);
     setCropper(formData);
 	};
 
   const handleSaveInfo =  () => {
-    let timestamp = new Date().getTime(); // 给每个文件加一个时间戳
     if (!image) {
       return;
     } else {
@@ -102,8 +95,6 @@ const ChangePhoto = (props: Props) => {
           }
         });
       } else if(type === "enterprise") {  
-        // console.log(cropper);
-              
         saveTenantLogo( cropper ).then((resp) => {
           if (resp.Code === 1) {
             Toast.Success('保存成功', { canClose: false });
@@ -112,13 +103,6 @@ const ChangePhoto = (props: Props) => {
             Toast.Error(resp.Message, { canClose: false });
           }
         });
-        // axios({headers: {
-        //   'Content-Type': 'multipart/form-data',
-        // },
-        // method: 'post',
-        // data: cropper,
-        // url: `${apiServer}/api/v1/${tenantId}/${userid}/tenant/update/logo?format=json&timestamp=${timestamp}`})
-        // dealSelectFiles(image)
       }  else {
         saveBrowserIcon( cropper ).then((resp) => {
           if (resp.Code === 1) {
@@ -132,74 +116,6 @@ const ChangePhoto = (props: Props) => {
     }
   };
 
-  const [uploadSuccessFile, setUploadSuccessFile] = useState();
-
-
-  const dealSelectFiles = (uploadSelectFile) => {
-
-    let uploadStartFiles = []; // 开始上传的文件
-      let formData = new FormData(); // FormData 对象
-      let uploadStartFile;
-      let timestamp = new Date().getTime(); // 给每个文件加一个时间戳
-      // let uploadFileType = uploadSelectFile.name.substring(uploadSelectFile.name.lastIndexOf('.') + 1);
-
-      uploadStartFile = {
-        FileName: uploadSelectFile.name,
-        // FileType: _dealAttachmentType(uploadFileType).FileType,
-        FileSize: uploadSelectFile.size,
-        FileLastModified: uploadSelectFile.lastModified,
-        // IsImage: _dealAttachmentType(uploadFileType).IsImage,
-        percentComplete: 0,
-        uploadStatus: 1, // 开始上传
-        IsSuccess: false,
-        uid: uuid(),
-        _smallImageUrl: '',
-        _bigImageUrl: '',
-        MediaType: '',
-        UserId: 0,
-        MaxDocCount: 0,
-        DfsPath: '',
-        ClientUrl: '',
-        SmallImageUrl: '',
-        BigImageUrl: '',
-        DownloadUrl: '',
-        Msg: '',
-        AllowUploadAttachmentSize: 50,
-        Deleteable: true,
-        requestXHR: new XMLHttpRequest(), //在这创建是为了取消用
-      };
-
-      // uploadStartFiles.push(uploadStartFile);
-      // _dealUploadStart(uploadStartFiles); // 处理开始上传的文件
-      formData.append('file', uploadSelectFile);
-      let url = `${apiServer}/api/v1/${tenantId}/${userid}/tenant/update/logo`;
-      _dealUploadXHRRequest(formData, url, uploadStartFile);
-  };
-
-  /**
-   * 处理文件上传请求
-   *
-   * @formData
-   * @url 上传文件请求地址
-   * @uploadStartFile 上传的文件
-   *
-   * @memberof Upload
-   */
-  const _dealUploadXHRRequest = (formData: any, url: string, uploadStartFile) => {
-    let xhr = uploadStartFile.requestXHR;
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState == 4 && xhr.status == 200) {
-        let result = Object.assign({}, { ...JSON.parse(xhr.responseText).Result[0] }); // 上传成功接口返回数据
-        result.percentComplete = 100;
-        result.IsSuccess = !!result.IsSuccess;
-        result.uploadStatus = result.IsSuccess ? 3 : 4; // 3上传成功；4上传失败
-        // _dealUploadSuccess({ ...uploadStartFile, ...result });
-      }
-    };
-    xhr.open('POST', url, true);
-    xhr.send(formData); //开始上传，发送form数据
-  };
-
   const handleEnterAgain = () => {
     setIsEnter(true);
   }
@@ -277,15 +193,12 @@ const ChangePhoto = (props: Props) => {
 							responsive={true}
 							autoCropArea={item?.autoCropArea}
 							checkOrientation={true}
-							minCropBoxHeight={10}
-							minCropBoxWidth={10}
+							minCropBoxHeight={item?.minCropBoxHeight}
+							minCropBoxWidth={item?.minCropBoxWidth}
 							initialAspectRatio={item?.initialAspectRatio}
 							guides={true}
 							preview=".img-preview"
 							ref={cropperRef}
-							// onInitialized={(instance) => {
-							// 	setCropper(instance);
-							// }}
 							crop={onCrop}
 						/>
 						<div className={classNames(`${preCls}__preview-box`, {[`${preCls}__preview-box-bgc`]:type === "enterprise"}, {[`${preCls}__preview-box-browser`]:type === "browser"})}>