@ccs-ui/rc-pro 2.4.6 → 2.4.7-beta.2

package/es/pro-table/tree.d.ts

@@ -1,7 +1,7 @@
 import { TableProps } from 'antd';
 import { TableSticky } from 'rc-table/lib/interface';
 import { RefObject } from 'react';
-import { TableFieldNames } from '../ccs';
+import { AppFieldNames } from '../ccs';
 import { ProTableProps, TableData, TreeInstance } from './_api';
 import { TableRefType } from './table';
 type TreeTableProps<T> = Pick<ProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode' | 'onEvent'> & {
@@ -12,8 +12,7 @@ type TreeTableProps<T> = Pick<ProTableProps<T>, 'table' | 'parentFieldName' | 'l
     tableRef: React.MutableRefObject<TableRefType | undefined>;
     tableContentRef: React.RefObject<HTMLDivElement>;
     setData: React.Dispatch<React.SetStateAction<TableData<T>>>;
-    handlePageChange: any;
-    fieldNames?: Pick<TableFieldNames, 'dataSource'>;
+    fieldNames?: AppFieldNames['base'];
 };
 declare const TableTree: <T extends object = any>(props: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default TableTree;

package/es/pro-table/tree.js

@@ -20,9 +20,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
-import { useProTableTreeFields } from "../hooks/use-app";
+import { DataEvent } from "../ccs";
+import { useBaseFields } from "../hooks/use-app";
 import { getDataByNamePath } from "../utils";
-import { TableEvent } from "./_api";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TableTree = function TableTree(props) {
   var data = props.data,
@@ -34,7 +34,6 @@ var TableTree = function TableTree(props) {
     tableRowSize = props.tableRowSize,
     tableContentRef = props.tableContentRef,
     parentFieldName = props.parentFieldName,
-    handlePageChange = props.handlePageChange,
     setData = props.setData,
     onEvent = props.onEvent;
   // async tree expand key
@@ -50,7 +49,7 @@ var TableTree = function TableTree(props) {
   var childrenColumnName = (expandable === null || expandable === void 0 ? void 0 : expandable.childrenColumnName) || 'children';
 
   // 接口字段指定全局配置
-  var globalFieldNames = useProTableTreeFields();
+  var globalFieldNames = useBaseFields();
   // 接口字段指定
   var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), props.fieldNames);
 
@@ -104,7 +103,7 @@ var TableTree = function TableTree(props) {
             // 请求结果
             if (requestResult) {
               // 获取table数据
-              dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 判断非叶子节点，添加children
+              dataSource = getDataByNamePath(requestResult, fieldNames.data); // 判断非叶子节点，添加children
               if (leafNode && dataSource && Array.isArray(dataSource)) {
                 dataSource.forEach(function (d) {
                   if (typeof leafNode === 'string' && !d[leafNode]) {
@@ -169,7 +168,7 @@ var TableTree = function TableTree(props) {
       var _record$childrenColum;
       expandKeys.push(expandId);
       if (((_record$childrenColum = record[childrenColumnName]) === null || _record$childrenColum === void 0 ? void 0 : _record$childrenColum.length) > 0) return;
-      onRequestTree(TableEvent.Expand, {}, record);
+      onRequestTree(DataEvent.Expand, {}, record);
     } else {
       setExpandKeys(expandKeys.filter(function (e) {
         return e !== expandId;
@@ -183,7 +182,6 @@ var TableTree = function TableTree(props) {
     expandedRowKeys: expandKeys
   });
   return /*#__PURE__*/_jsx(CcsTable, _objectSpread(_objectSpread({
-    onChange: handlePageChange,
     data: data,
     tableRef: tableRef,
     tableContentRef: tableContentRef

package/es/table/index.js

@@ -13,9 +13,9 @@ import { Table, theme } from 'antd';
 import { ConfigContext } from 'antd/es/config-provider';
 import { useContext, useEffect, useImperativeHandle } from 'react';
 import { Resizable } from 'react-resizable';
-import { CcsEllipsis } from '..';
+import { CcsAtom } from '..';
+import { DataEvent } from "../ccs";
 import useTabs from "../hooks/use-tabs";
-import { TableEvent } from "../pro-table/_api";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var ResizableTitle = function ResizableTitle(props) {
@@ -130,9 +130,9 @@ var CustomTable = function CustomTable(props) {
       onColumnFilter: function onColumnFilter(e) {
         var _props$onEvent;
         columns === null || columns === void 0 || columns.forEach(function (c) {
-          c.hidden = e.columnHiddenKeys.includes(c.dataIndex);
+          c.hidden = e.includes(c.dataIndex);
         });
-        (_props$onEvent = props.onEvent) === null || _props$onEvent === void 0 || _props$onEvent.call(props, TableEvent.ColumnFilter, e);
+        (_props$onEvent = props.onEvent) === null || _props$onEvent === void 0 || _props$onEvent.call(props, DataEvent.ColumnFilter, e);
         update();
       },
       onFixedThead: onFixedThead
@@ -172,7 +172,7 @@ var CustomTable = function CustomTable(props) {
         c.ellipsis = false;
         // 渲染内容
         c.render = function (e) {
-          return /*#__PURE__*/_jsx(CcsEllipsis, _objectSpread({
+          return /*#__PURE__*/_jsx(CcsAtom.Ellipsis, _objectSpread({
             content: e,
             showTooltip: true
           }, ellipsisProps));

package/es/theme-dialog.js

@@ -6,7 +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 { message, Modal, notification } from 'antd';
 import _debounce from 'lodash.debounce';
 var ThemeDialog = /*#__PURE__*/function () {
   function ThemeDialog() {
@@ -71,9 +71,9 @@ var ThemeDialog = /*#__PURE__*/function () {
   return ThemeDialog;
 }();
 _class = ThemeDialog;
-_defineProperty(ThemeDialog, "message", void 0);
-_defineProperty(ThemeDialog, "notice", void 0);
-_defineProperty(ThemeDialog, "modal", void 0);
+_defineProperty(ThemeDialog, "message", message);
+_defineProperty(ThemeDialog, "notice", notification);
+_defineProperty(ThemeDialog, "modal", Modal);
 _defineProperty(ThemeDialog, "easyConfirm", _debounce(_class.confirm, 500, {
   leading: true,
   trailing: false

package/es/upload/_api.d.ts

@@ -13,7 +13,7 @@ type FileValue = {
     /** 文件名称 */
     name: string;
 };
-export type UploadProps = Pick<AntUploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'name' | 'headers'> & {
+export type UploadProps = Pick<AntUploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'name' | 'headers' | 'itemRender' | 'listType'> & {
     /** 最大文件数 */
     maxFileSize?: number;
     /** 上传按钮文本 */
@@ -30,7 +30,19 @@ export type UploadProps = Pick<AntUploadProps, 'maxCount' | 'data' | 'multiple'
 export type FileUploadList = UploadChangeParam['fileList'][0] & {
     fileId?: string;
 };
+export interface ImageInfo {
+    /** 图片名称 */
+    name: string;
+    /** 图片类型 */
+    type: string;
+    /** 图片base64编码 */
+    base64: string;
+    /** 图片链接 */
+    url: string;
+}
 export type UploadImageProps = UploadProps & {
     crop?: boolean;
+    /** 获取base64数据 */
+    onImageInfo?: (info: ImageInfo) => void;
 };
 export {};

package/es/upload/upload-image.d.ts

@@ -1,2 +1,2 @@
 import { UploadImageProps } from './_api';
-export declare function ImageUpload({ uploadText, maxCount, maxFileSize, crop, value, fileDownloadUrl, uploadRequest, onChange, ...otherProps }: UploadImageProps): import("react/jsx-runtime").JSX.Element;
+export declare function ImageUpload({ uploadText, maxCount, maxFileSize, crop, value, fileDownloadUrl, uploadRequest, onChange, onImageInfo, accept, ...otherProps }: UploadImageProps): import("react/jsx-runtime").JSX.Element;

package/es/upload/upload-image.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["uploadText", "maxCount", "maxFileSize", "crop", "value", "fileDownloadUrl", "uploadRequest", "onChange"];
+var _excluded = ["uploadText", "maxCount", "maxFileSize", "crop", "value", "fileDownloadUrl", "uploadRequest", "onChange", "onImageInfo", "accept"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -50,6 +50,9 @@ export function ImageUpload(_ref) {
     fileDownloadUrl = _ref$fileDownloadUrl === void 0 ? '' : _ref$fileDownloadUrl,
     uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
+    onImageInfo = _ref.onImageInfo,
+    _ref$accept = _ref.accept,
+    accept = _ref$accept === void 0 ? 'image/*' : _ref$accept,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(function () {
       return uploadDefaultFlies(value, fileDownloadUrl);
@@ -90,6 +93,11 @@ export function ImageUpload(_ref) {
   // 上传大小检查
   var beforeUpload = function beforeUpload(file) {
     var isLt2M = file.size / 1024 / 1024 < maxFileSize;
+    var isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    if (!isJpgOrPng) {
+      message.error('请选择图片！');
+      return Upload.LIST_IGNORE;
+    }
     if (!isLt2M) {
       message.error("\u56FE\u7247\u4E0D\u80FD\u5927\u4E8E".concat(maxFileSize, "MB!"));
     }
@@ -144,7 +152,7 @@ export function ImageUpload(_ref) {
   // 自定义上传
   var onCustomRequest = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
-      var file, onSuccess, onError, result;
+      var file, onSuccess, onError, result, base64, _ref6, name, type;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -153,10 +161,23 @@ export function ImageUpload(_ref) {
             return uploadRequest(file);
           case 3:
             result = _context2.sent;
-            // 上传成功
-            if (result.success && onSuccess) {
-              onSuccess(result);
+            if (!(result.success && onSuccess)) {
+              _context2.next = 11;
+              break;
             }
+            onSuccess(result);
+            _context2.next = 8;
+            return getBase64(file);
+          case 8:
+            base64 = _context2.sent;
+            _ref6 = file, name = _ref6.name, type = _ref6.type;
+            onImageInfo === null || onImageInfo === void 0 || onImageInfo({
+              base64: base64,
+              name: name,
+              type: type,
+              url: result.data
+            });
+          case 11:
             // 上传失败
             if (!result.success && onError) {
               CcsDialog.message.error(result.msg || '上传失败');
@@ -166,7 +187,7 @@ export function ImageUpload(_ref) {
                 message: result.msg || '上传失败'
               });
             }
-          case 6:
+          case 12:
           case "end":
             return _context2.stop();
         }
@@ -184,7 +205,8 @@ export function ImageUpload(_ref) {
     fileList: files,
     maxCount: maxCount,
     listType: "picture-card",
-    onPreview: handlePreview
+    onPreview: handlePreview,
+    accept: accept
   }, otherProps), {}, {
     children: files.length < maxCount && /*#__PURE__*/_jsxs("div", {
       children: [/*#__PURE__*/_jsx(PlusOutlined, {}), /*#__PURE__*/_jsx("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.4.6",
+  "version": "2.4.7-beta.2",
   "description": "",
   "license": "MIT",
   "author": {
@@ -59,16 +59,30 @@
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-sql": "^6.7.0",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/language": "^6.10.2",
     "@codemirror/lint": "^6.8.1",
+    "@codemirror/view": "^6.38.8",
+    "@lexical/code": "^0.38.2",
+    "@lexical/headless": "^0.38.2",
+    "@lexical/html": "^0.38.2",
+    "@lexical/link": "^0.38.2",
+    "@lexical/list": "^0.38.2",
+    "@lexical/react": "^0.38.2",
+    "@lexical/rich-text": "^0.38.2",
+    "@lexical/selection": "^0.38.2",
+    "@lexical/utils": "^0.38.2",
     "@uiw/react-codemirror": "^4.23.0",
     "antd-img-crop": "^4.12.2",
     "immutability-helper": "^3.1.1",
     "insert-css": "^2.0.0",
+    "lexical": "^0.38.2",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isnil": "^4.0.0",
     "lodash.uniqueid": "^4.0.1",
+    "prismjs": "^1.30.0",
     "react-custom-scrollbars": "^4.2.1",
     "react-draggable": "^4.4.5",
     "react-error-overlay": "^6.0.11",