@hzw-tech/utils 0.2.1 → 0.2.3

package/.eslintrc-auto-import.json

@@ -53,6 +53,8 @@
     "nextTick": "writable",
     "onActivated": "writable",
     "onBeforeMount": "writable",
+    "onBeforeRouteLeave": "writable",
+    "onBeforeRouteUpdate": "writable",
     "onBeforeUnmount": "writable",
     "onBeforeUpdate": "writable",
     "onDeactivated": "writable",
@@ -89,7 +91,10 @@
     "useCssModule": "writable",
     "useCssVars": "writable",
     "useId": "writable",
+    "useLink": "writable",
     "useModel": "writable",
+    "useRoute": "writable",
+    "useRouter": "writable",
     "useSlots": "writable",
     "useTemplateRef": "writable",
     "utils": "writable",

package/dist/eslint.js

@@ -1,12 +1,14 @@
 import { antfu } from '@antfu/eslint-config'
+import { mergeObject } from './utils.js'
 
 function eslint(options) {
-  return antfu({
+  const optionsDefault = {
     formatters: true,
     vue: {
       overrides: {
         'vue/component-definition-name-casing': ['error', 'kebab-case'],
         'vue/component-name-in-template-casing': ['error', 'kebab-case'],
+        'vue/custom-event-name-casing': ['error', 'kebab-case'],
       },
     },
     rules: {
@@ -52,8 +54,8 @@ function eslint(options) {
       '**/auto-import?(s).d.ts',
       '**/components.d.ts',
     ],
-    ...options,
-  })
+  }
+  return antfu(mergeObject(optionsDefault, options))
 }
 
 export default eslint

package/dist/types/global.d.ts

@@ -40,6 +40,8 @@ declare global {
   const nextTick: typeof import('vue').nextTick
   const onActivated: typeof import('vue').onActivated
   const onBeforeMount: typeof import('vue').onBeforeMount
+  const onBeforeRouteLeave: typeof import('vue-router').onBeforeRouteLeave
+  const onBeforeRouteUpdate: typeof import('vue-router').onBeforeRouteUpdate
   const onBeforeUnmount: typeof import('vue').onBeforeUnmount
   const onBeforeUpdate: typeof import('vue').onBeforeUpdate
   const onDeactivated: typeof import('vue').onDeactivated
@@ -76,7 +78,10 @@ declare global {
   const useCssModule: typeof import('vue').useCssModule
   const useCssVars: typeof import('vue').useCssVars
   const useId: typeof import('vue').useId
+  const useLink: typeof import('vue-router').useLink
   const useModel: typeof import('vue').useModel
+  const useRoute: typeof import('vue-router').useRoute
+  const useRouter: typeof import('vue-router').useRouter
   const useSlots: typeof import('vue').useSlots
   const useTemplateRef: typeof import('vue').useTemplateRef
   const utils: typeof import('../ts/utils').utils
@@ -138,6 +143,8 @@ declare module 'vue' {
     readonly nextTick: UnwrapRef<typeof import('vue')['nextTick']>
     readonly onActivated: UnwrapRef<typeof import('vue')['onActivated']>
     readonly onBeforeMount: UnwrapRef<typeof import('vue')['onBeforeMount']>
+    readonly onBeforeRouteLeave: UnwrapRef<typeof import('vue-router')['onBeforeRouteLeave']>
+    readonly onBeforeRouteUpdate: UnwrapRef<typeof import('vue-router')['onBeforeRouteUpdate']>
     readonly onBeforeUnmount: UnwrapRef<typeof import('vue')['onBeforeUnmount']>
     readonly onBeforeUpdate: UnwrapRef<typeof import('vue')['onBeforeUpdate']>
     readonly onDeactivated: UnwrapRef<typeof import('vue')['onDeactivated']>
@@ -174,7 +181,10 @@ declare module 'vue' {
     readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
     readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
     readonly useId: UnwrapRef<typeof import('vue')['useId']>
+    readonly useLink: UnwrapRef<typeof import('vue-router')['useLink']>
     readonly useModel: UnwrapRef<typeof import('vue')['useModel']>
+    readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
+    readonly useRouter: UnwrapRef<typeof import('vue-router')['useRouter']>
     readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
     readonly useTemplateRef: UnwrapRef<typeof import('vue')['useTemplateRef']>
     readonly utils: UnwrapRef<typeof import('../ts/utils')['utils']>

package/dist/utils.js

@@ -0,0 +1,29 @@
+function getType(data) {
+  const typeStr = Object.prototype.toString.call(data)
+  const end = typeStr.length - 1
+  return typeStr.substring(8, end)
+}
+
+export function mergeObject(oldObj, newObj) {
+  if (getType(oldObj) !== 'Object') {
+    console.error('utils.mergeObjectParams方法传递的默认参数不是Object类型')
+    return newObj
+  }
+  if (!newObj) {
+    return oldObj
+  }
+  for (const key in oldObj) {
+    if (Object.prototype.hasOwnProperty.call(oldObj, key)) {
+      const item = oldObj[key]
+      // 仅当新对象是Object类型才进行比对，其他类型的newObj不变
+      if (getType(newObj) === 'Object') {
+        if (newObj[key] === undefined) {
+          newObj[key] = item
+        } else if (getType(item) === 'Object') {
+          mergeObject(item, newObj[key])
+        }
+      }
+    }
+  }
+  return newObj
+}

package/dist/vite.js

@@ -1,11 +1,12 @@
 import process from 'node:process'
 import AutoImportVite from 'unplugin-auto-import/vite'
+import { mergeObject } from './utils.js'
 
 function autoImport(options) {
   const { mode } = process.env
   const isPublish = mode === 'publish'
   const optDefault = {
-    imports: ['pinia', 'vue'],
+    imports: ['pinia', 'vue', 'vue-router'],
     eslintrc: {
       enabled: true,
       globalsPropValue: 'writable',
@@ -28,13 +29,9 @@ function scss(options) {
   if (options && options.additionalData) {
     additionalData = options.additionalData
   }
-  return {
-    additionalData: `
-    @use "@hzw-tech/utils/dist/styles/reference/index.scss" as *;
-    ${additionalData}
-    `,
-    ...options,
-  }
+  return mergeObject({
+    additionalData,
+  }, options)
 }
 
 export default {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hzw-tech/utils",
   "type": "module",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "通用前端工具包，包含请求,正则校验,全局ts声明等",
   "author": "hzw-tech",
   "license": "MIT",