Merge pull request #2 from ballcat-projects/dev

Dev

Author: lingting

config/config.ts

@@ -47,4 +47,5 @@ export default defineConfig({
   },
   // Fast Refresh 热更新
   fastRefresh: {},
+  extraBabelPlugins: ['react-activation/babel'],
 });

config/settings.ts

@@ -10,6 +10,8 @@ export type ProjectSetting = LayoutSettings & {
   defaultLocal: 'zh-CN' | 'en-US';
   // 是否展示水印
   waterMark: boolean;
+  // 是否展示顶部多页签
+  multiTab: boolean;
   storageOptions: {
     // 缓存key 前缀
     namespace: string;
@@ -33,6 +35,7 @@ const Settings: ProjectSetting = {
   historyType: 'hash',
   defaultLocal: 'zh-CN',
   waterMark: true,
+  multiTab: true,
   storageOptions: {
     namespace: 'ballcat/',
     storage: 'local',

package.json

@@ -49,6 +49,7 @@
     "moment": "^2.25.3",
     "omit.js": "^2.0.2",
     "react": "^17.0.0",
+    "react-activation": "^0.9.4",
     "react-color": "2.19.3",
     "react-cropper": "2.1.8",
     "react-dev-inspector": "^1.1.1",

src/components/Editor/WangEditor.tsx

@@ -24,7 +24,16 @@ export default ({
   );
 
   useEffect(() => {
-    const we = new WangEditor(`#wang-editor-dom`);
+    let we: WangEditor;
+
+    try {
+      we = new WangEditor(`#wang-editor-dom`);
+    } catch (e) {
+      // 组件缓存时. 从有这个组件的页面切换出去会导致这里不停的报错. 找不到 wang-editor-dom Dom.
+      // 这里捕获异常就不管了.  切换回来这个组件会重新渲染
+      return () => {};
+    }
+
     setEditor(we);
     we.config.onchange = (val: string) => update(val);
 

src/components/Form/FullForm.tsx

@@ -5,15 +5,9 @@ import ProForm from '@ant-design/pro-form';
 import type { R } from '@/typings';
 import I18n from '@/utils/I18nUtils';
 import type { FullFormProps } from '.';
+import { defautlTitle } from '.';
 import { Button, Card } from 'antd';
 
-export const defautlTitle = {
-  read: I18n.text('form.read'),
-  edit: I18n.text('form.edit'),
-  create: I18n.text('form.create'),
-  del: I18n.text('form.del'),
-};
-
 const FullForm = <E, P = E>(props: FullFormProps<E, P>) => {
   const {
     formRef: currencyRef,
@@ -65,7 +59,7 @@ const FullForm = <E, P = E>(props: FullFormProps<E, P>) => {
     req?: (body: P) => Promise<R<any>>,
   ) => {
     if (req === undefined) {
-      I18n.error({ key: 'orm.error.request', params: { title: defautlTitle[st] } });
+      I18n.error({ key: 'form.error.request', params: { title: defautlTitle[st] } });
       return Promise.resolve(false);
     }
     setLoading(true);
@@ -121,10 +115,10 @@ const FullForm = <E, P = E>(props: FullFormProps<E, P>) => {
             ];
           },
         }}
-        {...antProps}
         layout="horizontal"
         labelCol={labelCol || { sm: { span: 24 }, md: { span: 4 } }}
         wrapperCol={wrapperCol}
+        {...antProps}
         formRef={formRef}
         onFinish={async (values) => {
           switch (status) {

src/components/Form/ModalForm.tsx

@@ -4,13 +4,7 @@ import type { ProFormInstance } from '@ant-design/pro-form';
 import { ModalForm as AntdModalForm } from '@ant-design/pro-form';
 import type { R } from '@/typings';
 import I18n from '@/utils/I18nUtils';
-
-export const defautlTitle = {
-  read: I18n.text('form.read'),
-  edit: I18n.text('form.edit'),
-  create: I18n.text('form.create'),
-  del: I18n.text('form.del'),
-};
+import { defautlTitle } from '.';
 
 const ModalForm = <E, P = E>(props: ModalFormProps<E, P>) => {
   const {
@@ -45,7 +39,7 @@ const ModalForm = <E, P = E>(props: ModalFormProps<E, P>) => {
     req?: (body: P) => Promise<R<any>>,
   ) => {
     if (req === undefined) {
-      I18n.error({ key: 'orm.error.request', params: { title: defautlTitle[st] } });
+      I18n.error({ key: 'form.error.request', params: { title: defautlTitle[st] } });
       return Promise.resolve(false);
     }
 
@@ -95,13 +89,13 @@ const ModalForm = <E, P = E>(props: ModalFormProps<E, P>) => {
 
   return (
     <AntdModalForm<E>
-      {...antProps}
       width={width}
       layout="horizontal"
       labelCol={labelCol || { sm: { span: 24 }, md: { span: 4 } }}
       wrapperCol={wrapperCol}
-      formRef={formRef}
       title={modalTitle}
+      {...antProps}
+      formRef={formRef}
       visible={visible}
       onVisibleChange={setVisible}
       onFinish={async (values) => {

src/components/Form/index.ts

@@ -4,6 +4,7 @@ import FormDictSelect from './dict/FormDictSelect';
 import FormNumber from './FormNumber';
 import FormGroup from './FormGroup';
 import FormDictCheckbox from './dict/FormDictCheckbox';
+import I18n from '@/utils/I18nUtils';
 
 export * from './typings';
 
@@ -18,4 +19,10 @@ const Form = {
 
 export default Form;
 
-export { ModalForm, FormDictRadio, FormDictSelect, FormNumber };
+const defautlTitle = {
+  read: I18n.text('form.read'),
+  edit: I18n.text('form.edit'),
+  create: I18n.text('form.create'),
+  del: I18n.text('form.del'),
+};
+export { ModalForm, FormDictRadio, FormDictSelect, FormNumber, defautlTitle };

src/components/Inline/index.less

@@ -1,5 +1,4 @@
 import { Component } from 'react';
-import './index.less';
 import type { Route } from '@ant-design/pro-layout/lib/typings';
 
 export type InlineMeta = {
@@ -25,7 +24,12 @@ class Inline extends Component<InlineProps, InlineState> {
   render() {
     const { meta } = this.state;
 
-    return <iframe className="iframe" src={meta.uri} />;
+    return (
+      <iframe
+        style={{ boxSizing: 'border-box', height: '100%', width: '100%', border: '0' }}
+        src={meta.uri}
+      />
+    );
   }
 }
 

src/components/Inline/index.tsx

@@ -16,8 +16,8 @@ for (let i = 0; i < keys.length; i += 1) {
 }
 
 const Lov: React.FC<LovProps> = (props) => {
-  const config = cache[props.keyword];
-  const { value, onChange } = props;
+  const { value, onChange, keyword, overwriteConfig } = props;
+  const config = { ...cache[keyword], ...overwriteConfig };
   const [show, setShow] = useState<boolean>(false);
   const [lovValue, setLovValue] = useState<any>();
   const [modalKey, setModalKey] = useState<number>(1);