@lingxiteam/ebe-utils 0.2.3 → 0.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -6
- package/es/constants.js +7 -0
- package/es/index.js +28 -21
- package/es/node/babel/getRealPath.js +19 -20
- package/es/node/cli.js +6 -14
- package/es/requestQueue.js +3 -3
- package/es/shims.d.ts +2 -2
- package/lib/h5public/src/components/common/BannerModal/index.tsx +11 -30
- package/lib/h5public/src/components/common/DocViewer/DocViewer.tsx +4 -11
- package/lib/h5public/src/components/common/DocViewer/index.tsx +1 -4
- package/lib/h5public/src/components/common/PreviewFile/index.tsx +18 -68
- package/lib/h5public/src/components/factory/package.json +1 -1
- package/lib/h5public/src/components/factory/src/ALink/index.tsx +3 -12
- package/lib/h5public/src/components/factory/src/Accordion/index.less +34 -3
- package/lib/h5public/src/components/factory/src/Accordion/index.tsx +40 -65
- package/lib/h5public/src/components/factory/src/AccordionHeader/index.tsx +1 -9
- package/lib/h5public/src/components/factory/src/AccordionPanel/index.tsx +25 -35
- package/lib/h5public/src/components/factory/src/Animation/index.tsx +3 -12
- package/lib/h5public/src/components/factory/src/Animation/useAnimation.ts +3 -6
- package/lib/h5public/src/components/factory/src/Animation/useStyle.ts +2 -5
- package/lib/h5public/src/components/factory/src/Audio/Audio.tsx +4 -16
- package/lib/h5public/src/components/factory/src/Audio/index.tsx +31 -35
- package/lib/h5public/src/components/factory/src/Audio/loader.tsx +2 -8
- package/lib/h5public/src/components/factory/src/BasicComponents/DFormWrapper/index.tsx +19 -58
- package/lib/h5public/src/components/factory/src/BasicComponents/Empty/empty.tsx +1 -6
- package/lib/h5public/src/components/factory/src/BasicComponents/Empty/index.tsx +1 -1
- package/lib/h5public/src/components/factory/src/BasicComponents/FormItem/index.tsx +2 -6
- package/lib/h5public/src/components/factory/src/BasicComponents/ForwardRef/index.tsx +2 -4
- package/lib/h5public/src/components/factory/src/BasicComponents/Image/index.tsx +2 -6
- package/lib/h5public/src/components/factory/src/BasicComponents/Spin/index.tsx +2 -7
- package/lib/h5public/src/components/factory/src/BasicComponents/SpinComp/index.tsx +1 -1
- package/lib/h5public/src/components/factory/src/BasicComponents/Sticky/index.tsx +1 -1
- package/lib/h5public/src/components/factory/src/BlockSelect/components/ActionView/index.tsx +8 -33
- package/lib/h5public/src/components/factory/src/BlockSelect/components/CheckBox/index.tsx +4 -24
- package/lib/h5public/src/components/factory/src/BlockSelect/components/Icon/index.tsx +5 -20
- package/lib/h5public/src/components/factory/src/BlockSelect/components/NoCheckBox/index.tsx +2 -2
- package/lib/h5public/src/components/factory/src/BlockSelect/index.tsx +24 -90
- package/lib/h5public/src/components/factory/src/Button/index.tsx +3 -6
- package/lib/h5public/src/components/factory/src/Calendar/InnerCalendar.tsx +4 -22
- package/lib/h5public/src/components/factory/src/Card/CardTitle/index.tsx +78 -0
- package/lib/h5public/src/components/factory/src/Card/index.less +20 -1
- package/lib/h5public/src/components/factory/src/Card/index.tsx +41 -51
- package/lib/h5public/src/components/factory/src/CardBody/CardBody.tsx +2 -8
- package/lib/h5public/src/components/factory/src/CardBody/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/CardFooter/CardFooter.tsx +2 -18
- package/lib/h5public/src/components/factory/src/CardFooter/index.tsx +3 -5
- package/lib/h5public/src/components/factory/src/CardFooter/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/Carousel/index.tsx +34 -54
- package/lib/h5public/src/components/factory/src/Condition/index.tsx +1 -8
- package/lib/h5public/src/components/factory/src/DAddressPicker/AddressPicker.tsx +282 -328
- package/lib/h5public/src/components/factory/src/DAddressPicker/index.tsx +38 -54
- package/lib/h5public/src/components/factory/src/DAddressPicker/utils.ts +19 -45
- package/lib/h5public/src/components/factory/src/DCheckbox/index.tsx +6 -29
- package/lib/h5public/src/components/factory/src/DForm/index.tsx +21 -55
- package/lib/h5public/src/components/factory/src/DForm/useFormStatus.tsx +1 -5
- package/lib/h5public/src/components/factory/src/DForm/useMonitor.ts +2 -2
- package/lib/h5public/src/components/factory/src/DGroup/CustomBtn.tsx +22 -39
- package/lib/h5public/src/components/factory/src/DGroup/index.tsx +10 -48
- package/lib/h5public/src/components/factory/src/DGroup/utils/index.ts +1 -6
- package/lib/h5public/src/components/factory/src/DMultiplePicker/index.tsx +64 -84
- package/lib/h5public/src/components/factory/src/DatePicker/InnerDatePicker.tsx +2 -13
- package/lib/h5public/src/components/factory/src/Description/index.less +64 -0
- package/lib/h5public/src/components/factory/src/Description/index.tsx +381 -0
- package/lib/h5public/src/components/factory/src/Description/utils/getLabelSizeMode.ts +39 -0
- package/lib/h5public/src/components/factory/src/DformCustom/Context.tsx +1 -3
- package/lib/h5public/src/components/factory/src/DformCustom/FormCustomField.tsx +6 -22
- package/lib/h5public/src/components/factory/src/DformCustom/index.tsx +3 -17
- package/lib/h5public/src/components/factory/src/DformDate/DatePicker.tsx +11 -34
- package/lib/h5public/src/components/factory/src/DformDate/index.tsx +1 -5
- package/lib/h5public/src/components/factory/src/DformDate/transformProps.tsx +1 -10
- package/lib/h5public/src/components/factory/src/DformFile/FormFile.tsx +102 -169
- package/lib/h5public/src/components/factory/src/DformFile/assets/closeIcon.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/default.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/fileName.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/img.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/js.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/pdf.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/ppt.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/txt.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/word.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/xls.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/assets/zip.png +0 -0
- package/lib/h5public/src/components/factory/src/DformFile/index.tsx +1 -5
- package/lib/h5public/src/components/factory/src/DformFile/transformProps.tsx +1 -2
- package/lib/h5public/src/components/factory/src/DformImagePicker/ImagePicker.tsx +45 -56
- package/lib/h5public/src/components/factory/src/DformImagePicker/index.tsx +39 -66
- package/lib/h5public/src/components/factory/src/DformImagePicker/transformProps.tsx +1 -9
- package/lib/h5public/src/components/factory/src/DformInput/index.tsx +2 -13
- package/lib/h5public/src/components/factory/src/DformInputNumber/FormInputNumber.tsx +227 -248
- package/lib/h5public/src/components/factory/src/DformInputNumber/index.tsx +1 -6
- package/lib/h5public/src/components/factory/src/DformList/FormItem/index.tsx +4 -8
- package/lib/h5public/src/components/factory/src/DformList/Group/index.tsx +1 -3
- package/lib/h5public/src/components/factory/src/DformList/List/index.tsx +1 -9
- package/lib/h5public/src/components/factory/src/DformList/index.tsx +2 -15
- package/lib/h5public/src/components/factory/src/DformPicker/index.less +15 -0
- package/lib/h5public/src/components/factory/src/DformPicker/index.tsx +183 -189
- package/lib/h5public/src/components/factory/src/DformRadio/index.tsx +6 -29
- package/lib/h5public/src/components/factory/src/DformRangePicker/RangePicker.tsx +10 -36
- package/lib/h5public/src/components/factory/src/DformRangePicker/index.tsx +2 -11
- package/lib/h5public/src/components/factory/src/DformRangePicker/transformProps.tsx +1 -9
- package/lib/h5public/src/components/factory/src/DformSelect/index.tsx +90 -126
- package/lib/h5public/src/components/factory/src/DformSwitch/index.tsx +27 -57
- package/lib/h5public/src/components/factory/src/DformTextArea/index.tsx +38 -49
- package/lib/h5public/src/components/factory/src/Divider/LxDashed/index.tsx +5 -22
- package/lib/h5public/src/components/factory/src/Divider/LxSolid/index.tsx +4 -24
- package/lib/h5public/src/components/factory/src/Divider/index.tsx +1 -10
- package/lib/h5public/src/components/factory/src/Donut/Dount.tsx +15 -45
- package/lib/h5public/src/components/factory/src/Donut/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/DynamicDataContainer/YieldMethod.ts +7 -9
- package/lib/h5public/src/components/factory/src/DynamicDataContainer/index.less +34 -42
- package/lib/h5public/src/components/factory/src/DynamicDataContainer/index.tsx +221 -280
- package/lib/h5public/src/components/factory/src/DynamicDataContainer/useDynamicDataContainer.ts +2 -8
- package/lib/h5public/src/components/factory/src/DynamicList/MySwipe/index.tsx +4 -19
- package/lib/h5public/src/components/factory/src/DynamicList/index.tsx +16 -75
- package/lib/h5public/src/components/factory/src/DynamicTable/Table.tsx +463 -507
- package/lib/h5public/src/components/factory/src/DynamicTable/components/HeaderCell.tsx +18 -0
- package/lib/h5public/src/components/factory/src/DynamicTable/components/TypeCells.tsx +29 -90
- package/lib/h5public/src/components/factory/src/DynamicTable/hooks/useCreateColumn.tsx +94 -107
- package/lib/h5public/src/components/factory/src/DynamicTable/hooks/useFormatCell.ts +10 -37
- package/lib/h5public/src/components/factory/src/DynamicTable/hooks/useFormatCell.tsx +277 -0
- package/lib/h5public/src/components/factory/src/DynamicTable/index.less +25 -2
- package/lib/h5public/src/components/factory/src/DynamicTable/index.tsx +1 -3
- package/lib/h5public/src/components/factory/src/DynamicTable/loader.ts +2 -8
- package/lib/h5public/src/components/factory/src/DynamicTable/types/contentStyle.d.ts +2 -0
- package/lib/h5public/src/components/factory/src/DynamicTable/utils/constant.ts +1 -2
- package/lib/h5public/src/components/factory/src/Grid/index.tsx +6 -20
- package/lib/h5public/src/components/factory/src/GroupColumn/GroupColumn.tsx +5 -23
- package/lib/h5public/src/components/factory/src/GroupColumn/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/Icon/index.tsx +11 -54
- package/lib/h5public/src/components/factory/src/Image/BasicImage/index.tsx +6 -40
- package/lib/h5public/src/components/factory/src/Image/File/index.tsx +9 -37
- package/lib/h5public/src/components/factory/src/Image/factoryImage.tsx +1 -9
- package/lib/h5public/src/components/factory/src/Input/BasicInput/index.tsx +6 -18
- package/lib/h5public/src/components/factory/src/Input/BasicTextArea/index.tsx +81 -104
- package/lib/h5public/src/components/factory/src/JSBridgeView/index.tsx +1 -4
- package/lib/h5public/src/components/factory/src/LXLineChart/ChartLine.tsx +1 -11
- package/lib/h5public/src/components/factory/src/LXLineChart/PropsType.ts +3 -28
- package/lib/h5public/src/components/factory/src/LXLineChart/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/LXPieChart/LXPieChart.tsx +1 -10
- package/lib/h5public/src/components/factory/src/LXPieChart/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/LXRadarChart/LXRadarChat.tsx +1 -10
- package/lib/h5public/src/components/factory/src/LXRadarChart/index.tsx +7 -9
- package/lib/h5public/src/components/factory/src/LXRadarChart/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/Layout/Col/index.tsx +3 -5
- package/lib/h5public/src/components/factory/src/Layout/Row/index.tsx +3 -7
- package/lib/h5public/src/components/factory/src/Layout/index.tsx +4 -15
- package/lib/h5public/src/components/factory/src/Layout/useLayout.tsx +2 -2
- package/lib/h5public/src/components/factory/src/Layout/utils/index.ts +2 -6
- package/lib/h5public/src/components/factory/src/LevelView/index.tsx +3 -10
- package/lib/h5public/src/components/factory/src/Line/Line.tsx +3 -19
- package/lib/h5public/src/components/factory/src/Line/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/LineColumn/LineColumn.tsx +2 -4
- package/lib/h5public/src/components/factory/src/LineColumn/PropsType.ts +1 -0
- package/lib/h5public/src/components/factory/src/LineColumn/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/LoadMore/index.tsx +3 -8
- package/lib/h5public/src/components/factory/src/Loop/index.tsx +3 -9
- package/lib/h5public/src/components/factory/src/MultipleProgress/MultipleProgress.tsx +1 -9
- package/lib/h5public/src/components/factory/src/MultipleProgress/PropsType.ts +2 -0
- package/lib/h5public/src/components/factory/src/MultipleProgress/index.tsx +9 -11
- package/lib/h5public/src/components/factory/src/MultipleProgress/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/NoticeBarPlus/index.tsx +45 -59
- package/lib/h5public/src/components/factory/src/Notification/index.tsx +5 -14
- package/lib/h5public/src/components/factory/src/Picker/InnerPicker.tsx +2 -14
- package/lib/h5public/src/components/factory/src/PictureVerifyCode/index.tsx +3 -11
- package/lib/h5public/src/components/factory/src/ProcessTrack/index.tsx +16 -28
- package/lib/h5public/src/components/factory/src/ProgressBar/index.tsx +112 -122
- package/lib/h5public/src/components/factory/src/QRCode/index.tsx +2 -8
- package/lib/h5public/src/components/factory/src/RemoteComponent/assets/iconFailComp.tsx +1 -8
- package/lib/h5public/src/components/factory/src/RemoteComponent/components/FishRender.tsx +4 -11
- package/lib/h5public/src/components/factory/src/RemoteComponent/components/ReactRender.tsx +5 -27
- package/lib/h5public/src/components/factory/src/RemoteComponent/components/VueRender.tsx +4 -11
- package/lib/h5public/src/components/factory/src/RemoteComponent/constant.ts +7 -7
- package/lib/h5public/src/components/factory/src/RemoteComponent/index.tsx +56 -67
- package/lib/h5public/src/components/factory/src/SearchView/index.tsx +197 -232
- package/lib/h5public/src/components/factory/src/Selector/LxSelector.tsx +7 -30
- package/lib/h5public/src/components/factory/src/Selector/index.tsx +1 -6
- package/lib/h5public/src/components/factory/src/SideBar/TabPage.tsx +2 -10
- package/lib/h5public/src/components/factory/src/SideBar/index.tsx +8 -34
- package/lib/h5public/src/components/factory/src/Signature/index.tsx +130 -136
- package/lib/h5public/src/components/factory/src/SingleProgress/SingleProgress.tsx +1 -0
- package/lib/h5public/src/components/factory/src/SingleProgress/index.tsx +3 -5
- package/lib/h5public/src/components/factory/src/SingleProgress/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/SmallColumnar/SmallColumnar.tsx +1 -10
- package/lib/h5public/src/components/factory/src/SmallColumnar/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/StackColumn/StackColumn.tsx +4 -16
- package/lib/h5public/src/components/factory/src/StackColumn/index.tsx +9 -11
- package/lib/h5public/src/components/factory/src/StackColumn/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/Star/index.tsx +13 -2
- package/lib/h5public/src/components/factory/src/StaticTabs/TabBar.tsx +9 -29
- package/lib/h5public/src/components/factory/src/StaticTabs/Tabs/PropsType.tsx +1 -0
- package/lib/h5public/src/components/factory/src/StaticTabs/Tabs/index.tsx +1 -5
- package/lib/h5public/src/components/factory/src/StaticTabs/index.tsx +12 -34
- package/lib/h5public/src/components/factory/src/StepBar/constant/checkcircle.tsx +2 -14
- package/lib/h5public/src/components/factory/src/StepBar/constant/vector.tsx +1 -7
- package/lib/h5public/src/components/factory/src/StepBar/index.tsx +24 -60
- package/lib/h5public/src/components/factory/src/StepProcess/StepItem.tsx +2 -6
- package/lib/h5public/src/components/factory/src/StepProcess/StepProcess.tsx +1 -9
- package/lib/h5public/src/components/factory/src/StepProcess/VStepItem.tsx +3 -10
- package/lib/h5public/src/components/factory/src/StepProcess/index.tsx +25 -34
- package/lib/h5public/src/components/factory/src/StepProcess/loader.tsx +1 -4
- package/lib/h5public/src/components/factory/src/TabBar/TabImage/index.tsx +9 -14
- package/lib/h5public/src/components/factory/src/TabBar/TabPage/index.tsx +7 -11
- package/lib/h5public/src/components/factory/src/TabBar/index.tsx +6 -32
- package/lib/h5public/src/components/factory/src/Table/index.tsx +3 -19
- package/lib/h5public/src/components/factory/src/Text/index.tsx +11 -40
- package/lib/h5public/src/components/factory/src/VerificationCode/index.tsx +195 -279
- package/lib/h5public/src/components/factory/src/VideoPlayer/ViewPlayer.tsx +1 -6
- package/lib/h5public/src/components/factory/src/VideoPlayer/loader.ts +2 -8
- package/lib/h5public/src/components/factory/src/View/index.tsx +6 -24
- package/lib/h5public/src/components/factory/src/View/useStyle.ts +2 -5
- package/lib/h5public/src/components/factory/src/Webview/index.tsx +5 -29
- package/lib/h5public/src/components/factory/src/index.component.ts +4 -1
- package/lib/h5public/src/components/factory/src/utils/ChannelContainer.tsx +15 -36
- package/lib/h5public/src/components/factory/src/utils/CustomModule.tsx +12 -26
- package/lib/h5public/src/components/factory/src/utils/PropType.ts +1 -3
- package/lib/h5public/src/components/factory/src/utils/ahooks/index.ts +1 -9
- package/lib/h5public/src/components/factory/src/utils/ahooks/useDeepCompareEffect.ts +2 -8
- package/lib/h5public/src/components/factory/src/utils/ahooks/useMemoizedFn.ts +1 -4
- package/lib/h5public/src/components/factory/src/utils/ahooks/usePrevious.ts +1 -2
- package/lib/h5public/src/components/factory/src/utils/ahooks/useSafeState.ts +3 -8
- package/lib/h5public/src/components/factory/src/utils/ahooks/useSetState.ts +4 -9
- package/lib/h5public/src/components/factory/src/utils/date.ts +7 -29
- package/lib/h5public/src/components/factory/src/utils/dynamicUtils/DynamicContext.tsx +5 -8
- package/lib/h5public/src/components/factory/src/utils/form.ts +8 -19
- package/lib/h5public/src/components/factory/src/utils/getExportDefaultObj.ts +1 -4
- package/lib/h5public/src/components/factory/src/utils/getImageSize.ts +2 -4
- package/lib/h5public/src/components/factory/src/utils/hooks/useAsyncState.ts +2 -4
- package/lib/h5public/src/components/factory/src/utils/hooks/useCompState.tsx +1 -6
- package/lib/h5public/src/components/factory/src/utils/hooks/useDefaultValue.ts +3 -5
- package/lib/h5public/src/components/factory/src/utils/hooks/useFormItem.ts +67 -35
- package/lib/h5public/src/components/factory/src/utils/hooks/useFuncExpExecute.ts +6 -18
- package/lib/h5public/src/components/factory/src/utils/hooks/useHiddenStyle.ts +1 -5
- package/lib/h5public/src/components/factory/src/utils/hooks/useToggleBoolean.ts +4 -8
- package/lib/h5public/src/components/factory/src/utils/i18n.ts +2 -6
- package/lib/h5public/src/components/factory/src/utils/index.ts +39 -76
- package/lib/h5public/src/components/factory/src/utils/upload.ts +33 -33
- package/lib/h5public/src/components/factory/src/utils/withTransformProps.tsx +3 -8
- package/lib/h5public/src/components/factory/typings.d.ts +1 -4
- package/lib/h5public/src/hooks/usePageForm.ts +13 -19
- package/lib/h5public/src/utils/LcdpSpin/index.tsx +2 -4
- package/lib/h5public/src/utils/formUtils.ts +23 -41
- package/lib/h5public/src/utils/i18n/i18n.ts +2 -6
- package/lib/h5public/src/utils/i18n/locale/app/en_US.ts +6 -12
- package/lib/h5public/src/utils/i18n/locale/base/en_US.ts +50 -112
- package/lib/h5public/src/utils/i18n/locale/base/zh_CN.ts +25 -62
- package/lib/h5public/src/utils/i18n/locale/base/zh_HK.ts +23 -58
- package/lib/h5public/src/utils/i18n/localeMonitor.ts +3 -5
- package/lib/h5public/src/utils/i18n/locales.ts +1 -4
- package/lib/h5public/src/utils/i18n/replaceMessage.ts +1 -5
- package/lib/h5public/src/utils/i18n/useLocale.ts +3 -14
- package/lib/h5public/src/utils/messageApi.ts +18 -26
- package/lib/h5public/src/utils/native.ts +4 -19
- package/lib/node/babel/getAllImportFiles.js +2 -2
- package/lib/node/babel/getRealPath.js +10 -11
- package/lib/node/cli.js +1 -7
- package/lib/node/move.js +1 -1
- package/lib/pcpublic/src/components/common/PreviewFile/index.tsx +32 -105
- package/lib/pcpublic/src/components/common/PreviewFile/utils.ts +5 -15
- package/lib/pcpublic/src/components/pcfactory/package.json +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Alert/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Animation/index.tsx +1 -8
- package/lib/pcpublic/src/components/pcfactory/src/Animation/useAnimation.ts +3 -6
- package/lib/pcpublic/src/components/pcfactory/src/Animation/useBackgroundStyle.ts +2 -4
- package/lib/pcpublic/src/components/pcfactory/src/Audio/index.tsx +9 -54
- package/lib/pcpublic/src/components/pcfactory/src/Button/index.tsx +5 -20
- package/lib/pcpublic/src/components/pcfactory/src/Card/CardTitle/index.tsx +126 -0
- package/lib/pcpublic/src/components/pcfactory/src/Card/index.tsx +38 -32
- package/lib/pcpublic/src/components/pcfactory/src/Card/useExtendBtn.tsx +8 -57
- package/lib/pcpublic/src/components/pcfactory/src/Cascader/index.tsx +50 -102
- package/lib/pcpublic/src/components/pcfactory/src/ChartBar/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/ChartLine/ChartLine.tsx +2 -11
- package/lib/pcpublic/src/components/pcfactory/src/ChartLine/PropsType.ts +3 -28
- package/lib/pcpublic/src/components/pcfactory/src/ChartLine/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Checkbox/index.tsx +7 -19
- package/lib/pcpublic/src/components/pcfactory/src/CheckboxGroup/index.tsx +176 -213
- package/lib/pcpublic/src/components/pcfactory/src/Collapse/index.tsx +14 -29
- package/lib/pcpublic/src/components/pcfactory/src/CollapsePanel/index.tsx +142 -155
- package/lib/pcpublic/src/components/pcfactory/src/Condition/index.tsx +2 -6
- package/lib/pcpublic/src/components/pcfactory/src/DatePicker/index.tsx +182 -459
- package/lib/pcpublic/src/components/pcfactory/src/Description/index.tsx +47 -78
- package/lib/pcpublic/src/components/pcfactory/src/Description/utils/getLabelSizeMode.ts +1 -2
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/CenterLineDivider/index.tsx +39 -76
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/CenterTabDivider/index.tsx +8 -36
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/LeftCardDivider/index.tsx +13 -34
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/LeftLineDivider/index.tsx +8 -28
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/LeftTabDivider/index.tsx +4 -20
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/LeftTopDivider/index.tsx +5 -24
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/LxDashed/index.tsx +15 -49
- package/lib/pcpublic/src/components/pcfactory/src/Divider/components/LxSolid/index.tsx +6 -36
- package/lib/pcpublic/src/components/pcfactory/src/Divider/index.tsx +3 -17
- package/lib/pcpublic/src/components/pcfactory/src/Dropdown/index.tsx +7 -23
- package/lib/pcpublic/src/components/pcfactory/src/DynamicDataContainer/YieldMethod.ts +7 -9
- package/lib/pcpublic/src/components/pcfactory/src/DynamicDataContainer/index.tsx +212 -264
- package/lib/pcpublic/src/components/pcfactory/src/DynamicDataContainer/useDynamicDataContainer.ts +2 -8
- package/lib/pcpublic/src/components/pcfactory/src/DynamicTabs/PropsType.ts +2 -0
- package/lib/pcpublic/src/components/pcfactory/src/DynamicTabs/TabPage.tsx +2 -10
- package/lib/pcpublic/src/components/pcfactory/src/DynamicTabs/index.tsx +91 -36
- package/lib/pcpublic/src/components/pcfactory/src/Form/Form.tsx +89 -136
- package/lib/pcpublic/src/components/pcfactory/src/Form/useFormStatus.ts +1 -5
- package/lib/pcpublic/src/components/pcfactory/src/Form/useMonitor.ts +2 -2
- package/lib/pcpublic/src/components/pcfactory/src/FormGroup/TitleComp.tsx +7 -36
- package/lib/pcpublic/src/components/pcfactory/src/FormGroup/index.tsx +10 -57
- package/lib/pcpublic/src/components/pcfactory/src/FreeLayout/index.tsx +2 -17
- package/lib/pcpublic/src/components/pcfactory/src/Gantt/Gantt.tsx +41 -166
- package/lib/pcpublic/src/components/pcfactory/src/Gantt/index.tsx +1 -3
- package/lib/pcpublic/src/components/pcfactory/src/Gantt/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/GridView/GridView.tsx +22 -95
- package/lib/pcpublic/src/components/pcfactory/src/GridView/index.tsx +1 -7
- package/lib/pcpublic/src/components/pcfactory/src/GridView/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/HorizontalView/index.tsx +3 -11
- package/lib/pcpublic/src/components/pcfactory/src/Icon/IconED/index.tsx +3 -5
- package/lib/pcpublic/src/components/pcfactory/src/Icon/hooks/index.tsx +13 -69
- package/lib/pcpublic/src/components/pcfactory/src/Icon/index.tsx +2 -10
- package/lib/pcpublic/src/components/pcfactory/src/IconFont/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Img/BasicImage/index.tsx +2 -12
- package/lib/pcpublic/src/components/pcfactory/src/Img/index.tsx +6 -46
- package/lib/pcpublic/src/components/pcfactory/src/Input/index.tsx +14 -56
- package/lib/pcpublic/src/components/pcfactory/src/InputNumber/index.tsx +5 -20
- package/lib/pcpublic/src/components/pcfactory/src/LXPieChart/LXPieChart.tsx +1 -10
- package/lib/pcpublic/src/components/pcfactory/src/LXPieChart/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/LXRadarChart/LXRadarChat.tsx +1 -10
- package/lib/pcpublic/src/components/pcfactory/src/LXRadarChart/index.tsx +7 -9
- package/lib/pcpublic/src/components/pcfactory/src/LXRadarChart/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Layout/index.tsx +10 -13
- package/lib/pcpublic/src/components/pcfactory/src/Layout/utils.ts +3 -8
- package/lib/pcpublic/src/components/pcfactory/src/Link/index.tsx +12 -22
- package/lib/pcpublic/src/components/pcfactory/src/LoopList/IdleView.tsx +32 -0
- package/lib/pcpublic/src/components/pcfactory/src/LoopList/index.tsx +34 -102
- package/lib/pcpublic/src/components/pcfactory/src/LoopList/scheduler.ts +77 -0
- package/lib/pcpublic/src/components/pcfactory/src/Menu/index.tsx +17 -71
- package/lib/pcpublic/src/components/pcfactory/src/ModalSelect/BaseModalSelect.tsx +6 -8
- package/lib/pcpublic/src/components/pcfactory/src/ModalSelect/index.tsx +8 -33
- package/lib/pcpublic/src/components/pcfactory/src/Pagination/index.tsx +4 -9
- package/lib/pcpublic/src/components/pcfactory/src/Password/index.tsx +4 -13
- package/lib/pcpublic/src/components/pcfactory/src/PictureVerifyCode/index.tsx +52 -61
- package/lib/pcpublic/src/components/pcfactory/src/Progress/index.tsx +4 -17
- package/lib/pcpublic/src/components/pcfactory/src/QRCode/index.tsx +3 -12
- package/lib/pcpublic/src/components/pcfactory/src/QuillEditor/QuillEditor.tsx +73 -105
- package/lib/pcpublic/src/components/pcfactory/src/QuillEditor/index.tsx +3 -16
- package/lib/pcpublic/src/components/pcfactory/src/QuillEditor/loader.ts +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/RadarChart/RadarChartHook.ts +8 -22
- package/lib/pcpublic/src/components/pcfactory/src/RadarChart/RadarECharts.tsx +3 -11
- package/lib/pcpublic/src/components/pcfactory/src/RadarChart/index.tsx +7 -9
- package/lib/pcpublic/src/components/pcfactory/src/RadarChart/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Radio/index.tsx +21 -43
- package/lib/pcpublic/src/components/pcfactory/src/Rate/index.tsx +7 -25
- package/lib/pcpublic/src/components/pcfactory/src/ReactECharts/ReactECharts.tsx +41 -148
- package/lib/pcpublic/src/components/pcfactory/src/ReactECharts/index.tsx +11 -17
- package/lib/pcpublic/src/components/pcfactory/src/ReactECharts/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/components/FishRender.tsx +2 -7
- package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/components/ReactRender.tsx +3 -9
- package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/components/VueRender.tsx +2 -7
- package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/constant.ts +7 -7
- package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/index.tsx +53 -64
- package/lib/pcpublic/src/components/pcfactory/src/Result/index.tsx +2 -10
- package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/LcdpUeditorMain.tsx +14 -23
- package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/RichTextEditor.tsx +137 -160
- package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/RichTextEditorMain.tsx +8 -9
- package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/loader.ts +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Row/Row.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Row/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Row/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Select/index.tsx +96 -119
- package/lib/pcpublic/src/components/pcfactory/src/Select/selectUtils.ts +16 -64
- package/lib/pcpublic/src/components/pcfactory/src/Slider/index.tsx +6 -16
- package/lib/pcpublic/src/components/pcfactory/src/StdUpload/UploadItem.tsx +22 -107
- package/lib/pcpublic/src/components/pcfactory/src/StdUpload/index.tsx +103 -186
- package/lib/pcpublic/src/components/pcfactory/src/Steps/constant/checkcircle.tsx +2 -14
- package/lib/pcpublic/src/components/pcfactory/src/Steps/constant/vector.tsx +1 -7
- package/lib/pcpublic/src/components/pcfactory/src/Steps/index.tsx +20 -55
- package/lib/pcpublic/src/components/pcfactory/src/SuperSelect/ComSelect.tsx +58 -101
- package/lib/pcpublic/src/components/pcfactory/src/SuperSelect/index.tsx +11 -31
- package/lib/pcpublic/src/components/pcfactory/src/SuperSelect/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Swiper/index.tsx +9 -23
- package/lib/pcpublic/src/components/pcfactory/src/Switch/index.tsx +12 -40
- package/lib/pcpublic/src/components/pcfactory/src/TabPane/index.tsx +2 -8
- package/lib/pcpublic/src/components/pcfactory/src/Table/BodyCell/index.tsx +21 -38
- package/lib/pcpublic/src/components/pcfactory/src/Table/EditComponent/index.tsx +53 -86
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/GhostTag/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/Hyperlink/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/PointTag/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/PureColourFill/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/PureFadeColourTag/index.tsx +2 -3
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/Thumbnail/index.tsx +27 -51
- package/lib/pcpublic/src/components/pcfactory/src/Table/FormatCell/index.tsx +8 -53
- package/lib/pcpublic/src/components/pcfactory/src/Table/HeaderCell/HeaderCellTitle/index.tsx +2 -3
- package/lib/pcpublic/src/components/pcfactory/src/Table/HeaderCell/index.tsx +18 -4
- package/lib/pcpublic/src/components/pcfactory/src/Table/OperationCell/SingleBtn.tsx +13 -22
- package/lib/pcpublic/src/components/pcfactory/src/Table/OperationCell/index.tsx +78 -150
- package/lib/pcpublic/src/components/pcfactory/src/Table/TableHead/index.tsx +104 -121
- package/lib/pcpublic/src/components/pcfactory/src/Table/TableSummaryRow/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Table/constant.ts +1 -2
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useCMDActions.ts +40 -16
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useCheckStrict.ts +76 -94
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useColumns.tsx +140 -379
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useCommon.ts +3 -11
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useDataSource.ts +39 -54
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useExpandable.tsx +20 -72
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useFilter.tsx +25 -52
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useFormatCell.ts +11 -41
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useFormatCell.tsx +45 -84
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/usePagination.ts +5 -14
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useRowEdit.ts +20 -66
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useRowMerge.ts +3 -9
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useScroll.ts +47 -57
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useSelection.ts +58 -123
- package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useSummaryCol.ts +11 -30
- package/lib/pcpublic/src/components/pcfactory/src/Table/index.tsx +136 -175
- package/lib/pcpublic/src/components/pcfactory/src/Table/types/OperationCell.d.ts +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Table/types/bodyCell.d.ts +1 -6
- package/lib/pcpublic/src/components/pcfactory/src/Table/types/contentStyle.d.ts +1 -0
- package/lib/pcpublic/src/components/pcfactory/src/Table/types/event.d.ts +5 -4
- package/lib/pcpublic/src/components/pcfactory/src/Table/types/headerCell.d.ts +6 -4
- package/lib/pcpublic/src/components/pcfactory/src/Table/types/prop.d.ts +5 -0
- package/lib/pcpublic/src/components/pcfactory/src/Table/utils/SequenceId.ts +2 -2
- package/lib/pcpublic/src/components/pcfactory/src/Table/utils/index.ts +41 -105
- package/lib/pcpublic/src/components/pcfactory/src/Table/utils/indexedDBHelper.ts +5 -12
- package/lib/pcpublic/src/components/pcfactory/src/Tabs/index.tsx +11 -41
- package/lib/pcpublic/src/components/pcfactory/src/Tag/index.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/Text/index.tsx +26 -39
- package/lib/pcpublic/src/components/pcfactory/src/TextArea/ForIETextArea.tsx +4 -13
- package/lib/pcpublic/src/components/pcfactory/src/TextArea/index.tsx +7 -36
- package/lib/pcpublic/src/components/pcfactory/src/TooltipView/TooltipViewED/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/TooltipView/hooks/index.tsx +2 -10
- package/lib/pcpublic/src/components/pcfactory/src/TooltipView/index.tsx +1 -1
- package/lib/pcpublic/src/components/pcfactory/src/Transfer/index.tsx +68 -144
- package/lib/pcpublic/src/components/pcfactory/src/Tree/TreeNodeMenu/index.tsx +6 -20
- package/lib/pcpublic/src/components/pcfactory/src/Tree/index.tsx +157 -329
- package/lib/pcpublic/src/components/pcfactory/src/TreeSelect/index.tsx +99 -188
- package/lib/pcpublic/src/components/pcfactory/src/TreeTable/hooks/useCMDAction.ts +5 -9
- package/lib/pcpublic/src/components/pcfactory/src/TreeTable/hooks/useExpandable.tsx +1 -2
- package/lib/pcpublic/src/components/pcfactory/src/TreeTable/index.tsx +62 -120
- package/lib/pcpublic/src/components/pcfactory/src/Upload/Upload.tsx +79 -107
- package/lib/pcpublic/src/components/pcfactory/src/Upload/index.tsx +7 -16
- package/lib/pcpublic/src/components/pcfactory/src/Upload/loader.tsx +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/VerificationCode/index.tsx +177 -226
- package/lib/pcpublic/src/components/pcfactory/src/VerticalView/index.tsx +3 -11
- package/lib/pcpublic/src/components/pcfactory/src/VideoPlayer/index.tsx +3 -12
- package/lib/pcpublic/src/components/pcfactory/src/View/index.tsx +3 -26
- package/lib/pcpublic/src/components/pcfactory/src/View/useBackgroundStyle.ts +2 -4
- package/lib/pcpublic/src/components/pcfactory/src/WebComponent/WebComponent.tsx +25 -0
- package/lib/pcpublic/src/components/pcfactory/src/WebComponent/index.tsx +10 -0
- package/lib/pcpublic/src/components/pcfactory/src/WebComponent/useWebComponent.ts +162 -0
- package/lib/pcpublic/src/components/pcfactory/src/WebComponent/utils.ts +67 -0
- package/lib/pcpublic/src/components/pcfactory/src/Webview/index.tsx +6 -35
- package/lib/pcpublic/src/components/pcfactory/src/index.component.ts +4 -1
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Card.less +24 -0
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Collapse.less +53 -2
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/DynamicTabs.less +49 -0
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Form.less +7 -0
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Input.less +22 -7
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/LoopList.less +1 -0
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Select.less +63 -4
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/StdUpload.less +18 -12
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Table.less +192 -18
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Tabs.less +29 -0
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/Tree.less +22 -2
- package/lib/pcpublic/src/components/pcfactory/src/styles/components/WebComponent.less +15 -0
- package/lib/pcpublic/src/components/pcfactory/src/styles/index.ued.less +1 -0
- package/lib/pcpublic/src/components/pcfactory/src/utils/ChannelContainer.tsx +20 -41
- package/lib/pcpublic/src/components/pcfactory/src/utils/ChildRender.ts +4 -6
- package/lib/pcpublic/src/components/pcfactory/src/utils/CustomModule.tsx +11 -22
- package/lib/pcpublic/src/components/pcfactory/src/utils/DummyFormContext.ts +3 -5
- package/lib/pcpublic/src/components/pcfactory/src/utils/Empty/empty.tsx +1 -7
- package/lib/pcpublic/src/components/pcfactory/src/utils/Holidays.ts +105 -0
- package/lib/pcpublic/src/components/pcfactory/src/utils/HolidaysList.json +107 -0
- package/lib/pcpublic/src/components/pcfactory/src/utils/WithSyncValue.ts +11 -36
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/index.ts +1 -11
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/useDeepCompareEffect.ts +2 -8
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/useMap.ts +5 -12
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/useMemoizedFn.ts +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/usePrevious.ts +1 -2
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/useSafeState.ts +3 -8
- package/lib/pcpublic/src/components/pcfactory/src/utils/ahooks/useSetState.ts +4 -9
- package/lib/pcpublic/src/components/pcfactory/src/utils/common.ts +22 -51
- package/lib/pcpublic/src/components/pcfactory/src/utils/constant.ts +610 -0
- package/lib/pcpublic/src/components/pcfactory/src/utils/dynamicUtils/DynamicContext.tsx +5 -8
- package/lib/pcpublic/src/components/pcfactory/src/utils/formUtils/FormContext.tsx +14 -15
- package/lib/pcpublic/src/components/pcfactory/src/utils/formUtils/FormFields.tsx +288 -316
- package/lib/pcpublic/src/components/pcfactory/src/utils/formUtils/WrapperContainer.tsx +8 -31
- package/lib/pcpublic/src/components/pcfactory/src/utils/formUtils/cmdHelper.ts +20 -58
- package/lib/pcpublic/src/components/pcfactory/src/utils/formUtils/common.ts +1 -6
- package/lib/pcpublic/src/components/pcfactory/src/utils/generatorDisabledCallback.ts +505 -0
- package/lib/pcpublic/src/components/pcfactory/src/utils/getExportDefaultObj.ts +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useCommonImperativeHandle.ts +18 -18
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useCompState.tsx +2 -10
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useDataMask.ts +23 -31
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useDoubleClick.ts +15 -6
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useFuncExpExecute.ts +6 -18
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useGetStaticAttrData.ts +3 -10
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useHiddenStyle.ts +1 -5
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useInitReactQuill.ts +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useLocale.ts +20 -34
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/usePrintMode.tsx +2 -9
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useRules.ts +75 -20
- package/lib/pcpublic/src/components/pcfactory/src/utils/hooks/useToggleBoolean.ts +4 -8
- package/lib/pcpublic/src/components/pcfactory/src/utils/index.ts +1 -4
- package/lib/pcpublic/src/components/pcfactory/src/utils/polyfill.js +12 -29
- package/lib/pcpublic/src/components/pcfactory/src/utils/renderReadOnly.tsx +7 -20
- package/lib/pcpublic/src/components/pcfactory/typings.d.ts +1 -4
- package/lib/pcpublic/src/hooks/useCompatConfig.ts +1 -0
- package/lib/pcpublic/src/hooks/usePageForm.ts +15 -30
- package/lib/pcpublic/src/utils/LcdpSpin/index.tsx +1 -6
- package/lib/pcpublic/src/utils/exportCustomData/index.tsx +27 -83
- package/lib/pcpublic/src/utils/exportCustomData/tool.ts +20 -64
- package/lib/pcpublic/src/utils/formUtils.ts +24 -69
- package/lib/pcpublic/src/utils/i18n/i18n.ts +2 -6
- package/lib/pcpublic/src/utils/i18n/locale/base/en_US.ts +50 -112
- package/lib/pcpublic/src/utils/i18n/locale/base/zh_CN.ts +25 -62
- package/lib/pcpublic/src/utils/i18n/locale/base/zh_HK.ts +23 -58
- package/lib/pcpublic/src/utils/i18n/locale/pc/en_US.ts +31 -62
- package/lib/pcpublic/src/utils/i18n/locale/pc/zh_CN.ts +5 -10
- package/lib/pcpublic/src/utils/i18n/locale/pc/zh_HK.ts +5 -10
- package/lib/pcpublic/src/utils/i18n/localeMonitor.ts +3 -5
- package/lib/pcpublic/src/utils/i18n/locales.ts +1 -4
- package/lib/pcpublic/src/utils/i18n/replaceMessage.ts +1 -5
- package/lib/pcpublic/src/utils/i18n/useLocale.ts +3 -14
- package/lib/pcpublic/src/utils/messageApi.ts +1 -6
- package/lib/public/src/components/ExpSQLServiceModal/index.tsx +19 -78
- package/lib/public/src/components/IconFont/IconFont.tsx +1 -1
- package/lib/public/src/components/ImportBusiObjModal/index.tsx +110 -315
- package/lib/public/src/components/ProgressComp/ProgressComp.tsx +1 -7
- package/lib/public/src/components/ProgressComp/index.tsx +8 -45
- package/lib/public/src/components/WaterMark/generatorImage.ts +4 -8
- package/lib/public/src/components/WaterMark/index.tsx +4 -8
- package/lib/public/src/components/common/ErrorBoundary/catchErrorBoundary.tsx +9 -32
- package/lib/public/src/components/common/ExpBusiObjModal/index.tsx +219 -273
- package/lib/public/src/hooks/useBaseDataSource.ts +8 -21
- package/lib/public/src/hooks/useExportCustomDataFile.ts +26 -95
- package/lib/public/src/hooks/useLifeCycle.ts +2 -8
- package/lib/public/src/hooks/useSafeState.ts +3 -8
- package/lib/public/src/hooks/useSetState.ts +4 -10
- package/lib/public/src/hooks/useTransSuperObjectParams.ts +7 -12
- package/lib/public/src/pages/_preview/index.tsx +3 -10
- package/lib/public/src/services/README.md +1 -3
- package/lib/public/src/services/api/batchInsert.ts +1 -1
- package/lib/public/src/services/api/engine.ts +10 -24
- package/lib/public/src/services/api/file.ts +6 -16
- package/lib/public/src/services/api/findAppConfig.ts +2 -8
- package/lib/public/src/services/api/getAppFileUrlByFileCode.ts +2 -2
- package/lib/public/src/services/api/getWaterMarkByAppId.ts +1 -4
- package/lib/public/src/services/api/index.ts +9 -17
- package/lib/public/src/services/type.ts +2 -9
- package/lib/public/src/types/index.ts +3 -4
- package/lib/public/src/utils/AwaitHandleData.ts +2 -2
- package/lib/public/src/utils/Context/Container.tsx +12 -16
- package/lib/public/src/utils/Context/context.tsx +6 -11
- package/lib/public/src/utils/LcdpTerminalType.ts +2 -8
- package/lib/public/src/utils/Security/clientCapabilities.ts +3 -7
- package/lib/public/src/utils/Security/config.ts +10 -34
- package/lib/public/src/utils/Security/const.ts +2 -2
- package/lib/public/src/utils/Security/debug/data.ts +2 -5
- package/lib/public/src/utils/Security/encipher/aes.ts +3 -13
- package/lib/public/src/utils/Security/encipher/rsa.ts +2 -10
- package/lib/public/src/utils/Security/encipher/sign.ts +10 -35
- package/lib/public/src/utils/Security/encipher/token.ts +1 -6
- package/lib/public/src/utils/Security/html.ts +1 -6
- package/lib/public/src/utils/Security/httpEncryption.ts +18 -27
- package/lib/public/src/utils/Security/index.ts +1 -5
- package/lib/public/src/utils/Security/requester/fetch.ts +3 -14
- package/lib/public/src/utils/Security/requester/wx.ts +15 -42
- package/lib/public/src/utils/Security/requester/xhr.ts +14 -63
- package/lib/public/src/utils/Security/types.ts +4 -24
- package/lib/public/src/utils/Security/urlEncryption.ts +34 -66
- package/lib/public/src/utils/Security/utils/atob.ts +2 -3
- package/lib/public/src/utils/Security/utils/caseInsensitive.ts +1 -2
- package/lib/public/src/utils/Security/utils/check.ts +4 -17
- package/lib/public/src/utils/Security/utils/cookie.ts +10 -35
- package/lib/public/src/utils/Security/utils/encrypted.ts +26 -85
- package/lib/public/src/utils/Security/utils/storge.ts +1 -0
- package/lib/public/src/utils/Security/utils/url.ts +8 -16
- package/lib/public/src/utils/StateListener.ts +4 -15
- package/lib/public/src/utils/User.ts +1 -1
- package/lib/public/src/utils/array.ts +8 -28
- package/lib/public/src/utils/cmd.ts +33 -130
- package/lib/public/src/utils/dataSource/fetchQuery.ts +5 -29
- package/lib/public/src/utils/engine-utils/exportCustomUtils.ts +7 -22
- package/lib/public/src/utils/engine-utils/previewUtil.ts +4 -7
- package/lib/public/src/utils/functors/AVERAGE.ts +1 -4
- package/lib/public/src/utils/functors/COUNTA.ts +2 -4
- package/lib/public/src/utils/functors/COUNTBLANK.ts +2 -4
- package/lib/public/src/utils/functors/DATAMASK.ts +11 -41
- package/lib/public/src/utils/functors/DATEADD.ts +2 -7
- package/lib/public/src/utils/functors/DATENOW.ts +1 -3
- package/lib/public/src/utils/functors/NUMBER.ts +1 -3
- package/lib/public/src/utils/functors/RANDBETWEEN.ts +1 -3
- package/lib/public/src/utils/functors/types.ts +2 -5
- package/lib/public/src/utils/functors/utils/tools.ts +2 -3
- package/lib/public/src/utils/getSceneCode.ts +4 -18
- package/lib/public/src/utils/historytool.ts +50 -73
- package/lib/public/src/utils/hooks/index.ts +1 -11
- package/lib/public/src/utils/hooks/useMovable.ts +16 -65
- package/lib/public/src/utils/hooks/useReactive.ts +1 -4
- package/lib/public/src/utils/hooks/useRefState.ts +3 -7
- package/lib/public/src/utils/hooks/useSetState.ts +4 -9
- package/lib/public/src/utils/hooks/useStyle.ts +4 -9
- package/lib/public/src/utils/hooks/useTrackedEffect.ts +5 -14
- package/lib/public/src/utils/hooks/useWhyDidYouUpdate.ts +2 -5
- package/lib/public/src/utils/lcdpApi.ts +20 -70
- package/lib/public/src/utils/lcdpBaseApi.ts +8 -18
- package/lib/public/src/utils/platform/type.ts +1 -5
- package/lib/public/src/utils/platform/utils/fileUtils.ts +35 -108
- package/lib/public/src/utils/platform/utils/printUtil.ts +10 -36
- package/lib/public/src/utils/polyfills.ts +1 -1
- package/lib/public/src/utils/popoverUtils.ts +2 -2
- package/lib/public/src/utils/preprocess.ts +6 -16
- package/lib/public/src/utils/sandBoxLoadModule.ts +13 -28
- package/lib/public/src/utils/sandbox/browserCompatible.ts +2 -5
- package/lib/public/src/utils/sandbox/compileCode.ts +1 -1
- package/lib/public/src/utils/sandbox/sandbox.ts +14 -36
- package/lib/public/src/utils/sandbox/sandboxrules.ts +9 -32
- package/lib/public/src/utils/sandbox/utils.ts +1 -3
- package/lib/public/src/utils/service/baseRequest.ts +8 -37
- package/lib/public/src/utils/service/commonFetch.ts +12 -33
- package/lib/public/src/utils/service/defaultResponseInterceptor.ts +5 -23
- package/lib/public/src/utils/service/resolveApiPath.ts +1 -1
- package/lib/public/src/utils/service/urlHelper.ts +4 -12
- package/lib/public/src/utils/svgImage/index.ts +4 -3
- package/lib/public/src/utils/uid.ts +1 -2
- package/lib/public/src/utils/useComponentHoc.ts +9 -16
- package/lib/public/src/utils/useSetState.ts +2 -7
- package/lib/public/src/utils/version.ts +3 -9
- package/lib/public/tsconfig.json +1 -7
- package/package.json +2 -2
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
import { LingxiForwardRef } from '@lingxiteam/types';
|
|
2
2
|
import { Radio as AntdRadio } from 'antd';
|
|
3
3
|
import React, { useEffect, useState } from 'react';
|
|
4
|
-
import {
|
|
5
|
-
FormFields,
|
|
6
|
-
getFieldsProps,
|
|
7
|
-
useCommonImperativeHandle,
|
|
8
|
-
} from '../utils';
|
|
4
|
+
import { FormFields, getFieldsProps, useCommonImperativeHandle } from '../utils';
|
|
9
5
|
import renderReadOnly from '../utils/renderReadOnly';
|
|
10
6
|
|
|
11
7
|
export interface RadioProps {
|
|
@@ -80,11 +76,7 @@ const typeFn: any = {
|
|
|
80
76
|
* @param labelKey
|
|
81
77
|
* @returns
|
|
82
78
|
*/
|
|
83
|
-
export const handleDataSource = (
|
|
84
|
-
dataSource: any[],
|
|
85
|
-
valueKey?: string,
|
|
86
|
-
labelKey?: string,
|
|
87
|
-
) => {
|
|
79
|
+
export const handleDataSource = (dataSource: any[], valueKey?: string, labelKey?: string) => {
|
|
88
80
|
const valueKeys: any = [];
|
|
89
81
|
const newDataSoure: any[] = [];
|
|
90
82
|
if (Array.isArray(dataSource)) {
|
|
@@ -145,24 +137,19 @@ const Radio = LingxiForwardRef<any, RadioProps>((props, ref) => {
|
|
|
145
137
|
...restProps
|
|
146
138
|
} = props;
|
|
147
139
|
const [dataSource, setDataSource] = useState<any[]>([]);
|
|
148
|
-
const { formFieldsRef, disabled, readOnly, required, finalRules } =
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
data.labelKey,
|
|
162
|
-
);
|
|
163
|
-
setDataSource(newData);
|
|
164
|
-
},
|
|
165
|
-
});
|
|
140
|
+
const { formFieldsRef, disabled, readOnly, required, finalRules } = useCommonImperativeHandle(ref, props, {
|
|
141
|
+
clearValue: undefined,
|
|
142
|
+
// 清空选项
|
|
143
|
+
clearOptions() {
|
|
144
|
+
setDataSource([]);
|
|
145
|
+
},
|
|
146
|
+
setDataWithLabelAndValue(data: any) {
|
|
147
|
+
setLKey(data.labelKey);
|
|
148
|
+
setVKey(data.valueKey);
|
|
149
|
+
const newData = handleDataSource(data.dataSource, data.valueKey, data.labelKey);
|
|
150
|
+
setDataSource(newData);
|
|
151
|
+
},
|
|
152
|
+
});
|
|
166
153
|
|
|
167
154
|
const [lKey, setLKey] = useState(labelKey);
|
|
168
155
|
const [vKey, setVKey] = useState(valueKey);
|
|
@@ -181,10 +168,8 @@ const Radio = LingxiForwardRef<any, RadioProps>((props, ref) => {
|
|
|
181
168
|
|
|
182
169
|
// 处理列表数据
|
|
183
170
|
useEffect(() => {
|
|
184
|
-
const newData = Array.isArray(newDataSoure)
|
|
185
|
-
|
|
186
|
-
: [];
|
|
187
|
-
const valueArray = newData.map((it) => it?.value);
|
|
171
|
+
const newData = Array.isArray(newDataSoure) ? handleDataSource(newDataSoure, vKey, lKey) : [];
|
|
172
|
+
const valueArray = newData.map(it => it?.value);
|
|
188
173
|
const targetDefault: { value: string; label: string }[] = [];
|
|
189
174
|
// 自定义数据中若存在和预置数据中相同的value ,则取自定义数据
|
|
190
175
|
if (defaultOptions && defaultOptions.length) {
|
|
@@ -227,26 +212,19 @@ const Radio = LingxiForwardRef<any, RadioProps>((props, ref) => {
|
|
|
227
212
|
{...restProps}
|
|
228
213
|
value={value}
|
|
229
214
|
defaultValue={defaultValue}
|
|
230
|
-
onChange={
|
|
215
|
+
onChange={e => {
|
|
231
216
|
if (onChange) {
|
|
232
217
|
onChange(e);
|
|
233
218
|
}
|
|
234
219
|
}}
|
|
235
220
|
>
|
|
236
|
-
{(dataSource || []).map(
|
|
221
|
+
{(dataSource || []).map(c => (
|
|
237
222
|
<Opt
|
|
238
223
|
value={transformValueType(c.value, value)}
|
|
239
224
|
key={c.value}
|
|
240
|
-
disabled={
|
|
241
|
-
rangeLimit &&
|
|
242
|
-
rangeLimit.length > 0 &&
|
|
243
|
-
!rangeLimit.includes(+c.value)
|
|
244
|
-
}
|
|
225
|
+
disabled={rangeLimit && rangeLimit.length > 0 && !rangeLimit.includes(+c.value)}
|
|
245
226
|
style={{
|
|
246
|
-
marginRight:
|
|
247
|
-
radioType === 'Radio.Button' && optionMarginRight
|
|
248
|
-
? optionMarginRight
|
|
249
|
-
: '',
|
|
227
|
+
marginRight: radioType === 'Radio.Button' && optionMarginRight ? optionMarginRight : '',
|
|
250
228
|
}}
|
|
251
229
|
>
|
|
252
230
|
{c.label}
|
|
@@ -3,11 +3,7 @@ import { LingxiForwardRef } from '@lingxiteam/types';
|
|
|
3
3
|
import { Rate as AntdRate } from 'antd';
|
|
4
4
|
import type { RateProps } from 'antd/lib/rate';
|
|
5
5
|
import { useCallback, useMemo } from 'react';
|
|
6
|
-
import {
|
|
7
|
-
FormFields,
|
|
8
|
-
getFieldsProps,
|
|
9
|
-
useCommonImperativeHandle,
|
|
10
|
-
} from '../utils';
|
|
6
|
+
import { FormFields, getFieldsProps, useCommonImperativeHandle } from '../utils';
|
|
11
7
|
import { useLocale } from '../utils/hooks/useLocale';
|
|
12
8
|
|
|
13
9
|
export interface MyRateProps {
|
|
@@ -57,13 +53,7 @@ interface BaseRatePropsType {
|
|
|
57
53
|
const rateCls = 'ued-rateContainer';
|
|
58
54
|
|
|
59
55
|
const BaseRate = (props: BaseRatePropsType) => {
|
|
60
|
-
const {
|
|
61
|
-
value: originValue,
|
|
62
|
-
tooltips,
|
|
63
|
-
onChange,
|
|
64
|
-
tooltipType = 'custom',
|
|
65
|
-
...restProps
|
|
66
|
-
} = props;
|
|
56
|
+
const { value: originValue, tooltips, onChange, tooltipType = 'custom', ...restProps } = props;
|
|
67
57
|
|
|
68
58
|
const value = useMemo(() => {
|
|
69
59
|
return Number(originValue);
|
|
@@ -83,9 +73,7 @@ const BaseRate = (props: BaseRatePropsType) => {
|
|
|
83
73
|
// 没有tooltipType代表存量数据,按照自定义展示,向上取整
|
|
84
74
|
case 'custom':
|
|
85
75
|
default:
|
|
86
|
-
return value && tooltips && tooltips.length > value - 1
|
|
87
|
-
? tooltips[Math.ceil(+value) - 1]
|
|
88
|
-
: '';
|
|
76
|
+
return value && tooltips && tooltips.length > value - 1 ? tooltips[Math.ceil(+value) - 1] : '';
|
|
89
77
|
}
|
|
90
78
|
}, [value, tooltips, tooltipType]);
|
|
91
79
|
const myTooltips = useMemo(() => {
|
|
@@ -101,12 +89,7 @@ const BaseRate = (props: BaseRatePropsType) => {
|
|
|
101
89
|
}, [tooltips, tooltipType, restProps.count]);
|
|
102
90
|
return (
|
|
103
91
|
<div className={rateCls}>
|
|
104
|
-
<AntdRate
|
|
105
|
-
{...restProps}
|
|
106
|
-
tooltips={myTooltips}
|
|
107
|
-
value={value}
|
|
108
|
-
onChange={(val) => onStarChange(val)}
|
|
109
|
-
/>
|
|
92
|
+
<AntdRate {...restProps} tooltips={myTooltips} value={value} onChange={val => onStarChange(val)} />
|
|
110
93
|
<span className={`${rateCls}-rateText`}>{rendeRrightTool()}</span>
|
|
111
94
|
</div>
|
|
112
95
|
);
|
|
@@ -150,8 +133,7 @@ const Rate = LingxiForwardRef<any, MyRateProps>((props, ref) => {
|
|
|
150
133
|
|
|
151
134
|
const { getLocale, lang } = useLocale(getEngineApis());
|
|
152
135
|
|
|
153
|
-
const { disabled, required, readOnly, formFieldsRef } =
|
|
154
|
-
useCommonImperativeHandle(ref, props);
|
|
136
|
+
const { disabled, required, readOnly, formFieldsRef } = useCommonImperativeHandle(ref, props);
|
|
155
137
|
|
|
156
138
|
const finalRules = useMemo(
|
|
157
139
|
() => [
|
|
@@ -160,7 +142,7 @@ const Rate = LingxiForwardRef<any, MyRateProps>((props, ref) => {
|
|
|
160
142
|
message: getLocale?.('notEmpty', { name }),
|
|
161
143
|
},
|
|
162
144
|
],
|
|
163
|
-
[required, name, lang]
|
|
145
|
+
[required, name, lang]
|
|
164
146
|
);
|
|
165
147
|
|
|
166
148
|
return (
|
|
@@ -172,7 +154,7 @@ const Rate = LingxiForwardRef<any, MyRateProps>((props, ref) => {
|
|
|
172
154
|
disabled={disabled}
|
|
173
155
|
readOnly={readOnly}
|
|
174
156
|
rules={finalRules}
|
|
175
|
-
handleFormValue={
|
|
157
|
+
handleFormValue={val => {
|
|
176
158
|
if (val !== undefined) {
|
|
177
159
|
return Number(val);
|
|
178
160
|
}
|
|
@@ -50,12 +50,7 @@ function arrayToJSON(arr: any[], val: any, obj: any) {
|
|
|
50
50
|
let temp = result;
|
|
51
51
|
for (const key in arr) {
|
|
52
52
|
let len = 0;
|
|
53
|
-
if (
|
|
54
|
-
arr.some(
|
|
55
|
-
(i) =>
|
|
56
|
-
['LineChart', 'BarChart', 'PieChart', 'RadarChart'].indexOf(i) > -1,
|
|
57
|
-
)
|
|
58
|
-
) {
|
|
53
|
+
if (arr.some(i => ['LineChart', 'BarChart', 'PieChart', 'RadarChart'].indexOf(i) > -1)) {
|
|
59
54
|
if (Number.isNaN(Number(arr[1]))) {
|
|
60
55
|
len = 1;
|
|
61
56
|
} else {
|
|
@@ -118,28 +113,14 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
118
113
|
|
|
119
114
|
const [dataSource, setDataSource] = useListenProps(props.dataSource);
|
|
120
115
|
|
|
121
|
-
const seriesAttr = Object.keys(props).filter(
|
|
122
|
-
const pieSeriesAttr = Object.keys(props).filter(
|
|
123
|
-
|
|
124
|
-
);
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
);
|
|
128
|
-
const
|
|
129
|
-
(i) => i.indexOf('chartsLegend') > -1,
|
|
130
|
-
);
|
|
131
|
-
const xAxisAttr = Object.keys(props).filter(
|
|
132
|
-
(i) => i.indexOf('chartXAxis') > -1,
|
|
133
|
-
);
|
|
134
|
-
const yAxisAttr = Object.keys(props).filter(
|
|
135
|
-
(i) => i.indexOf('chartYAxis') > -1,
|
|
136
|
-
);
|
|
137
|
-
const gridAttr = Object.keys(props).filter(
|
|
138
|
-
(i) => i.indexOf('chartGrid') > -1,
|
|
139
|
-
);
|
|
140
|
-
const tooltipAttr = Object.keys(props).filter(
|
|
141
|
-
(i) => i.indexOf('chartTooltip') > -1,
|
|
142
|
-
);
|
|
116
|
+
const seriesAttr = Object.keys(props).filter(i => i.indexOf('series') > -1);
|
|
117
|
+
const pieSeriesAttr = Object.keys(props).filter(i => i.indexOf('pieSeries') > -1);
|
|
118
|
+
const titleAttr = Object.keys(props).filter(i => i.indexOf('chartTitle') > -1);
|
|
119
|
+
const legendAttr = Object.keys(props).filter(i => i.indexOf('chartsLegend') > -1);
|
|
120
|
+
const xAxisAttr = Object.keys(props).filter(i => i.indexOf('chartXAxis') > -1);
|
|
121
|
+
const yAxisAttr = Object.keys(props).filter(i => i.indexOf('chartYAxis') > -1);
|
|
122
|
+
const gridAttr = Object.keys(props).filter(i => i.indexOf('chartGrid') > -1);
|
|
123
|
+
const tooltipAttr = Object.keys(props).filter(i => i.indexOf('chartTooltip') > -1);
|
|
143
124
|
const finalStyle = useHiddenStyle(visible, style);
|
|
144
125
|
const chartRef = useRef<HTMLDivElement>(null);
|
|
145
126
|
const chartNode = useRef<echarts.EChartsType>();
|
|
@@ -166,22 +147,11 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
166
147
|
}
|
|
167
148
|
if (['bar', 'line'].includes(type)) {
|
|
168
149
|
if (isDataMap) {
|
|
169
|
-
xAxislength = dataMapColumns
|
|
170
|
-
|
|
171
|
-
?.filter((j) => j.indexOf('x') > -1)?.length;
|
|
172
|
-
yAxislength = dataMapColumns
|
|
173
|
-
.map((i) => i.keyVal)
|
|
174
|
-
?.filter((j) => j !== 'key' && j.indexOf('y') > -1)?.length;
|
|
150
|
+
xAxislength = dataMapColumns.map(i => i.keyVal)?.filter(j => j.indexOf('x') > -1)?.length;
|
|
151
|
+
yAxislength = dataMapColumns.map(i => i.keyVal)?.filter(j => j !== 'key' && j.indexOf('y') > -1)?.length;
|
|
175
152
|
} else {
|
|
176
|
-
xAxislength = Array.isArray(chartData)
|
|
177
|
-
|
|
178
|
-
?.length
|
|
179
|
-
: 1;
|
|
180
|
-
yAxislength = Array.isArray(chartData)
|
|
181
|
-
? Object.keys(chartData[0] || {})?.filter(
|
|
182
|
-
(i) => i !== 'key' && i.indexOf('y') > -1,
|
|
183
|
-
)?.length
|
|
184
|
-
: 1;
|
|
153
|
+
xAxislength = Array.isArray(chartData) ? Object.keys(chartData[0] || {})?.filter(i => i.indexOf('x') > -1)?.length : 1;
|
|
154
|
+
yAxislength = Array.isArray(chartData) ? Object.keys(chartData[0] || {})?.filter(i => i !== 'key' && i.indexOf('y') > -1)?.length : 1;
|
|
185
155
|
}
|
|
186
156
|
return {
|
|
187
157
|
datasource: Array.isArray(chartData) ? chartData : [],
|
|
@@ -190,20 +160,12 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
190
160
|
};
|
|
191
161
|
}
|
|
192
162
|
return { datasource: chartData, xAxislen: 1, yAxislen: 1 };
|
|
193
|
-
}, [
|
|
194
|
-
data,
|
|
195
|
-
dataSource,
|
|
196
|
-
chartDataSource,
|
|
197
|
-
relateDataType,
|
|
198
|
-
type,
|
|
199
|
-
dataMapColumns,
|
|
200
|
-
isDataMap,
|
|
201
|
-
]);
|
|
163
|
+
}, [data, dataSource, chartDataSource, relateDataType, type, dataMapColumns, isDataMap]);
|
|
202
164
|
|
|
203
165
|
const transferDataMap: { name?: any; value?: any; x?: any } = useMemo(() => {
|
|
204
166
|
let obj = {};
|
|
205
167
|
if (isDataMap) {
|
|
206
|
-
dataMapColumns.forEach(
|
|
168
|
+
dataMapColumns.forEach(item => {
|
|
207
169
|
obj = {
|
|
208
170
|
...obj,
|
|
209
171
|
[item.keyVal]: item.attrVal,
|
|
@@ -246,9 +208,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
246
208
|
// const xItem0=getNestObj(xAxisAttr.filter((attr) => attr.indexOf(`chartXAxis0`) > -1));
|
|
247
209
|
// const len=xItem0.type === 'value'?yAxislen:xAxislen;
|
|
248
210
|
for (let i = 0; i < yAxisNum; i += 1) {
|
|
249
|
-
const xAxisItem = xAxisAttr.filter(
|
|
250
|
-
(attr) => attr.indexOf(`chartXAxis${i}`) > -1,
|
|
251
|
-
);
|
|
211
|
+
const xAxisItem = xAxisAttr.filter(attr => attr.indexOf(`chartXAxis${i}`) > -1);
|
|
252
212
|
let obj: { type?: string; data?: any[] } = {
|
|
253
213
|
type: 'category',
|
|
254
214
|
...getNestObj(xAxisItem),
|
|
@@ -264,18 +224,13 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
264
224
|
...obj,
|
|
265
225
|
data:
|
|
266
226
|
datasource?.map((j: Record<string, any>) =>
|
|
267
|
-
i < 1
|
|
268
|
-
? j[transferDataMap.x || 'x']
|
|
269
|
-
: j[(transferDataMap as any)[`x${i}`] || `x${i}`],
|
|
227
|
+
i < 1 ? j[transferDataMap.x || 'x'] : j[(transferDataMap as any)[`x${i}`] || `x${i}`]
|
|
270
228
|
) || [],
|
|
271
229
|
};
|
|
272
230
|
} else {
|
|
273
231
|
obj = {
|
|
274
232
|
...obj,
|
|
275
|
-
data:
|
|
276
|
-
datasource?.map((j: Record<string, any>) =>
|
|
277
|
-
i < 1 ? j.x : j[`x${i}`],
|
|
278
|
-
) || [],
|
|
233
|
+
data: datasource?.map((j: Record<string, any>) => (i < 1 ? j.x : j[`x${i}`])) || [],
|
|
279
234
|
};
|
|
280
235
|
}
|
|
281
236
|
}
|
|
@@ -292,9 +247,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
292
247
|
// const yItem0=getNestObj(yAxisAttr.filter((attr) => attr.indexOf(`chartYAxis0`) > -1));
|
|
293
248
|
// const len=yItem0.type === 'category'?xAxislen:yAxislen;
|
|
294
249
|
for (let i = 0; i < yAxisNum; i += 1) {
|
|
295
|
-
const yAxisItem = yAxisAttr.filter(
|
|
296
|
-
(attr) => attr.indexOf(`chartYAxis${i}`) > -1,
|
|
297
|
-
);
|
|
250
|
+
const yAxisItem = yAxisAttr.filter(attr => attr.indexOf(`chartYAxis${i}`) > -1);
|
|
298
251
|
let obj: {
|
|
299
252
|
type?: string;
|
|
300
253
|
axisLabel?: { formatter?: string };
|
|
@@ -323,18 +276,13 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
323
276
|
...obj,
|
|
324
277
|
data:
|
|
325
278
|
datasource?.map((j: Record<string, any>) =>
|
|
326
|
-
i < 1
|
|
327
|
-
? j[transferDataMap.x || 'x']
|
|
328
|
-
: j[(transferDataMap as any)[`x${i}`] || `x${i}`],
|
|
279
|
+
i < 1 ? j[transferDataMap.x || 'x'] : j[(transferDataMap as any)[`x${i}`] || `x${i}`]
|
|
329
280
|
) || [],
|
|
330
281
|
};
|
|
331
282
|
} else {
|
|
332
283
|
obj = {
|
|
333
284
|
...obj,
|
|
334
|
-
data:
|
|
335
|
-
datasource?.map((j: { x: any }) =>
|
|
336
|
-
i < 1 ? j.x : (j as any)[`x${i}`],
|
|
337
|
-
) || [],
|
|
285
|
+
data: datasource?.map((j: { x: any }) => (i < 1 ? j.x : (j as any)[`x${i}`])) || [],
|
|
338
286
|
};
|
|
339
287
|
}
|
|
340
288
|
} else if (+i === +yAxislen) {
|
|
@@ -354,9 +302,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
354
302
|
trigger?: string;
|
|
355
303
|
} = getNestObj(tooltipAttr);
|
|
356
304
|
if (obj.position) {
|
|
357
|
-
obj.position = Array.isArray(obj.position)
|
|
358
|
-
? obj.position
|
|
359
|
-
: obj.position?.split(',') || undefined;
|
|
305
|
+
obj.position = Array.isArray(obj.position) ? obj.position : obj.position?.split(',') || undefined;
|
|
360
306
|
} else {
|
|
361
307
|
obj.position = undefined;
|
|
362
308
|
}
|
|
@@ -373,10 +319,10 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
373
319
|
let item = {};
|
|
374
320
|
if (type === 'pie') {
|
|
375
321
|
const xval = isDataMap ? transferDataMap.name : 'name';
|
|
376
|
-
item = newdata.find(
|
|
322
|
+
item = newdata.find(i => i[xval] === params?.name);
|
|
377
323
|
} else {
|
|
378
324
|
const xval = isDataMap ? transferDataMap.x : 'x';
|
|
379
|
-
item = newdata.find(
|
|
325
|
+
item = newdata.find(i => i[xval] === params?.name);
|
|
380
326
|
}
|
|
381
327
|
formatter = sandBoxSafeRun(`(${obj.formatter})`);
|
|
382
328
|
if (typeof formatter === 'function') {
|
|
@@ -451,19 +397,14 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
451
397
|
if (['bar', 'line'].includes(type)) {
|
|
452
398
|
const series = [];
|
|
453
399
|
for (let i = 0; i < yAxislen; i += 1) {
|
|
454
|
-
const seriesItem = seriesAttr.filter(
|
|
455
|
-
(attr) => attr.indexOf(`series${i}`) > -1,
|
|
456
|
-
);
|
|
400
|
+
const seriesItem = seriesAttr.filter(attr => attr.indexOf(`series${i}`) > -1);
|
|
457
401
|
let obj: SeriesMap = getNestObj(seriesItem);
|
|
458
402
|
obj = {
|
|
459
403
|
type,
|
|
460
404
|
...obj,
|
|
461
405
|
data:
|
|
462
406
|
datasource?.map((j: Record<string, any>) => {
|
|
463
|
-
if (
|
|
464
|
-
Object.prototype.toString.call(chartColor) ===
|
|
465
|
-
'[object Object]'
|
|
466
|
-
) {
|
|
407
|
+
if (Object.prototype.toString.call(chartColor) === '[object Object]') {
|
|
467
408
|
if (chartColor.targetVal) {
|
|
468
409
|
const itemStyle = sandBoxSafeRun(chartColor.targetVal, {
|
|
469
410
|
charItem: j,
|
|
@@ -476,10 +417,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
476
417
|
},
|
|
477
418
|
};
|
|
478
419
|
}
|
|
479
|
-
if (
|
|
480
|
-
Object.prototype.toString.call(itemStyle) ===
|
|
481
|
-
'[object Object]'
|
|
482
|
-
) {
|
|
420
|
+
if (Object.prototype.toString.call(itemStyle) === '[object Object]') {
|
|
483
421
|
return {
|
|
484
422
|
value: j[`y${i}`],
|
|
485
423
|
itemStyle,
|
|
@@ -493,10 +431,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
493
431
|
if (isDataMap) {
|
|
494
432
|
obj.data =
|
|
495
433
|
datasource?.map((j: Record<string, any>) => {
|
|
496
|
-
if (
|
|
497
|
-
Object.prototype.toString.call(chartColor) ===
|
|
498
|
-
'[object Object]'
|
|
499
|
-
) {
|
|
434
|
+
if (Object.prototype.toString.call(chartColor) === '[object Object]') {
|
|
500
435
|
if (chartColor.targetVal) {
|
|
501
436
|
const itemStyle = sandBoxSafeRun(chartColor.targetVal, {
|
|
502
437
|
charItem: j,
|
|
@@ -509,10 +444,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
509
444
|
},
|
|
510
445
|
};
|
|
511
446
|
}
|
|
512
|
-
if (
|
|
513
|
-
Object.prototype.toString.call(itemStyle) ===
|
|
514
|
-
'[object Object]'
|
|
515
|
-
) {
|
|
447
|
+
if (Object.prototype.toString.call(itemStyle) === '[object Object]') {
|
|
516
448
|
return {
|
|
517
449
|
value: j[(transferDataMap as any)[`y${i}`] || `y${i}`],
|
|
518
450
|
itemStyle,
|
|
@@ -523,11 +455,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
523
455
|
return j[(transferDataMap as any)[`y${i}`] || `y${i}`];
|
|
524
456
|
}) || [];
|
|
525
457
|
}
|
|
526
|
-
if (
|
|
527
|
-
obj.areaStyle?.showColor &&
|
|
528
|
-
obj.areaStyle?.color0 &&
|
|
529
|
-
obj.areaStyle?.color1
|
|
530
|
-
) {
|
|
458
|
+
if (obj.areaStyle?.showColor && obj.areaStyle?.color0 && obj.areaStyle?.color1) {
|
|
531
459
|
obj = {
|
|
532
460
|
...obj,
|
|
533
461
|
areaStyle: {
|
|
@@ -568,20 +496,12 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
568
496
|
const newdata = [...datasource];
|
|
569
497
|
let item: any = {};
|
|
570
498
|
const xval = isDataMap ? transferDataMap.x : 'x';
|
|
571
|
-
obj.label.formatter = function (params: {
|
|
572
|
-
name
|
|
573
|
-
|
|
574
|
-
}) {
|
|
575
|
-
item = newdata.find((i) => i[xval] === params.name);
|
|
576
|
-
return item[`percent${i}`]
|
|
577
|
-
? `${item[`percent${i}`]}%`
|
|
578
|
-
: `${params.value}%`;
|
|
499
|
+
obj.label.formatter = function (params: { name: string; value: string }) {
|
|
500
|
+
item = newdata.find(i => i[xval] === params.name);
|
|
501
|
+
return item[`percent${i}`] ? `${item[`percent${i}`]}%` : `${params.value}%`;
|
|
579
502
|
};
|
|
580
503
|
} else if (obj.label?.formatter === 'labvalue') {
|
|
581
|
-
obj.label.formatter = function (param: {
|
|
582
|
-
name: string;
|
|
583
|
-
value: string;
|
|
584
|
-
}) {
|
|
504
|
+
obj.label.formatter = function (param: { name: string; value: string }) {
|
|
585
505
|
return `${param.name}:${param.value}`;
|
|
586
506
|
};
|
|
587
507
|
}
|
|
@@ -597,7 +517,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
597
517
|
let obj: SeriesMap = { type: 'pie' };
|
|
598
518
|
let newDataSource = [...datasource];
|
|
599
519
|
if (isDataMap) {
|
|
600
|
-
newDataSource = newDataSource.map(
|
|
520
|
+
newDataSource = newDataSource.map(item => ({
|
|
601
521
|
name: item[transferDataMap.name || 'name'],
|
|
602
522
|
value: item[transferDataMap.value || 'value'],
|
|
603
523
|
}));
|
|
@@ -607,12 +527,8 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
607
527
|
...getNestObj(pieSeriesAttr),
|
|
608
528
|
data: newDataSource || [],
|
|
609
529
|
};
|
|
610
|
-
obj.radius = Array.isArray(obj.radius)
|
|
611
|
-
|
|
612
|
-
: obj.radius?.split(',') || [0, '75%'];
|
|
613
|
-
obj.center = Array.isArray(obj.center)
|
|
614
|
-
? obj.center
|
|
615
|
-
: obj.center?.split(',') || ['50%', '50%'];
|
|
530
|
+
obj.radius = Array.isArray(obj.radius) ? obj.radius : obj.radius?.split(',') || [0, '75%'];
|
|
531
|
+
obj.center = Array.isArray(obj.center) ? obj.center : obj.center?.split(',') || ['50%', '50%'];
|
|
616
532
|
if (obj.label?.formatter === 'value') {
|
|
617
533
|
obj.label.formatter = function (param: { value: any }) {
|
|
618
534
|
return param.value;
|
|
@@ -622,10 +538,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
622
538
|
} else if (obj.label?.formatter === 'percent') {
|
|
623
539
|
obj.label.formatter = '{d}%';
|
|
624
540
|
} else if (obj.label?.formatter === 'labvalue') {
|
|
625
|
-
obj.label.formatter = function (param: {
|
|
626
|
-
name: string;
|
|
627
|
-
value: string;
|
|
628
|
-
}) {
|
|
541
|
+
obj.label.formatter = function (param: { name: string; value: string }) {
|
|
629
542
|
return `${param.name} ${param.value}`;
|
|
630
543
|
};
|
|
631
544
|
} else if (obj.label?.formatter === 'labpercent') {
|
|
@@ -652,10 +565,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
652
565
|
...chartTooltip,
|
|
653
566
|
},
|
|
654
567
|
};
|
|
655
|
-
if (
|
|
656
|
-
chartColor &&
|
|
657
|
-
Object.prototype.toString.call(chartColor) !== '[object Object]'
|
|
658
|
-
) {
|
|
568
|
+
if (chartColor && Object.prototype.toString.call(chartColor) !== '[object Object]') {
|
|
659
569
|
finalOption = {
|
|
660
570
|
...finalOption,
|
|
661
571
|
color: Array.isArray(chartColor) ? chartColor : chartColor.split(','),
|
|
@@ -663,17 +573,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
663
573
|
} else {
|
|
664
574
|
finalOption = {
|
|
665
575
|
...finalOption,
|
|
666
|
-
color: [
|
|
667
|
-
'#5470c6',
|
|
668
|
-
'#91cc75',
|
|
669
|
-
'#fac858',
|
|
670
|
-
'#ee6666',
|
|
671
|
-
'#73c0de',
|
|
672
|
-
'#3ba272',
|
|
673
|
-
'#fc8452',
|
|
674
|
-
'#9a60b4',
|
|
675
|
-
'#ea7ccc',
|
|
676
|
-
],
|
|
576
|
+
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
|
|
677
577
|
};
|
|
678
578
|
}
|
|
679
579
|
return finalOption;
|
|
@@ -718,14 +618,7 @@ const ReactECharts: LingXiFC<MyReactEChartsProps> = (props, ref) => {
|
|
|
718
618
|
};
|
|
719
619
|
}, []);
|
|
720
620
|
|
|
721
|
-
return (
|
|
722
|
-
<div
|
|
723
|
-
data-compid={(props as any)?.['data-compid']}
|
|
724
|
-
ref={chartRef}
|
|
725
|
-
style={finalStyle}
|
|
726
|
-
className={className}
|
|
727
|
-
/>
|
|
728
|
-
);
|
|
621
|
+
return <div data-compid={(props as any)?.['data-compid']} ref={chartRef} style={finalStyle} className={className} />;
|
|
729
622
|
};
|
|
730
623
|
|
|
731
624
|
export default ReactECharts;
|
|
@@ -3,24 +3,18 @@ import { useImperativeHandle, useState } from 'react';
|
|
|
3
3
|
import ReactEChartsLoader from './loader';
|
|
4
4
|
import { MyReactEChartsProps } from './PropsType';
|
|
5
5
|
|
|
6
|
-
const ReactECharts = LingxiForwardRef<unknown, MyReactEChartsProps>(
|
|
7
|
-
|
|
8
|
-
const [chartDataSource, setChartDataSource] = useState<any[]>();
|
|
6
|
+
const ReactECharts = LingxiForwardRef<unknown, MyReactEChartsProps>((props, ref) => {
|
|
7
|
+
const [chartDataSource, setChartDataSource] = useState<any[]>();
|
|
9
8
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}) => {
|
|
18
|
-
setChartDataSource(tableData?.dataSource || []);
|
|
19
|
-
},
|
|
20
|
-
}));
|
|
9
|
+
useImperativeHandle(ref, () => ({
|
|
10
|
+
// 这里暴漏部分指令方法
|
|
11
|
+
// 由于组件采用懒加载延迟执行组件,导致组件在未加载完成的时候已经执行了页面加载完成的生命周期,所以未来的指令方法不应放入懒加载中,避免页面加载完成时机无法调用指令。
|
|
12
|
+
setTableData: (tableData: { dataSource: any[]; total: any; current: any }) => {
|
|
13
|
+
setChartDataSource(tableData?.dataSource || []);
|
|
14
|
+
},
|
|
15
|
+
}));
|
|
21
16
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
);
|
|
17
|
+
return <ReactEChartsLoader {...props} refDataReload={chartDataSource} />;
|
|
18
|
+
});
|
|
25
19
|
|
|
26
20
|
export default ReactECharts;
|
|
@@ -2,10 +2,7 @@ import Loadable from 'react-loadable';
|
|
|
2
2
|
import { LoadingComponennt } from '../utils/LoaderHelper';
|
|
3
3
|
|
|
4
4
|
const ReactChartsLoader = Loadable({
|
|
5
|
-
loader: async () =>
|
|
6
|
-
(await import(
|
|
7
|
-
/* webpackChunkName: 'pcFactory-ReactECharts' */ './ReactECharts'
|
|
8
|
-
)) as unknown as React.ComponentType<any>,
|
|
5
|
+
loader: async () => (await import(/* webpackChunkName: 'pcFactory-ReactECharts' */ './ReactECharts')) as unknown as React.ComponentType<any>,
|
|
9
6
|
loading: LoadingComponennt,
|
|
10
7
|
});
|
|
11
8
|
|
|
@@ -8,7 +8,7 @@ export interface FishRenderProps {
|
|
|
8
8
|
engineType: 'editor' | 'engine';
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
const FishRender: LingXiFC<FishRenderProps> =
|
|
11
|
+
const FishRender: LingXiFC<FishRenderProps> = props => {
|
|
12
12
|
const { customProps, getEngineApis, engineType, ...restProps } = props;
|
|
13
13
|
const { getLocale = () => 'Fish远程组件加载失败' } = getEngineApis?.() || {};
|
|
14
14
|
return (
|
|
@@ -18,12 +18,7 @@ const FishRender: LingXiFC<FishRenderProps> = (props) => {
|
|
|
18
18
|
moduleProps={customProps}
|
|
19
19
|
onError={console.log}
|
|
20
20
|
loading={() => <Spin />}
|
|
21
|
-
fallback={() => (
|
|
22
|
-
<Empty
|
|
23
|
-
description={getLocale?.('RemoteComponent.fail')}
|
|
24
|
-
image={Empty.PRESENTED_IMAGE_SIMPLE}
|
|
25
|
-
/>
|
|
26
|
-
)}
|
|
21
|
+
fallback={() => <Empty description={getLocale?.('RemoteComponent.fail')} image={Empty.PRESENTED_IMAGE_SIMPLE} />}
|
|
27
22
|
/>
|
|
28
23
|
);
|
|
29
24
|
};
|
package/lib/pcpublic/src/components/pcfactory/src/RemoteComponent/components/ReactRender.tsx
CHANGED
|
@@ -23,9 +23,8 @@ export interface MyRemoteComponentProps {
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
// const prefixCls = 'remoteComponent';
|
|
26
|
-
const RemoteComponent: LingXiFC<MyRemoteComponentProps> =
|
|
27
|
-
const { url, customProps, getEngineApis, name, fieldName, ...restProps } =
|
|
28
|
-
props;
|
|
26
|
+
const RemoteComponent: LingXiFC<MyRemoteComponentProps> = props => {
|
|
27
|
+
const { url, customProps, getEngineApis, name, fieldName, ...restProps } = props;
|
|
29
28
|
|
|
30
29
|
const engineApis = getEngineApis?.() || {};
|
|
31
30
|
|
|
@@ -44,12 +43,7 @@ const RemoteComponent: LingXiFC<MyRemoteComponentProps> = (props) => {
|
|
|
44
43
|
if (err) {
|
|
45
44
|
console.warn('自定义组件报错:', err);
|
|
46
45
|
}
|
|
47
|
-
return (
|
|
48
|
-
<Empty
|
|
49
|
-
description={engineApis?.getLocale?.('RemoteComponent.fail')}
|
|
50
|
-
image={Empty.PRESENTED_IMAGE_SIMPLE}
|
|
51
|
-
/>
|
|
52
|
-
);
|
|
46
|
+
return <Empty description={engineApis?.getLocale?.('RemoteComponent.fail')} image={Empty.PRESENTED_IMAGE_SIMPLE} />;
|
|
53
47
|
}
|
|
54
48
|
return (
|
|
55
49
|
<Component
|
|
@@ -8,7 +8,7 @@ export interface VueRenderProps {
|
|
|
8
8
|
engineType: 'editor' | 'engine';
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
const VueRender: LingXiFC<VueRenderProps> =
|
|
11
|
+
const VueRender: LingXiFC<VueRenderProps> = props => {
|
|
12
12
|
const { url, customProps, engineType, getEngineApis, ...restProps } = props;
|
|
13
13
|
const { getLocale = () => 'Fish远程组件加载失败' } = getEngineApis?.() || {};
|
|
14
14
|
return (
|
|
@@ -19,12 +19,7 @@ const VueRender: LingXiFC<VueRenderProps> = (props) => {
|
|
|
19
19
|
moduleProps={customProps}
|
|
20
20
|
onError={console.log}
|
|
21
21
|
loading={() => <Spin />}
|
|
22
|
-
fallback={() => (
|
|
23
|
-
<Empty
|
|
24
|
-
description={getLocale?.('RemoteComponent.fail')}
|
|
25
|
-
image={Empty.PRESENTED_IMAGE_SIMPLE}
|
|
26
|
-
/>
|
|
27
|
-
)}
|
|
22
|
+
fallback={() => <Empty description={getLocale?.('RemoteComponent.fail')} image={Empty.PRESENTED_IMAGE_SIMPLE} />}
|
|
28
23
|
/>
|
|
29
24
|
);
|
|
30
25
|
};
|