feat: v4.x

.fatherrc.ts

@@ -9,14 +9,14 @@ export default {
   },
   disableTypeCheck: true,
   cssModules: false,
-  // extraBabelPlugins: [
-  //   [
-  //     'babel-plugin-import',
-  //     {
-  //       libraryName: 'antd-mobile-v2',
-  //       libraryDirectory: 'es',
-  //       style: true,
-  //     },
-  //   ],
-  // ],
+  extraBabelPlugins: [
+    [
+      'babel-plugin-import',
+      {
+        libraryName: 'antd-mobile-v2',
+        libraryDirectory: 'es',
+        style: true,
+      },
+    ],
+  ],
 };

package.json

@@ -39,21 +39,23 @@
   },
   "dependencies": {
     "@bang88/china-city-data": "^1.0.0",
+    "antd-mobile": "5.0.0-rc.19",
     "antd-mobile-v2": "2.3.4",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "dayjs": "^1.10.6",
     "lodash": "^4.17.21",
     "rc-field-form": "1.14.0",
-    "rmc-date-picker": "^6.0.10",
     "react-transition-group": "4.4.1",
+    "rmc-date-picker": "^6.0.10",
     "rmc-feedback": "^2.0.0"
   },
   "devDependencies": {
     "@alita/test": "^0.0.4",
     "@babel/core": "^7.16.5",
     "@babel/plugin-transform-runtime": "^7.16.5",
     "@types/lodash": "^4.14.171",
+    "@types/react-transition-group": "4.4.1",
     "alita-test": "4.0.0-alpha.6",
     "babel-plugin-import": "^1.13.3",
     "dumi": "^1.0.16",
@@ -65,7 +67,6 @@
     "postcss-plugin-px2rem": "^0.8.1",
     "prettier": "^2.2.1",
     "react": "^16.12.0",
-    "@types/react-transition-group": "4.4.1",
     "yorkie": "^2.0.0"
   }
 }

src/components/DynamicForm/Dform.tsx → src/baseComponents/DynamicForm/Dform.tsx

@@ -40,7 +40,7 @@ import {
   DformText,
   DformPicker,
   DformFile,
-} from '../';
+} from '../../';
 
 export const FormItemType = {
   input: DformInput,

src/components/DynamicForm/Form.tsx → src/baseComponents/DynamicForm/Form.tsx

@@ -28,7 +28,7 @@ import {
   DformText,
   DformPicker,
   DformFile,
-} from '../';
+} from '../../';
 
 import Title from '../Title';
 

src/components/EditForm/EditForm.tsx → src/baseComponents/EditForm/EditForm.tsx

@@ -23,7 +23,7 @@ import {
   DformCheckBox,
   DformText,
   DformPicker,
-} from '..';
+} from '../../';
 
 const FormItemType = {
   input: DformInput,

src/components/NewFieldPicker/NewFieldPicker.tsx → src/baseComponents/NewFieldPicker/NewFieldPicker.tsx

@@ -1,10 +1,10 @@
-import React, { FC, useState, useEffect } from 'react';
+import React, { FC, useState } from 'react';
 import { Modal, Button, WingBlank, WhiteSpace, List } from 'antd-mobile-v2';
 import copy from 'copy-to-clipboard';
 import Form from 'rc-field-form';
 import { Store, ValidateErrorEntity } from 'rc-field-form/es/interface';
 import EditForm from '../EditForm/EditForm';
-import { getFormItem, DFormData } from '../DynamicForm/Form';
+import { getFormItem } from '../DynamicForm/Form';
 import { IFormItemProps } from '../../PropsType';
 
 interface NewFieldPickerProps {

src/components/AddressPicker/AddressPickerGroup.tsx

@@ -2,7 +2,7 @@ import React, { FC, useState, useEffect, useRef } from 'react';
 import { Modal, List } from 'antd-mobile-v2';
 import classnames from 'classnames';
 import { IAddressPickerProps, valueProps, IModalData } from './interface';
-import TextItem from '../TextItem';
+import TextItem from '../../baseComponents/TextItem';
 import './index.less';
 
 const { Item } = List;

src/components/AddressPicker/index.tsx

@@ -1,6 +1,6 @@
 import React, { FC, useState } from 'react';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import AddressPickerGroup from './AddressPickerGroup';
 import { IAddressPickerProps, valueProps } from './interface';
 import { allPrefixCls } from '../../const/index';

src/components/CoverRadio/index.md

@@ -1,11 +1,11 @@
----
+<!-- ---
 title: CoverRadio(丢弃)
 group:
   title: CoverRadio(丢弃)
 nav:
   title: 组件
   path: /components
----
+--- -->
 
 # CoverRadio
 

src/components/CoverRadio/index.tsx

@@ -2,8 +2,8 @@ import React, { FC, useState, useEffect } from 'react';
 import { Rule } from 'rc-field-form/es/interface';
 import classnames from 'classnames';
 import CoverRadioGroup from './radioGroup';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { IAliasProps } from '../../PropsType';
 import { allPrefixCls } from '../../const/index';
 import './index.less';
@@ -131,7 +131,7 @@ const CoverRadio: FC<ICoverRadioProps> = (props) => {
             rules={[{ required, message: `请选择${title}` }, ...(rules || [])]}
             initialValue={defaultValue}
             formFlag={formFlag}
-            >
+          >
             {showFiled()}
           </Field>
         </div>

src/components/ExtraInput/index.tsx

@@ -3,9 +3,9 @@ import { InputItemPropsType } from 'antd-mobile-v2/es/input-item/PropsType';
 import classnames from 'classnames';
 import { Rule } from 'rc-field-form/es/interface';
 import PickerGroup from '../NomarPicker/NomarPickerGroup';
-import Field from '../Field';
-import Title from '../Title';
-import InputItem from '../InputItem';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
+import InputItem from '../../baseComponents/InputItem';
 import { StringAndUdfEvent } from '../../PropsType';
 import { allPrefixCls } from '../../const/index';
 import './index.less';

src/components/MultiplePicker/index.tsx

@@ -1,8 +1,8 @@
 import React, { FC, useState, useEffect } from 'react';
 import MultiplePickerGroup from './multiplePickerGroup';
 import { IMultiplePickerProps } from './interface';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { allPrefixCls } from '../../const/index';
 import './index.less';
 

src/components/MultiplePicker/multiplePickerGroup.tsx

@@ -2,7 +2,7 @@ import React, { FC, useState, useEffect } from 'react';
 import { Modal, List } from 'antd-mobile-v2';
 import classnames from 'classnames';
 import { IMultiplePickerProps, IDataItem } from './interface';
-import TextItem from '../TextItem';
+import TextItem from '../../baseComponents/TextItem';
 import './index.less';
 
 const { Item } = List;

src/components/NomarCheckBox/index.tsx

@@ -1,8 +1,8 @@
 import React, { FC, useState, useEffect } from 'react';
 import { Rule } from 'rc-field-form/es/interface';
-import Field from '../Field';
-import Title from '../Title';
-import CheckBoxGroup, { IDataItem } from './checkBoxgroup';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
+import CheckBoxGroup, { IDataItem } from './CheckBoxGroup';
 import { IAliasProps } from '../../PropsType';
 import { allPrefixCls } from '../../const/index';
 import './index.less';

src/components/NomarCustom/index.tsx

@@ -1,9 +1,9 @@
 import React, { FC, useState, useEffect } from 'react';
 import { Rule } from 'rc-field-form/es/interface';
 import classnames from 'classnames';
-import Field from '../Field';
-import Title from '../Title';
-import HorizontalTitle from '../HorizontalTitle';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
+import HorizontalTitle from '../../baseComponents/HorizontalTitle';
 import './index.less';
 
 interface INomarCustomPorps {

src/components/NomarDatePicker/DatePickerGroup.tsx

@@ -2,9 +2,9 @@ import React, { FC, useState, useEffect } from 'react';
 import PopupDatePicker from 'rmc-date-picker/lib/Popup';
 import RCDatePicker from 'rmc-date-picker/lib/DatePicker';
 import DatePickerLocale from 'rmc-date-picker/lib/locale/zh_CN';
-import { changeDateFormat } from '../../utils';
+import { changeDateFormat } from '../../utils/tool';
 import { INomarDatePickerGroupProps } from './interface';
-import TextItem from '../TextItem';
+import TextItem from '../../baseComponents/TextItem';
 
 const DatePickerGroup: FC<INomarDatePickerGroupProps> = (props) => {
   const [visible, setVisible] = useState<boolean>(false);

src/components/NomarDatePicker/index.tsx

@@ -1,11 +1,11 @@
 import React, { FC, useState } from 'react';
 import classnames from 'classnames';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { allPrefixCls } from '../../const/index';
 import DatePickerGroup from './DatePickerGroup';
 import { INomarDatePickerProps } from './interface';
-import { changeDateFormat } from '../../utils';
+import { changeDateFormat } from '../../utils/tool';
 
 import './index.less';
 

src/components/NomarFile/index.tsx

@@ -1,6 +1,6 @@
 import React, { FC, ChangeEvent, useState } from 'react';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import FileGroup from './fileGroup';
 import { INomarFileProps, INomarFileItemProps } from './interface';
 import FileIcon from '../../assets/file.png';

src/components/NomarImagePicker/index.tsx

@@ -1,8 +1,8 @@
 import React, { FC } from 'react';
 import ImagePickerGroup from './imagePickerGroup';
 import { ImageFile, INomarImagePickerProps } from './interface';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { allPrefixCls } from '../../const/index';
 import './index.less';
 

src/components/NomarInput/index.tsx

@@ -2,9 +2,9 @@ import React, { FC } from 'react';
 import { InputItemPropsType } from 'antd-mobile-v2/es/input-item/PropsType';
 import { Rule } from 'rc-field-form/es/interface';
 import { StringAndUdfEvent, ClickEvent } from '../../PropsType';
-import InputItem from '../InputItem';
-import Field from '../Field';
-import Title from '../Title';
+import InputItem from '../../baseComponents/InputItem';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { TextItem } from '../..';
 import { allPrefixCls } from '../../const/index';
 

src/components/NomarPicker/NomarPickerGroup.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useState, useEffect } from 'react';
 import { Picker, Toast } from 'antd-mobile-v2';
 import { INomarPickerProps } from './interface';
-import TextItem from '../TextItem';
+import TextItem from '../../baseComponents/TextItem';
 interface INomarPickerGroupProps extends Omit<INomarPickerProps, 'onChange'> {
   onChange: (values: number | string | undefined) => void;
   value?: string | number;

src/components/NomarPicker/index.tsx

@@ -2,8 +2,8 @@ import React, { FC, useState, useEffect } from 'react';
 import PickerGroup from './NomarPickerGroup';
 import { INomarPickerProps } from './interface';
 import { allPrefixCls } from '../../const/index';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 
 const DformPicker: FC<INomarPickerProps> = (props) => {
   const [aliasData, setAliasData] = useState<any[]>([]);

src/components/NomarRadio/index.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useState, useEffect } from 'react';
 import { Rule } from 'rc-field-form/es/interface';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import NomarRadioGroup from './radioGroup';
 import { allPrefixCls } from '../../const/index';
 import { IAliasProps } from '../../PropsType';

src/components/NomarSelect/NomarSelectGroup.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useState, useEffect, useMemo } from 'react';
 import { Picker } from 'antd-mobile-v2';
 import { INomarSelectProps } from './interface';
-import TextItem from '../TextItem';
+import TextItem from '../../baseComponents/TextItem';
 import { is2Dimensionals } from './utils';
 
 interface INomarSelectGroupProps extends Omit<INomarSelectProps, 'onChange'> {

src/components/NomarSelect/index.tsx

@@ -1,8 +1,8 @@
 import React, { FC, useMemo } from 'react';
 import { PickerData } from 'antd-mobile-v2/lib/picker/PropsType';
 import { allPrefixCls } from '../../const/index';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import './index.less';
 import { INomarSelectProps } from './interface';
 import SelectGroup from './NomarSelectGroup';

src/components/NomarSwitch/index.tsx

@@ -3,8 +3,8 @@ import { Switch } from 'antd-mobile-v2';
 import { Rule } from 'rc-field-form/es/interface';
 import { SwitchPropsType } from 'antd-mobile-v2/es/switch/PropsType';
 import { allPrefixCls } from '../../const/index';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import './index.less';
 
 export interface INomarSwitchProps extends SwitchPropsType {

src/components/NomarText/index.md

@@ -1,11 +1,11 @@
----
+<!-- ---
 title: Text(丢弃)
 group:
   title: Text(丢弃)
 nav:
   title: 组件
   path: /components
----
+--- -->
 
 # NomarText
 

src/components/NomarText/index.tsx

@@ -1,8 +1,8 @@
 import React, { FC } from 'react';
 import { Rule } from 'rc-field-form/es/interface';
-import Field from '../Field';
-import Title from '../Title';
-import { TextItem } from '../..';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
+import TextItem from '../../baseComponents/TextItem';
 import { allPrefixCls } from '../../const/index';
 
 export interface INomarTextProps {

src/components/NomarTextArea/index.tsx

@@ -3,8 +3,8 @@ import { TextareaItem } from 'antd-mobile-v2';
 import { Rule } from 'rc-field-form/es/interface';
 import { TextAreaItemPropsType } from 'antd-mobile-v2/es/textarea-item/PropsType';
 import classnames from 'classnames';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { allPrefixCls } from '../../const/index';
 import './index.less';
 

src/components/RangeDatePicker/index.md

@@ -1,11 +1,11 @@
----
+<!-- ---
 title: RangeDatePicker(丢弃)
 group:
   title: RangeDatePicker(丢弃)
 nav:
   title: 组件
   path: /components
----
+--- -->
 
 # RangeDatePicker
 

src/components/RangeDatePicker/index.tsx

@@ -1,10 +1,10 @@
 import React, { FC, useState } from 'react';
 import classnames from 'classnames';
 import { PropsType } from 'antd-mobile-v2/es/date-picker/index';
-import Field from '../Field';
-import Title from '../Title';
+import Field from '../../baseComponents/Field';
+import Title from '../../baseComponents/Title';
 import { INomarDatePickerProps } from '../NomarDatePicker/interface';
-import { changeDateFormat } from '../../utils';
+import { changeDateFormat } from '../../utils/tool';
 import DatePickerGroup from '../NomarDatePicker/DatePickerGroup';
 import { allPrefixCls } from '../../const/index';
 import './index.less';