@xmszm/core 0.0.2 → 0.0.3

package/src/options/{Options.jsx → Options.tsx}

@@ -1,4 +1,5 @@
-import { ObjectToArray } from 'core/utils/object'
+import { ObjectToArray } from '../utils/object'
+import type { FormOption, OptionsProps } from '../../types/components'
 
 import { NFormItem, NIcon, NSpace } from 'naive-ui'
 import {
@@ -9,6 +10,7 @@ import {
   ref,
   unref,
   watch,
+  type VNode,
 } from 'vue'
 import {
   labelField as globalLabelField,
@@ -20,7 +22,7 @@ import { registerDirectives, getGlobalApp } from '../directives/auto-register'
 import { getCurrentInstance } from 'vue'
 
 export default defineComponent(
-  (props, { emit }) => {
+  (props: OptionsProps, { emit }) => {
     // 自动注册 corePermission 指令（如果尚未注册）
     // 必须在组件渲染前注册，确保指令可用
     const instance = getCurrentInstance()
@@ -33,21 +35,21 @@ export default defineComponent(
         registerDirectives(globalApp)
       }
     }
-    const _value = ref(props.value)
+    const _value = ref(props.value || {})
     const _isRead = computed(() => props.read || false)
 
-    let _formRef = props.formRef
+    let _formRef: any = props.formRef
 
     watch(
       () => props.formRef,
-      v => (_formRef = v),
+      (v) => (_formRef = v),
     )
-    const _data = computed(() => props.option)
+    const _data = computed(() => props.option || [])
 
-    function cellcetWayKeys(op) {
-      return op.reduce((a, b) => {
+    function cellcetWayKeys(op: FormOption[]): string[] {
+      return op.reduce((a: string[], b: FormOption) => {
         a.push(b?.way ?? 'input')
-        const arr = [b?.default, b?.suffix, b?.prefix].reduce((k, k1) => {
+        const arr = [b?.default, b?.suffix, b?.prefix].reduce((k: any[], k1: any) => {
           if (Array.isArray(k1)) {
             k = k.concat(k1)
           }
@@ -60,13 +62,13 @@ export default defineComponent(
         console.log(arr)
 
         if (arr.length)
-          arr.forEach(v => a.push(v?.way ?? 'input'))
+          arr.forEach((v: any) => a.push(v?.way ?? 'input'))
         return a
       }, [])
     }
 
     const _optionsByWayKey = computed(() => [
-      ...new Set(cellcetWayKeys(props.option)),
+      ...new Set(cellcetWayKeys(props.option || [])),
     ])
     const defaultOption = getOptions(_optionsByWayKey.value)
     console.log(props.option)
@@ -75,15 +77,15 @@ export default defineComponent(
       () => _value.value,
       (v) => {
         emit('update:value', v)
-      }
-      , {
+      },
+      {
         immediate: true,
       })
 
-    function initProps(cProp) {
-      let obj = {}
+    function initProps(cProp: any, typeHint?: string): any {
+      let obj: any = {}
       const type = typeof cProp
-      let handleProps = null
+      let handleProps: any = null
       try {
         if (!cProp) {
           handleProps = cProp
@@ -95,14 +97,13 @@ export default defineComponent(
           handleProps = cProp(unref(_value), {
             formRef: _formRef,
             resetForm: () => _formRef?.value?.restoreValidation(),
-            close: () => props.cancel(),
+            close: () => (props as any).cancel?.(),
             setValue,
           })
         }
         if (typeof handleProps === 'object' && !Array.isArray(handleProps)) {
           Object.keys(handleProps).forEach((v) => {
             const item = handleProps[v]
-            // console.log(item)
             if (isRef(item))
               obj[v] = unref(item)
             else obj[v] = item
@@ -124,18 +125,17 @@ export default defineComponent(
       (v) => {
         console.log(v)
 
-        _value.value = v
+        _value.value = v || {}
       },
       {
         immediate: true,
       },
     )
 
-    function setValue(val) {
+    function setValue(val: any) {
       _value.value = val
     }
-    function main(item) {
-      // console.log('main---重绘?', item)
+    function main(item: FormOption): VNode {
       return (
         <NSpace
           wrap-item={false}
@@ -153,7 +153,7 @@ export default defineComponent(
       )
     }
 
-    function initMain(dom) {
+    function initMain(dom: any): VNode | string | null | undefined {
       if (!dom)
         return
       let domHandle = dom
@@ -175,11 +175,11 @@ export default defineComponent(
 
         return (
           <>
-            {domHandle.map((item, index) => (
+            {domHandle.map((item: any, index: number) => (
               <CreateFormItem item={item} index={index} />
             ))}
           </>
-        )
+        ) as any
       }
       else if (typeof domHandle === 'object') {
         console.log('??? object')
@@ -201,20 +201,21 @@ export default defineComponent(
           ),
         )
       }
+      return null
     }
 
-    function handleOptions(option) {
+    function handleOptions(option: FormOption): FormOption {
       if (unref(option.enum))
         option.options = ObjectToArray(unref(option.enum))
       return option
     }
 
-    function CreateFormItem({ item, index }) {
+    function CreateFormItem({ item, index }: { item: FormOption; index: number }): VNode {
       item.formItemProps = initProps(item?.formItemProps)
       if (!item.formItemProps)
         item.formItemProps = {}
-      if (!item?.formItemProps?.labelWidth && props.formProps?.labelWidth) {
-        item.formItemProps.labelWidth = props.formProps?.labelWidth
+      if (!(item.formItemProps as any)?.labelWidth && (props.formProps as any)?.labelWidth) {
+        (item.formItemProps as any).labelWidth = (props.formProps as any)?.labelWidth
       }
 
       return (
@@ -223,13 +224,13 @@ export default defineComponent(
           key={index}
           showLabel={!item?.noLabel}
           {...item?.formItemProps}
-          labelWidth={item?.formItemProps?.labelWidth || 'auto'}
-          feedback={initProps(item?.formItemProps?.feedback, 'string')}
+          labelWidth={(item?.formItemProps as any)?.labelWidth || 'auto'}
+          feedback={initProps((item?.formItemProps as any)?.feedback, 'string')}
           style={{
             padding: '0 15px',
             boxSizing: 'border-box',
             width: '100%',
-            ...(item?.formItemProps?.style || {}),
+            ...((item?.formItemProps as any)?.style || {}),
           }}
           path={String(item.key)}
         >
@@ -264,9 +265,9 @@ export default defineComponent(
                     <></>
                   )}
                 {`${unref(
-                  typeof item?.[props.labelField] === 'function'
-                    ? item?.[props.labelField]?.()
-                    : item?.[props.labelField],
+                  typeof item?.[props.labelField || 'label'] === 'function'
+                    ? item?.[props.labelField || 'label']?.()
+                    : item?.[props.labelField || 'label'],
                 ) || ''
                   } ${_isRead.value || item.read ? '  ' : '  '}
               `}
@@ -288,7 +289,7 @@ export default defineComponent(
           ...props.style,
         }}
       >
-        {_data.value.map(({ isRender = true, ...item }, index) => {
+        {_data.value.map(({ isRender = true, ...item }: any, index: number) => {
           return (
             typeof unref(isRender) !== 'boolean'
               ? isRender?.(unref(_value))