mrxy-yk 1.3.5 → 1.4.1

package/dist/element-plus/components/form-dialog/FormDialog.d.ts

@@ -254,6 +254,7 @@ declare const __VLS_component: DefineComponent<__VLS_Props, {}, {}, {}, {}, Comp
     modal: boolean;
     appendToBody: boolean;
     fullscreen: boolean;
+    showClose: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     formRef: {
         $: ComponentInternalInstance;

package/dist/element-plus/components/form-dialog/FormDialog.vue.js

@@ -20,7 +20,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     fullscreen: { type: Boolean, default: false },
     closeOnClickModal: { type: Boolean },
     dialogCenter: { type: Boolean },
-    showClose: { type: Boolean }
+    showClose: { type: Boolean, default: true }
   },
   setup(__props) {
     const props = __props;

package/dist/hooks/index.d.ts

@@ -1,3 +1,5 @@
 export * from './table-search';
 export * from './inject-events';
+export * from './life-cycle';
+export * from './setup-module';
 export * from '../components/empty/hooks';

package/dist/hooks/life-cycle/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 重新激活时调用
+ * 与onActivated不同的是，onActivated在组件激活时调用，而onReactivated在组件重新激活时调用
+ * 不会和onMounted同时调用
+ * @param hook
+ */
+export declare function onReactivated(hook: () => void): void;

package/dist/hooks/life-cycle/index.js

@@ -0,0 +1,14 @@
+import { onMounted, onActivated } from "vue";
+function onReactivated(hook) {
+  let isMounted = false;
+  onMounted(() => {
+    isMounted = true;
+  });
+  onActivated(() => {
+    if (isMounted) isMounted = false;
+    else hook();
+  });
+}
+export {
+  onReactivated
+};

package/dist/hooks/setup-module/index.d.ts

@@ -0,0 +1,41 @@
+import { ExcludePrefixKeys, Prefix } from './type';
+/**
+ * 模块钩子
+ * 用于把相同的业务放入同一个模块中，可以避免命名冲突。模拟Setup的属性方式，支持多些生命周期
+ * 如示例所示
+ * - 命名：`levelTree.nodeCLick`的方式，而不是`levelTreeNodeClick`，这样有其他业务的树也可以使用`nodeCLick`，
+ * 如`userTree.nodeCLick`，避免名称困难
+ * - 生命周期：使用`[SetupLifeCycle.onMounted]`的方式来定义生命周期，可以在模块中写多个
+ *
+ * ```ts
+ * const levelTree = useSetupModuleHooks({
+ *   // region 获取数据
+ *   treeData: ref(),
+ *   getTreeData() {},
+ *   [SetupLifeCycle.onMounted]() {
+ *     levelTree.getTreeData()
+ *   },
+ *   // endregion
+ *
+ *   // region 搜索
+ *   searchQuery: ref(''),
+ *   [SetupLifeCycle.onMounted]() {
+ *     watch(levelTree.searchQuery, () => {})
+ *   },
+ *   // endregion
+ *
+ *   // region 事件
+ *   nodeCLick() {}
+ *   // endregion
+ * })
+ * ```
+ * @param ops
+ */
+export declare function useSetupModuleHooks<T>(ops: T): ExcludePrefixKeys<T, Prefix>;
+export declare const SetupLifeCycle: {
+    onMounted: Prefix;
+    onBeforeUnmount: Prefix;
+    onActivated: Prefix;
+    onDeactivated: Prefix;
+    onReactivated: Prefix;
+};

package/dist/hooks/setup-module/index.js

@@ -0,0 +1,33 @@
+import { onReactivated } from "../life-cycle/index.js";
+import { onDeactivated, onActivated, onBeforeUnmount, onMounted } from "vue";
+const lifeCycle = {
+  "onMounted": onMounted,
+  "onBeforeUnmount": onBeforeUnmount,
+  "onActivated": onActivated,
+  "onDeactivated": onDeactivated,
+  "onReactivated": onReactivated
+};
+function useSetupModuleHooks(ops) {
+  Object.keys(ops).forEach((key) => {
+    if (key.startsWith("_Module")) {
+      const keys = key.split("_");
+      if (lifeCycle[keys[2]] && typeof ops[key] === "function") {
+        lifeCycle[keys[2]](ops[key]);
+      }
+      delete ops[key];
+      return;
+    }
+  });
+  return ops;
+}
+let _Module_Index = 0;
+const SetupLifeCycle = new Proxy({}, {
+  get(target, prop) {
+    if (_Module_Index >= Number.MAX_SAFE_INTEGER) _Module_Index = 0;
+    return `_Module_${prop.toString()}_${_Module_Index++}`;
+  }
+});
+export {
+  SetupLifeCycle,
+  useSetupModuleHooks
+};

package/dist/hooks/setup-module/type.d.ts

@@ -0,0 +1,4 @@
+export type Prefix = '_Module'
+export type ExcludePrefixKeys<T, Prefix extends string> = {
+  [K in keyof T as K extends `${Prefix}${string}` ? never : K]: T[K]
+}

package/dist/index.js

@@ -3,6 +3,8 @@ import * as index$2 from "./directives/index.js";
 import "./element-plus/index.js";
 import { useTableSearchHooks } from "./hooks/table-search/index.js";
 import { useInjectEventsHooks } from "./hooks/inject-events/index.js";
+import { onReactivated } from "./hooks/life-cycle/index.js";
+import { SetupLifeCycle, useSetupModuleHooks } from "./hooks/setup-module/index.js";
 import { useEmptyHooks } from "./components/empty/hooks/index.js";
 import { MatchUnit } from "./utils/match-unit/index.js";
 import { TransitionFade } from "./utils/transition-fade/index.js";
@@ -74,6 +76,7 @@ export {
   Pages,
   PromiseUtil,
   RejectError,
+  SetupLifeCycle,
   TableUtil,
   TransitionFade,
   YsVideo,
@@ -88,6 +91,7 @@ export {
   newAMapMarkerCluster,
   numberRule,
   numberTag,
+  onReactivated,
   passwordRule,
   passwordTag,
   phoneRule,
@@ -112,6 +116,7 @@ export {
   useElTableSortHooks,
   useEmptyHooks,
   useInjectEventsHooks,
+  useSetupModuleHooks,
   useTableSearchHooks,
   usernameRule,
   usernameTag,

package/dist/utils/amap/@type/Marker.d.ts

@@ -84,6 +84,8 @@ export class Marker {
   setContent(content: string | HTMLElement): void
 
   getBounds(): AMap.Bounds
+
+  getContentDom(): HTMLElement
 }
 
 interface MarkerOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrxy-yk",
-  "version": "1.3.5",
+  "version": "1.4.1",
   "private": false,
   "type": "module",
   "description": "A collection of Vue 3 components and utilities",

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "mrxy-yk",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "js-types-syntax": "typescript",
   "contributions": {
     "html": {
@@ -753,7 +753,7 @@
               "type": [
                 "boolean"
               ],
-              "description": "Dialog右上角是否显示关闭按钮"
+              "description": "Dialog右上角是否显示关闭按钮，缺省值为true"
             }
           ],
           "slots": [