@xmszm/core 0.0.1 → 0.0.3

package/src/index.ts

@@ -0,0 +1,58 @@
+export { commonDialogMethod } from './dialog/commonDialog'
+export { useCommonDialog } from './dialog/useCommonDialog'
+
+export { default as DataForm } from './form/DataForm.vue'
+export {
+  getAllOptions,
+  getOptions,
+  setupOptions,
+} from './options/defaultOptions'
+export { default as Options } from './options/Options'
+export { default as CommonQuery } from './query/CommonQuery.vue'
+
+export { createActionColumnJsx, createQRCode } from './table/opr/useDataColumn'
+export { useQRCode } from './table/opr/useQRCode'
+
+export { default as OprButton } from './table/opr/useDataColumnButton'
+
+export { default as Pop } from './table/opr/useDataColumnPop'
+
+export { toArray } from './utils/array'
+
+export {
+  cellectChildenPermission,
+  handleParams,
+  useApiConfig,
+  useAuthPermission,
+} from './utils/auth'
+
+export { ObjectToArray } from './utils/object'
+
+export { ArrayToObject } from './utils/array'
+
+
+
+export { customUpload, registryUpload, getFileUrl } from './utils/upload'
+export { setupConfig, getConfig, getBaseURL, getHasPermission, getUploadMethod, checkPermission, getDialogConfig, registerDialogInstance, getDialogInstance } from './utils/config'
+export { createDialog, createDialogMethods, createDialogOptions } from './utils/dialog'
+
+export { default as DataTable } from './table/DataTable.vue'
+
+
+export { labelField as globalLabelField, valueField as globalValueField } from './enum/options'
+
+
+export { initRules } from './dialog/utils/dialog'
+
+export { ellipsis } from './table/utils/ellipsis'
+
+export { initRouteMeta } from './plugin/vite/initRouteMeta'
+
+export { orderEnum } from './enum/sort'
+
+// 导出插件和指令
+import CorePluginDefault from './plugin/index'
+export { CorePluginDefault as CorePlugin }
+export { install } from './plugin/index'
+export { permissionDirective } from './directives/permission'
+export { registerDirectives, autoRegisterDirectives, getGlobalApp } from './directives/auto-register'

package/src/list/{useList.jsx → useList.tsx}

@@ -1,11 +1,36 @@
-import { computed, ref, unref, watch } from 'vue'
+import { computed, ref, unref, watch, type Ref, type ComputedRef } from 'vue'
+import type { FormOption } from '../../types/components'
 
-export function useList(source = [], filterOptions = []) {
+interface QueryModel {
+  andQuery?: Record<string, any>
+  likeQuery?: Record<string, any>
+  [key: string]: any
+}
+
+interface FilterOption extends FormOption {
+  queryType?: string
+  value?: any
+  type?: string
+}
+
+interface UseListReturn {
+  loading: Ref<boolean>
+  data: Ref<any[]>
+  model: Ref<QueryModel>
+  initData: () => void
+  onSearch: () => void
+  onClear: () => void
+}
+
+export function useList(
+  source: any[] = [],
+  filterOptions: FormOption[] = [],
+): UseListReturn {
   const loading = ref(false)
-  const data = ref([])
+  const data = ref<any[]>([])
   const sourceList = computed(() => unref(source))
 
-  const model = ref({
+  const model = ref<QueryModel>({
     andQuery: {},
     likeQuery: {},
   })
@@ -52,17 +77,21 @@ export function useList(source = [], filterOptions = []) {
 }
 
 export const matchMethod = {
-  andQuery: (data, value) =>
+  andQuery: (data: any, value: any): boolean =>
     Array.isArray(value) ? value.includes(data) : data === value,
-  likeQuery: (data, value) => data?.indexOf(value) > -1,
+  likeQuery: (data: string | undefined, value: string): boolean =>
+    data?.indexOf(value) > -1 || false,
 }
 
-export function handleFilterValue(runOptions, model) {
+export function handleFilterValue(
+  runOptions: FormOption[],
+  model: QueryModel,
+): FilterOption[] {
   console.log('handleFilterValue', runOptions)
 
   return runOptions
     .map((v) => {
-      const filedValue = v?.key || v?.value
+      const filedValue = (v?.key as string) || (v as any)?.value
       const value = v?.queryType
         ? model?.[v?.queryType]?.[filedValue]
         : model?.[filedValue]
@@ -72,24 +101,30 @@ export function handleFilterValue(runOptions, model) {
             key: filedValue,
             type: v?.queryType,
             value,
-          }
+          } as FilterOption
         : undefined
     })
-    .filter(v => v)
+    .filter((v): v is FilterOption => v !== undefined)
 }
 
-export function handleFilterOption(runOption, options) {
+export function handleFilterOption(
+  runOption: FilterOption[],
+  options: any[],
+): any[] {
   console.log('runOption', runOption)
 
   if (runOption.length) {
     return options?.filter(item =>
       runOption.length === 1
-        ? matchMethod?.[runOption?.[0].type](
-          item?.[runOption?.[0]?.key],
+        ? matchMethod?.[runOption?.[0].type as keyof typeof matchMethod]?.(
+          item?.[runOption?.[0]?.key as string],
           runOption?.[0]?.value,
         )
         : runOption?.every(v =>
-          matchMethod?.[v.type](item?.[v.key], v.value),
+          matchMethod?.[v.type as keyof typeof matchMethod]?.(
+            item?.[v.key as string],
+            v.value,
+          ),
         ),
     )
   }

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,
@@ -16,24 +18,38 @@ import {
 } from '../enum/options'
 import { getOptions } from './defaultOptions'
 import SvgIcon from '../image/SvgIcon.vue'
+import { registerDirectives, getGlobalApp } from '../directives/auto-register'
+import { getCurrentInstance } from 'vue'
 
 export default defineComponent(
-  (props, { emit }) => {
-    const _value = ref(props.value)
+  (props: OptionsProps, { emit }) => {
+    // 自动注册 corePermission 指令（如果尚未注册）
+    // 必须在组件渲染前注册，确保指令可用
+    const instance = getCurrentInstance()
+    if (instance?.appContext?.app) {
+      registerDirectives(instance.appContext.app)
+    } else {
+      // 如果无法从实例获取，尝试使用全局应用实例
+      const globalApp = getGlobalApp()
+      if (globalApp) {
+        registerDirectives(globalApp)
+      }
+    }
+    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)
           }
@@ -46,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)
@@ -61,15 +77,15 @@ export default defineComponent(
       () => _value.value,
       (v) => {
         emit('update:value', v)
-      }
-    ,{
-      immediate: true,
-    })
+      },
+      {
+        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
@@ -81,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
@@ -110,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}
@@ -130,7 +144,7 @@ export default defineComponent(
           style={{
             width: '100%',
           }}
-          {...(item?.contentProps||{})}
+          {...(item?.contentProps || {})}
         >
           {initMain(item?.prefix)}
           {initMain(item?.default || item)}
@@ -139,7 +153,7 @@ export default defineComponent(
       )
     }
 
-    function initMain(dom) {
+    function initMain(dom: any): VNode | string | null | undefined {
       if (!dom)
         return
       let domHandle = dom
@@ -161,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')
@@ -187,35 +201,36 @@ 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 (
         <NFormItem
-          v-permission={item?.permission}
+          v-corePermission={item?.permission}
           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)}
         >
@@ -231,31 +246,30 @@ export default defineComponent(
               >
                 {item?.labelSuffix
                   ? (
-                      typeof item?.labelSuffix === 'string'
-                        ? (
-                            <NIcon
-                              {...{
-                                class: 'wh-20px c-inherit',
-                                ...item?.labelSuffixProps,
-                              }}
-                            >
-                              <SvgIcon name={item?.labelSuffix} />
-                            </NIcon>
-                          )
-                        : (
-                            item?.labelSuffix?.()
-                          )
-                    )
+                    typeof item?.labelSuffix === 'string'
+                      ? (
+                        <NIcon
+                          {...{
+                            class: 'wh-20px c-inherit',
+                            ...item?.labelSuffixProps,
+                          }}
+                        >
+                          <SvgIcon name={item?.labelSuffix} />
+                        </NIcon>
+                      )
+                      : (
+                        item?.labelSuffix?.()
+                      )
+                  )
                   : (
-                      <></>
-                    )}
-                {`${
-                  unref(
-                    typeof item?.[props.labelField] === 'function'
-                      ? item?.[props.labelField]?.()
-                      : item?.[props.labelField],
-                  ) || ''
-                } ${_isRead.value || item.read ? '  ' : '  '}
+                    <></>
+                  )}
+                {`${unref(
+                  typeof item?.[props.labelField || 'label'] === 'function'
+                    ? item?.[props.labelField || 'label']?.()
+                    : item?.[props.labelField || 'label'],
+                ) || ''
+                  } ${_isRead.value || item.read ? '  ' : '  '}
               `}
               </div>
             ),
@@ -275,24 +289,24 @@ 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))
               : unref(isRender)
           )
             ? (
-                item?.render
-                  ? (
-                      item?.render(unref(_value), index, {
-                        setValue,
-                        value: unref(_value),
-                      })
-                    )
-                  : (
-                      <CreateFormItem item={item} index={index} />
-                    )
-              )
+              item?.render
+                ? (
+                  item?.render(unref(_value), index, {
+                    setValue,
+                    value: unref(_value),
+                  })
+                )
+                : (
+                  <CreateFormItem item={item} index={index} />
+                )
+            )
             : null
         })}
       </NSpace>