@ccs-ui/rc-pro 2.0.8 → 2.1.0

package/es/config.js

@@ -11,12 +11,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { darkTheme, defaultTheme } from '@ant-design/compatible';
-import { App, ConfigProvider, message, Modal, notification } from 'antd';
+import { theme as antTheme, App, ConfigProvider, message, Modal, notification } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
 import React, { useState } from 'react';
 import { AppConfigContext } from "./context";
 import usePatchElement from "./dialog/usePatchElement";
 import ThemeDialog from "./theme-dialog";
+import WaterMarkRelative from "./water-mark/relative";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -61,15 +62,22 @@ function AppConfig(_ref) {
   var children = _ref.children,
     _ref$theme = _ref.theme,
     theme = _ref$theme === void 0 ? 'light' : _ref$theme,
+    isCompact = _ref.isCompact,
+    watermark = _ref.watermark,
     themeConfig = _ref.themeConfig;
   var holderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
+  var algorithm = function algorithm() {
+    var algorithms = theme === 'dark' ? [antTheme.darkAlgorithm] : [antTheme.defaultAlgorithm];
+    if (isCompact) {
+      algorithms.push(antTheme.compactAlgorithm);
+    }
+    return algorithms;
+  };
 
   // 合并token
-  var token = _objectSpread(_objectSpread(_objectSpread({}, appTheme.token), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.token), {}, {
-    _appTheme: theme
-  });
+  var token = _objectSpread(_objectSpread({}, appTheme.token), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.token);
 
   // 暗黑模式背景色
   if (theme === 'dark') token.colorBgContainer = 'rgb(36, 37, 37)';
@@ -77,7 +85,8 @@ function AppConfig(_ref) {
     locale: zhCN,
     theme: _objectSpread(_objectSpread({}, appTheme), {}, {
       token: token,
-      components: _objectSpread(_objectSpread({}, appTheme.components), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.components)
+      components: _objectSpread(_objectSpread({}, appTheme.components), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.components),
+      algorithm: algorithm()
     }),
     children: /*#__PURE__*/_jsxs(AppConfigContext.Provider, {
       value: {
@@ -87,7 +96,11 @@ function AppConfig(_ref) {
       },
       children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(ElementsHolder, {
         ref: holderRef
-      }, "modal-drawer-holder")]
+      }, "modal-drawer-holder"), (watermark === null || watermark === void 0 ? void 0 : watermark.content) && /*#__PURE__*/_jsx(WaterMarkRelative, {
+        content: watermark.content,
+        fontColor: "rgba(0,0,0,.15)",
+        zIndex: 105
+      })]
     })
   });
 }

package/es/context/index.d.ts

@@ -4,6 +4,7 @@ import React from 'react';
 import { Location } from 'react-router';
 import CCS from '..';
 import { ElementsHolderRef } from '../dialog/hook';
+import { WaterMarkProps } from '../water-mark/relative';
 type CcsTabsChangeProps = {
     /** 当前激活tab面板的key */
     activeKey?: string;
@@ -52,6 +53,10 @@ type CssAppConfigType = {
     theme?: 'dark' | 'light' | 'colorful';
     /** 主题参数配置 */
     themeConfig?: ThemeConfig;
+    /** 紧凑模式 */
+    isCompact?: boolean;
+    /** 全局水印 */
+    watermark?: WaterMarkProps;
     /** modal or drawer holder */
     holderRef?: React.RefObject<ElementsHolderRef>;
 };

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

package/es/dialog/DialogSelfOkButton.d.ts

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

package/es/dialog/form.js

@@ -44,10 +44,6 @@ var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     },
     preserve: false
   }, restProps), {}, {
-    style: _objectSpread({
-      height: '100%',
-      overflow: 'auto'
-    }, restProps.style),
     children: children
   }));
 });

package/es/editor/javascript.js

@@ -9,8 +9,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { javascript } from '@codemirror/lang-javascript';
 import CodeMirror from '@uiw/react-codemirror';
-import { theme } from 'antd';
 import classNames from 'classnames';
+import useAppConfig from "../hooks/use-app";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function JavaScriptEditor(_ref) {
   var _ref$placeholder = _ref.placeholder,
@@ -22,9 +22,9 @@ export default function JavaScriptEditor(_ref) {
     style = _ref.style,
     className = _ref.className,
     restProps = _objectWithoutProperties(_ref, _excluded);
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
-  var isDark = token._appTheme === 'dark';
+  var _useAppConfig = useAppConfig(),
+    theme = _useAppConfig.theme;
+  var isDark = theme === 'dark';
   var styles = style || {};
   var previewProps = {};
   if (bordered !== false) {

package/es/editor/json.js

@@ -11,8 +11,8 @@ import { json } from '@codemirror/lang-json';
 import { syntaxTree } from '@codemirror/language';
 import { linter } from '@codemirror/lint';
 import CodeMirror from '@uiw/react-codemirror';
-import { theme } from 'antd';
 import classNames from 'classnames';
+import useAppConfig from "../hooks/use-app";
 import { jsx as _jsx } from "react/jsx-runtime";
 var regexpLinter = linter(function (view) {
   var diagnostics = [];
@@ -46,9 +46,9 @@ export default function JsonEditor(_ref) {
     className = _ref.className,
     isPreview = _ref.isPreview,
     restProps = _objectWithoutProperties(_ref, _excluded);
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
-  var isDark = token._appTheme === 'dark';
+  var _useAppConfig = useAppConfig(),
+    theme = _useAppConfig.theme;
+  var isDark = theme === 'dark';
   var styles = style || {};
   var previewProps = {};
   if (bordered !== false) {

package/es/editor/sql.js

@@ -9,8 +9,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { sql } from '@codemirror/lang-sql';
 import CodeMirror from '@uiw/react-codemirror';
-import { theme } from 'antd';
 import classNames from 'classnames';
+import useAppConfig from "../hooks/use-app";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function SqlEditor(_ref) {
   var _ref$placeholder = _ref.placeholder,
@@ -22,9 +22,9 @@ export default function SqlEditor(_ref) {
     style = _ref.style,
     className = _ref.className,
     restProps = _objectWithoutProperties(_ref, _excluded);
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
-  var isDark = token._appTheme === 'dark';
+  var _useAppConfig = useAppConfig(),
+    theme = _useAppConfig.theme;
+  var isDark = theme === 'dark';
   var styles = style || {};
   var previewProps = {};
   if (bordered !== false) {

package/es/hooks/use-app.js

@@ -8,7 +8,7 @@ import { AppConfigContext } from "../context";
 var useAppConfig = function useAppConfig() {
   var context = useContext(AppConfigContext);
   if (context === undefined) {
-    throw new Error('AppConfigContext not found');
+    throw new Error('AppConfigContext not found 未全局使用 CcsAppConfig');
   }
   return context;
 };

package/es/layout-keep-alive/index.js

@@ -14,11 +14,12 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { MoreOutlined } from '@ant-design/icons';
 import CcsUtils from '@ccs-ui/utils';
 import { useUpdate, useUpdateEffect } from 'ahooks';
-import { Button, Dropdown, Empty, Tabs, theme } from 'antd';
+import { Button, Dropdown, Empty, Tabs } from 'antd';
 import classnames from 'classnames';
 import { useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
+import { useAppConfig } from '..';
 import "./index.less";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -45,10 +46,10 @@ export default function KeepAliveTabs(_ref) {
     locationKey = location.key;
   var outlet = useOutlet();
   var update = useUpdate();
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
-  var isDark = token._appTheme === 'dark';
-  var isColorful = token._appTheme === 'colorful';
+  var _useAppConfig = useAppConfig(),
+    theme = _useAppConfig.theme;
+  var isDark = theme === 'dark';
+  var isColorful = theme === 'colorful';
 
   // 超过缓存数量，删除第一个
   if (components.current.length >= maxLen) {

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

@@ -69,8 +69,6 @@ export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & Pro
     };
     /** 父级值字段 */
     parentFieldName?: string;
-    /** 水印文字 */
-    watermark?: string;
     /** ref 回调方法 */
     proRef?: CCS.TableInstanceRef<RecordType>;
     /** 显示序号 */

package/es/pro-table/table.js

@@ -15,12 +15,12 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useSize, useUpdateEffect } from 'ahooks';
-import { Empty, Form, theme } from 'antd';
+import { Empty, Form, theme as antTheme } from 'antd';
 import classNames from 'classnames';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { useAppConfig } from '..';
 import { useCcsPage } from "../";
 import CcsTable from "../table";
-import WaterMarkRelative from "../water-mark/relative";
 import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
 import HeadComponent from "./head";
 import "./index.less";
@@ -50,7 +50,6 @@ var InternalProTable = function InternalProTable(props) {
     proRef = props.proRef,
     toolbar = props.toolbar,
     children = props.children,
-    watermark = props.watermark,
     className = props.className,
     expandForm = props.expandForm,
     searchEvent = props.searchEvent,
@@ -105,9 +104,9 @@ var InternalProTable = function InternalProTable(props) {
     tableRowSize = _useState6[0],
     setTableRowSize = _useState6[1];
   // 暗黑模式
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
-  var isDark = token._appTheme === 'dark';
+  var _useAppConfig = useAppConfig(),
+    theme = _useAppConfig.theme;
+  var isDark = theme === 'dark';
 
   // 权限判断
   var isAuth = useMemo(function () {
@@ -506,6 +505,8 @@ var InternalProTable = function InternalProTable(props) {
     },
     children: toolbarExtra
   });
+  var _antTheme$useToken = antTheme.useToken(),
+    token = _antTheme$useToken.token;
   var rootStyle = styles.root || {};
   if (table !== null && table !== void 0 && table.bordered) {
     rootStyle = _objectSpread({
@@ -515,11 +516,14 @@ var InternalProTable = function InternalProTable(props) {
   }
   var onFullScreen = function onFullScreen(isFull) {
     var _ref4 = containerRef.current || {},
-      classList = _ref4.classList;
+      classList = _ref4.classList,
+      style = _ref4.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
+      style.backgroundColor = token.colorBgContainer;
     } else {
       classList === null || classList === void 0 || classList.remove('css-table-full');
+      style.backgroundColor = 'transparent';
     }
   };
   return /*#__PURE__*/_jsxs("div", {
@@ -528,11 +532,7 @@ var InternalProTable = function InternalProTable(props) {
       overflow: (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? 'hidden' : 'unset'
     }),
     ref: containerRef,
-    children: [watermark && /*#__PURE__*/_jsx(WaterMarkRelative, {
-      content: watermark,
-      fontColor: "rgba(0,0,0,.15)",
-      zIndex: 105
-    }), !(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(HeadComponent, {
+    children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(HeadComponent, {
       form: form,
       toolbar: newToolbar,
       formItems: formItems,

package/es/pro-tabs/index.js

@@ -5,7 +5,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useUpdateEffect } from 'ahooks';
-import { theme } from 'antd';
+import { theme as antTheme } from 'antd';
 import update from 'immutability-helper';
 import { cloneElement, useState } from 'react';
 import { TabsContext } from "../context";
@@ -40,15 +40,15 @@ export default (function (_ref) {
   }, [items === null || items === void 0 ? void 0 : items.map(function (t) {
     return t.key;
   }).join(',')]);
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
+  var _antTheme$useToken = antTheme.useToken(),
+    token = _antTheme$useToken.token;
   var addOptions = {
     items: tabsProps.items,
     className: 'ccs-tabs',
     tabBarStyle: {
       margin: 0,
       paddingLeft: 16,
-      backgroundColor: token._appTheme === 'dark' ? token.colorBgContainer : '#fff'
+      backgroundColor: token.colorBgContainer
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "",
   "license": "MIT",
   "author": {