@mpxjs/webpack-plugin 2.9.62 → 2.9.65

package/lib/runtime/components/react/mpx-navigator.tsx

@@ -8,11 +8,11 @@
  * ✔ delta
  */
 import { View } from 'react-native'
-import { useCallback, forwardRef, JSX } from 'react';
+import { useCallback, forwardRef, JSX } from 'react'
 import useInnerProps from './getInnerListeners'
 import { redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy'
 
-import MpxView, { _ViewProps }  from './mpx-view'
+import MpxView, { _ViewProps } from './mpx-view'
 
 interface _NavigatorProps extends _ViewProps {
   ['open-type']: 'navigate' | 'redirect' | 'switchTab' | 'reLaunch' | 'navigateBack'

package/lib/runtime/components/react/mpx-picker/date.tsx

@@ -4,7 +4,7 @@ import React, { forwardRef, useState, useRef, useEffect } from 'react'
 import useNodesRef, { HandlerRef } from '../useNodesRef' // 引入辅助函数
 import { DateProps, LayoutType } from './type'
 
-function formatTimeStr(time = ''): Date {
+function formatTimeStr (time = ''): Date {
   let [year, month, day]: any = time.split('-')
   year = ~~year || 2000
   month = ~~month || 1
@@ -26,13 +26,13 @@ function dateToString (date: Date, fields: 'day' | 'month' | 'year' = 'day'): st
   return ret
 }
 
-
-const _DatePicker = forwardRef<HandlerRef<View, DateProps>, DateProps>((props: DateProps, ref):  React.JSX.Element => {
+const _DatePicker = forwardRef<HandlerRef<View, DateProps>, DateProps>((props: DateProps, ref): React.JSX.Element => {
   const { children, start = '1970-01-01', end = '2999-01-01', value, bindchange, bindcancel, disabled, fields } = props
   const [datevalue, setDateValue] = useState(value)
   // 存储layout布局信息
   const layoutRef = useRef({})
-  const { nodeRef: viewRef } = useNodesRef<View, DateProps>(props, ref, {
+  const viewRef = useRef<View>(null)
+  useNodesRef<View, DateProps>(props, ref, viewRef, {
   })
 
   useEffect(() => {

package/lib/runtime/components/react/mpx-picker/index.tsx

@@ -1,6 +1,7 @@
 import { View } from 'react-native'
 import { PickerValue } from '@ant-design/react-native'
 import React, { forwardRef, useRef, useContext, useState } from 'react'
+import { warn } from '@mpxjs/utils'
 import useInnerProps, { getCustomEvent } from '../getInnerListeners'
 import useNodesRef, { HandlerRef } from '../useNodesRef' // 引入辅助函数
 import Selector from './selector'
@@ -10,7 +11,6 @@ import MultiSelector from './multiSelector'
 import RegionSelector from './region'
 import { PickerProps, EventType, ValueType } from './type'
 import { FormContext, FormFieldValue } from '../context'
-import { throwReactWarning } from '../utils'
 
 /**
  * ✔ mode
@@ -33,8 +33,9 @@ import { throwReactWarning } from '../utils'
 
 const _Picker = forwardRef<HandlerRef<View, PickerProps>, PickerProps>((props: PickerProps, ref): React.JSX.Element => {
   const { mode = 'selector', value, bindcancel, bindchange, children, bindcolumnchange } = props
-  let innerLayout = useRef({})
-  const { nodeRef } = useNodesRef<View, PickerProps>(props, ref, {
+  const innerLayout = useRef({})
+  const nodeRef = useRef(null)
+  useNodesRef<View, PickerProps>(props, ref, nodeRef, {
   })
   const innerProps = useInnerProps(props, {
     ref: nodeRef
@@ -69,7 +70,7 @@ const _Picker = forwardRef<HandlerRef<View, PickerProps>, PickerProps>((props: P
   }
   if (formValuesMap) {
     if (!props.name) {
-      throwReactWarning('[Mpx runtime warn]: If a form component is used, the name attribute is required.')
+      warn('If a form component is used, the name attribute is required.')
     } else {
       formValuesMap.set(props.name, { getValue, resetValue })
     }
@@ -103,29 +104,29 @@ const _Picker = forwardRef<HandlerRef<View, PickerProps>, PickerProps>((props: P
   const selectorProps = {
     ...commonProps,
     value: pickerValue as PickerValue,
-    range: props['range'],
+    range: props.range,
     'range-key': props['range-key']
   }
 
   const multiProps = {
     ...commonProps,
     value: pickerValue as Array<number>,
-    range: props['range'],
+    range: props.range,
     'range-key': props['range-key']
   }
 
   const timeProps = {
     ...commonProps,
     value: pickerValue as string,
-    start: props['start'],
-    end: props['end']
+    start: props.start,
+    end: props.end
   }
 
   const dateProps = {
     ...commonProps,
     value: pickerValue as string,
-    start: props['start'],
-    end: props['end'],
+    start: props.start,
+    end: props.end,
     fileds: props.fields || 'day'
   }
 
@@ -150,6 +151,6 @@ const _Picker = forwardRef<HandlerRef<View, PickerProps>, PickerProps>((props: P
   }
 })
 
-_Picker.displayName = 'mpx-picker';
+_Picker.displayName = 'mpx-picker'
 
 export default _Picker

package/lib/runtime/components/react/mpx-picker/multiSelector.tsx

@@ -4,7 +4,7 @@ import React, { forwardRef, useState, useRef, useEffect } from 'react'
 import { MultiSelectorProps, LayoutType } from './type'
 import useNodesRef, { HandlerRef } from '../useNodesRef' // 引入辅助函数
 
-function convertToObj(item?: any, rangeKey = ''): any {
+function convertToObj (item?: any, rangeKey = ''): any {
   if (typeof item === 'object') {
     return { value: item[rangeKey], label: item[rangeKey] }
   } else {
@@ -13,13 +13,13 @@ function convertToObj(item?: any, rangeKey = ''): any {
 }
 
 // eslint-disable-next-line default-param-last
-function formatRangeFun(range: any[][] = [], rangeKey?: string): any[] {
+function formatRangeFun (range: any[][] = [], rangeKey?: string): any[] {
   const result = (range[0] || []).map(item => {
     return convertToObj(item, rangeKey)
   })
   let tmp = result
   for (let i = 1; i < range.length; i++) {
-    let child = Array.isArray(range[i]) ? range[i] : []
+    const child = Array.isArray(range[i]) ? range[i] : []
     const nextColData = child.map(item => {
       return convertToObj(item, rangeKey)
     })
@@ -31,7 +31,7 @@ function formatRangeFun(range: any[][] = [], rangeKey?: string): any[] {
   return result
 }
 
-function getIndexByValues(range: any[] = [], value: any[] = []): number[] {
+function getIndexByValues (range: any[] = [], value: any[] = []): number[] {
   let tmp = range
   return value.map(v => {
     for (let i = 0; i < tmp.length; i++) {
@@ -44,16 +44,16 @@ function getIndexByValues(range: any[] = [], value: any[] = []): number[] {
   })
 }
 // [1,1,2] 寻找出[]
-function getInnerValueByIndex(range: any[] = [], value: any[] = []): string[] {
+function getInnerValueByIndex (range: any[] = [], value: any[] = []): string[] {
   let tmp = range
   return value.map(v => {
-    let current = tmp[v].value
+    const current = tmp[v].value
     tmp = tmp[v].children
     return current
   })
 }
 // column = 1 value = ['无脊柱动物', '扁性动物', '吸血虫'] 根据column 和value 获取到当前列变动选择的值所在当前列的索引
-function getColumnIndexByValue(range: any[] = [], column: number, value: any[] = []): number {
+function getColumnIndexByValue (range: any[] = [], column: number, value: any[] = []): number {
   let curRange = range
   let changeIndex = 0
   let tmpRange: any[] = []
@@ -63,30 +63,34 @@ function getColumnIndexByValue(range: any[] = [], column: number, value: any[] =
         if (ritem.value === item) {
           changeIndex = rindex
         }
+        return ritem
       })
     } else {
-    curRange.map((citem, cindex) => {
+      curRange.map((citem, cindex) => {
         if (citem.value === item) {
           tmpRange = citem.children
         }
-    })
-    curRange = tmpRange
+        return citem
+      })
+      curRange = tmpRange
     }
+    return item
   })
   return changeIndex
 }
 
 const _MultiSelectorPicker = forwardRef<HandlerRef<View, MultiSelectorProps>, MultiSelectorProps>((props: MultiSelectorProps, ref): React.JSX.Element => {
   const { range, value, disabled, bindchange, bindcancel, children, bindcolumnchange } = props
-  let formatRange = formatRangeFun(range, props['range-key'])
-  let initValue = getInnerValueByIndex(formatRange, value)
+  const formatRange = formatRangeFun(range, props['range-key'])
+  const initValue = getInnerValueByIndex(formatRange, value)
   // 选中的索引值
   const [selected, setSelected] = useState(initValue)
   // range数据源
   const [data, setData] = useState(formatRange || [])
   // 存储layout布局信息
   const layoutRef = useRef({})
-  const { nodeRef: viewRef } = useNodesRef<View, MultiSelectorProps>(props, ref, {
+  const viewRef = useRef<View>(null)
+  useNodesRef<View, MultiSelectorProps>(props, ref, viewRef, {
   })
 
   useEffect(() => {

package/lib/runtime/components/react/mpx-picker/region.tsx

@@ -1,15 +1,17 @@
 import { View, TouchableWithoutFeedback } from 'react-native'
-import { Picker } from '@ant-design/react-native'
+import { Picker, PickerColumnItem } from '@ant-design/react-native'
 import { regionData } from './regionData'
 import React, { forwardRef, useState, useRef } from 'react'
 import useNodesRef, { HandlerRef } from '../useNodesRef' // 引入辅助函数
-import { RegionProps, RegionObj, PickerData, LayoutType } from './type'
+import { RegionProps, RegionObj, LayoutType } from './type'
 
-function formateRegionData(clObj: RegionObj[] = [], customItem?: string, depth = 2): PickerData[] {
+function formateRegionData (clObj: RegionObj[] = [], customItem?: string, depth = 2): PickerColumnItem[] {
   const l = depth
-  const obj: PickerData[] = []
+  // 'PickerData[]' is not assignable to type 'PickerColumn | PickerColumn[]'.
+  // const obj: PickerColumnItem[] = []
+  const obj: PickerColumnItem[] = []
   if (customItem) {
-    const objClone: PickerData = {
+    const objClone: PickerColumnItem = {
       value: customItem,
       label: customItem,
       children: []
@@ -18,14 +20,14 @@ function formateRegionData(clObj: RegionObj[] = [], customItem?: string, depth =
     let loop = panding
     while (depth-- > 0) {
       loop.children = [{ ...objClone }]
-      loop = loop.children[0] as PickerData
+      loop = loop.children[0] as PickerColumnItem
     }
-    obj.push(panding)
+    obj.push(panding as PickerColumnItem)
   }
   for (let i = 0; i < clObj.length; i++) {
-    const region: PickerData = {
+    const region: PickerColumnItem = {
       value: clObj[i].value,
-      label: clObj[i].value,
+      label: clObj[i].value
     }
     if (clObj[i].children) {
       region.children = formateRegionData(clObj[i].children, customItem, l - 1)
@@ -35,16 +37,15 @@ function formateRegionData(clObj: RegionObj[] = [], customItem?: string, depth =
   return obj
 }
 
-
-
 const _RegionPicker = forwardRef<HandlerRef<View, RegionProps>, RegionProps>((props: RegionProps, ref): React.JSX.Element => {
   const { children, value, bindchange, bindcancel, disabled } = props
-  let formatRegionData = formateRegionData(regionData, props['custom-item'])
+  const formatRegionData = formateRegionData(regionData, props['custom-item'])
 
   const [regionvalue, setRegionValue] = useState(value)
   // 存储layout布局信息
   const layoutRef = useRef({})
-  const { nodeRef: viewRef } = useNodesRef<View, RegionProps>(props, ref, {
+  const viewRef = useRef<View>(null)
+  useNodesRef<View, RegionProps>(props, ref, viewRef, {
   })
 
   const onChange = (value: string[]): void => {
@@ -60,6 +61,7 @@ const _RegionPicker = forwardRef<HandlerRef<View, RegionProps>, RegionProps>((pr
           return code
         }
       }
+      return item
     }).filter(code => !!code)
     const detail: Record<string, any> = { value, code }
     if (postcode[2]) detail.postcode = postcode[2]
@@ -75,13 +77,17 @@ const _RegionPicker = forwardRef<HandlerRef<View, RegionProps>, RegionProps>((pr
       props.getInnerLayout && props.getInnerLayout(layoutRef)
     })
   }
-  
+
+  const onDismiss = (): void => {
+    bindcancel && bindcancel()
+  }
+
   const regionProps = {
     data: formatRegionData,
     value: regionvalue,
     onChange,
     disabled,
-    onDismiss: bindcancel && bindcancel
+    onDismiss
   }
 
   const touchProps = {
@@ -90,15 +96,13 @@ const _RegionPicker = forwardRef<HandlerRef<View, RegionProps>, RegionProps>((pr
   }
 
   return (
-    // @ts-ignore
     <Picker {...regionProps}>
       <TouchableWithoutFeedback>
         <View {...touchProps}>{children}</View>
       </TouchableWithoutFeedback>
     </Picker>
   )
-
 })
 
-_RegionPicker.displayName === 'mpx-picker-region'
-export default _RegionPicker
+_RegionPicker.displayName = 'mpx-picker-region'
+export default _RegionPicker

package/lib/runtime/components/react/mpx-picker/selector.tsx

@@ -9,7 +9,7 @@ import useNodesRef, { HandlerRef } from '../useNodesRef' // 引入辅助函数
 
 type RangeItemType = Obj | number | string
 
-const  formatRangeFun = (range: Array<RangeItemType>, rangeKey = ''): any => {
+const formatRangeFun = (range: Array<RangeItemType>, rangeKey = ''): any => {
   let newRange: Object[] = []
   newRange = (range || []).map((item: RangeItemType, index) => {
     if (typeof item === 'object') {
@@ -24,14 +24,15 @@ const  formatRangeFun = (range: Array<RangeItemType>, rangeKey = ''): any => {
 const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProps>((props: SelectorProps, ref): React.JSX.Element => {
   const { range, children, value, disabled, bindchange, bindcancel } = props
   // 格式化数据为Array<*>
-  let formatRange: PickerColumn = formatRangeFun(range, props['range-key'])
+  const formatRange: PickerColumn = formatRangeFun(range, props['range-key'])
   // 选中的索引值
   const [selected, setSelected] = useState<PickerValue>(value || 0)
   // range数据源
   const [data, setData] = useState(formatRange || [])
   // 存储layout布局信息
   const layoutRef = useRef({})
-  const { nodeRef: viewRef } = useNodesRef<View, SelectorProps>(props, ref, {
+  const viewRef = useRef<View>(null)
+  useNodesRef<View, SelectorProps>(props, ref, viewRef, {
   })
 
   useEffect(() => {
@@ -44,7 +45,7 @@ const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProp
     })
   }, [range, value])
   const defaultValue = [value]
-  
+
   const onChange = (value: PickerValue[]) => {
     bindchange && bindchange({
       detail: {
@@ -60,7 +61,6 @@ const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProp
     })
   }
 
-
   const antPickerProps = {
     data,
     value: [selected],
@@ -69,7 +69,7 @@ const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProp
     itemHeight: 40,
     onChange,
     onDismiss: bindcancel && bindcancel
-  }  as any
+  } as any
 
   const touchProps = {
     onLayout: onElementLayout,
@@ -87,6 +87,6 @@ const _SelectorPicker = forwardRef<HandlerRef<View, SelectorProps>, SelectorProp
   )
 })
 
-_SelectorPicker.displayName = 'mpx-picker-selector';
+_SelectorPicker.displayName = 'mpx-picker-selector'
 
 export default _SelectorPicker

package/lib/runtime/components/react/mpx-picker/time.tsx

@@ -8,48 +8,47 @@ import { TimeProps } from './type'
 // const { height: dHeight, width: dWidth } = Dimensions.get('window');
 //  modal属性: {"height": 298.33331298828125, "offsetLeft": 0, "offsetTop": 513.6666870117188, "width": 375, "x": 0, "y": 513.6666870117188}
 // const { height: sHeight, width: sWidth } = Dimensions.get('screen');
-// 	设备屏幕的大小。 screen
-
+// 设备屏幕的大小。 screen
 const styles: { [key: string]: Object } = {
   showModal: {
-    backgroundColor: "black",
+    backgroundColor: 'black',
     opacity: 0.5,
-    position: "absolute",
-    width: "100%"
+    position: 'absolute',
+    width: '100%'
   },
   hideModal: {
     opacity: 1,
     height: 0
   },
   modal: {
-    backgroundColor: "black",
+    backgroundColor: 'black',
     opacity: 0.5
   },
   centeredView: {
     position: 'absolute',
     bottom: 0,
-    width: "100%",
+    width: '100%',
     overflow: 'scroll'
   },
   btnLine: {
-    width: "100%",
+    width: '100%',
     flex: 1,
-    flexDirection: "row",
-    justifyContent: "space-between",
+    flexDirection: 'row',
+    justifyContent: 'space-between',
     borderColor: 20,
     borderBottomWidth: 1,
-    backgroundColor: "white",
+    backgroundColor: 'white',
     paddingLeft: 40,
     paddingRight: 40
   },
   cancel: {
     height: 50,
-    display: "flex",
+    display: 'flex',
     justifyContent: 'center'
   },
   ok: {
     height: 50,
-    display: "flex",
+    display: 'flex',
     justifyContent: 'center'
   },
   btntext: {
@@ -58,12 +57,12 @@ const styles: { [key: string]: Object } = {
   }
 }
 
-function formatStrToInt(timestr: string) {
-  let [start, end] = timestr.split(':')
+function formatStrToInt (timestr: string) {
+  const [start, end] = timestr.split(':')
   return [parseInt(start), parseInt(end)]
 }
 // [9, 59] to 09:59
-function formatStr(arr: any[]) {
+function formatStr (arr: any[]) {
   let [hour, minute] = arr
   if (hour < 10) {
     hour = '0' + hour
@@ -74,10 +73,10 @@ function formatStr(arr: any[]) {
   return hour + ':' + minute
 }
 
-function generateMinute() {
-  let arrMinute: any[] = []
+function generateMinute () {
+  const arrMinute: any[] = []
   for (let i = 0; i <= 59; i++) {
-    let obj = {
+    const obj = {
       label: toSingleStr(i),
       value: i,
       children: []
@@ -86,10 +85,10 @@ function generateMinute() {
   }
   return arrMinute
 }
-function generateColumns(): any[] {
-  let pickData: any[] = []
+function generateColumns (): any[] {
+  const pickData: any[] = []
   for (let i = 0; i <= 23; i++) {
-    let obj = {
+    const obj = {
       label: toSingleStr(i),
       value: i,
       children: generateMinute()
@@ -100,18 +99,18 @@ function generateColumns(): any[] {
   return pickData
 }
 
-function toSingleStr(str: number) {
+function toSingleStr (str: number) {
   return str < 10 ? '0' + str : str
 }
 
-function toStr(time: string): string {
+function toStr (time: string): string {
   const [hour, minute]: any = formatStrToInt(time)
   const newHour = toSingleStr(hour)
   const newMinute = toSingleStr(minute)
   return '' + newHour + newMinute
 }
 
-function checkSelectedIsValid(strStart: string, strEnd: string, selected: number[]): Boolean {
+function checkSelectedIsValid (strStart: string, strEnd: string, selected: number[]): boolean {
   const strSel = '' + toSingleStr(selected[0]) + toSingleStr(selected[1])
   if (strSel < strStart || strSel > strEnd) return false
   return true
@@ -135,10 +134,12 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
   const [timevalue, setTimeValue] = useState(defaultValue)
   // 存储layout布局信息
   const layoutRef = useRef({})
-  const { nodeRef: viewRef } = useNodesRef<View, TimeProps>(props, ref, {})
+  const viewRef = useRef<View>(null)
+  useNodesRef<View, TimeProps>(props, ref, viewRef, {})
   // 存储modal的布局信息
   const modalLayoutRef = useRef({})
-  const { nodeRef: modalRef } = useNodesRef<View, TimeProps>(props, ref, {})
+  const modalRef = useRef<View>(null)
+  useNodesRef<View, TimeProps>(props, ref, modalRef, {})
   const [visible, setVisible] = useState(false)
   const columnData = generateColumns()
   const [data, setData] = useState(columnData)
@@ -196,7 +197,6 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
     }
   }
 
-
   const onElementLayout = () => {
     viewRef.current?.measure((x: number, y: number, width: number, height: number, offsetLeft: number, offsetTop: number) => {
       layoutRef.current = { x, y, width, height, offsetLeft, offsetTop }
@@ -211,7 +211,6 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
     })
   }
 
-
   const renderModalChildren = () => {
     const pickerProps = {
       data,
@@ -250,7 +249,7 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
       </TouchableWithoutFeedback>
     </View>
   }
-  const strStyle = visible ? styles['showModal'] : styles['hideModal']
+  const strStyle = visible ? styles.showModal : styles.hideModal
   const mheight = Math.floor(offsetTop)
 
   // Animated.View
@@ -271,4 +270,3 @@ const _TimePicker = forwardRef<HandlerRef<View, TimeProps>, TimeProps>((props: T
 _TimePicker.displayName = 'mpx-picker-time'
 
 export default _TimePicker
-

package/lib/runtime/components/react/mpx-picker/type.ts

@@ -34,7 +34,7 @@ export type MultiSelectorProps = {
   getInnerLayout: Function
 }
 
-export type TimeProps =  {
+export type TimeProps = {
   mode: string,
   // 表示选择了 range 中的第几个（下标从 0 开始）
   value: string,