phecda-vue 1.2.9 → 1.3.0

package/dist/index.d.ts

@@ -48,9 +48,7 @@ declare function usePatch<T extends new (...args: any) => any>(Model: T, Data: _
 declare function useR<T extends new (...args: any) => any>(Model: T): UnwrapNestedRefs<InstanceType<T>>;
 declare function useV<T extends new (...args: any) => any>(Model: T): PublicOnly<ReplaceInstanceValues<InstanceType<T>>>;
 declare function useEvent<Key extends keyof PhecdaEvents>(eventName: Key, cb: Handler<PhecdaEvents[Key]>): () => void;
-declare function initalize<M extends new (...args: any) => any>(Model: M): InstanceType<M> | void;
-declare function clearStorage<M extends new (...args: any) => any>(Model: M, isForceUpdate?: boolean): void;
-declare function deleteStorage(tag: string): void;
+declare function initialize<M extends new (...args: any) => any>(Model: M): InstanceType<M> | void;
 
 declare const EXPRESS_RE: RegExp;
 declare const FN_RE: RegExp;
@@ -77,7 +75,7 @@ declare function createForm<P extends {
     $props: any;
 }>(compSet: Record<string, Component> | any, form: Component<P>, formItem: Component | false, options?: {
     modelKey?: string;
-    onUpdate?: (key: string) => void;
+    onUpdate?: (key: string, v: any) => void;
 }): DefineComponent<{
     config: Object;
     data: Object;
@@ -129,4 +127,4 @@ declare class PV {
     off<Key extends keyof PhecdaEvents>(type: Key, handler?: (arg: PhecdaEvents[Key]) => void): void;
 }
 
-export { EXPRESS_RE, FN_RE, GetDevUIRules, PV, PhecdaEmitter, PublicOnly, ReplaceInstanceValues, SchemaToObj, clearStorage, createFilter, createForm, createFormData, createModal, createPhecda, createPipe, createTable, deleteStorage, emitter, getActivePhecda, getAntDRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initalize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useV };
+export { EXPRESS_RE, FN_RE, GetDevUIRules, PV, PhecdaEmitter, PublicOnly, ReplaceInstanceValues, SchemaToObj, createFilter, createForm, createFormData, createModal, createPhecda, createPipe, createTable, emitter, getActivePhecda, getAntDRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initialize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useV };

package/dist/index.js

@@ -32,7 +32,6 @@ __export(src_exports, {
   FN_RE: () => FN_RE,
   GetDevUIRules: () => GetDevUIRules,
   PV: () => PV,
-  clearStorage: () => clearStorage,
   createFilter: () => createFilter,
   createForm: () => createForm,
   createFormData: () => createFormData,
@@ -40,7 +39,6 @@ __export(src_exports, {
   createPhecda: () => createPhecda,
   createPipe: () => createPipe,
   createTable: () => createTable,
-  deleteStorage: () => deleteStorage,
   emitter: () => emitter,
   getActivePhecda: () => getActivePhecda,
   getAntDRules: () => getAntDRules,
@@ -49,7 +47,7 @@ __export(src_exports, {
   getNutUIRules: () => getNutUIRules,
   getReactiveMap: () => getReactiveMap,
   getVantRules: () => getVantRules,
-  initalize: () => initalize,
+  initialize: () => initialize,
   phecdaSymbol: () => phecdaSymbol,
   setActivePhecda: () => setActivePhecda,
   useEvent: () => useEvent,
@@ -91,26 +89,49 @@ function createPhecda(symbol) {
         };
       }
       let eventRecord = [];
-      (0, import_phecda_core.injectProperty)("watcher", ({ eventName, instance, key, options }) => {
-        const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-        if (options?.once) {
-          const handler = /* @__PURE__ */ __name((...args) => {
-            fn(...args);
-            emitter.off(eventName, handler);
-          }, "handler");
-          emitter.on(eventName, handler);
-          eventRecord.push([
-            eventName,
-            handler
-          ]);
-        } else {
-          eventRecord.push([
-            eventName,
-            fn
-          ]);
-          emitter.on(eventName, fn);
-        }
-      });
+      if (!(0, import_phecda_core.getProperty)("watcher")) {
+        (0, import_phecda_core.injectProperty)("watcher", ({ eventName, instance, key, options }) => {
+          const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
+          if (options?.once) {
+            const handler = /* @__PURE__ */ __name((...args) => {
+              fn(...args);
+              emitter.off(eventName, handler);
+            }, "handler");
+            emitter.on(eventName, handler);
+            eventRecord.push([
+              eventName,
+              handler
+            ]);
+          } else {
+            eventRecord.push([
+              eventName,
+              fn
+            ]);
+            emitter.on(eventName, fn);
+          }
+        });
+      }
+      if (!(0, import_phecda_core.getProperty)("storage")) {
+        (0, import_phecda_core.injectProperty)("storage", ({ tag, key, instance }) => {
+          if (!tag)
+            return;
+          const initstr = localStorage.getItem(tag);
+          if (initstr) {
+            const data = JSON.parse(initstr);
+            if (key) {
+              instance[key] = data;
+            } else {
+              for (const i in data) {
+                if (i)
+                  instance[i] = data[i];
+              }
+            }
+          }
+          globalThis.addEventListener("beforeunload", () => {
+            localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
+          });
+        });
+      }
       const originUnmount = app.unmount.bind(app);
       app.unmount = () => {
         eventRecord.forEach(([eventName, handler]) => emitter.off(eventName, handler));
@@ -314,23 +335,14 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initalize(Model) {
+function initialize(Model) {
   const instance = useO(Model);
   if (instance) {
     Object.assign(instance, new Model());
     return instance;
   }
 }
-__name(initalize, "initalize");
-function clearStorage(Model, isForceUpdate = true) {
-  localStorage.removeItem(`_phecda_${useO(Model)._symbol}`);
-  isForceUpdate && initalize(Model);
-}
-__name(clearStorage, "clearStorage");
-function deleteStorage(tag) {
-  localStorage.removeItem(`_phecda_${tag}`);
-}
-__name(deleteStorage, "deleteStorage");
+__name(initialize, "initialize");
 
 // src/filter.ts
 var import_vue4 = require("vue");
@@ -439,8 +451,10 @@ function createForm(compSet, form, formItem, options = {}) {
       ...props.config[property],
       [`${modelKey}`]: props.data[property],
       [`onUpdate:${modelKey}`]: (v) => {
-        onUpdate?.(property);
-        props.data[property] = v;
+        if (onUpdate)
+          onUpdate(property, v);
+        else
+          props.data[property] = v;
       }
     }, {
       default: () => generateChildVNode(props.config[props.property])
@@ -780,7 +794,6 @@ __name(PV, "PV");
   FN_RE,
   GetDevUIRules,
   PV,
-  clearStorage,
   createFilter,
   createForm,
   createFormData,
@@ -788,7 +801,6 @@ __name(PV, "PV");
   createPhecda,
   createPipe,
   createTable,
-  deleteStorage,
   emitter,
   getActivePhecda,
   getAntDRules,
@@ -797,7 +809,7 @@ __name(PV, "PV");
   getNutUIRules,
   getReactiveMap,
   getVantRules,
-  initalize,
+  initialize,
   phecdaSymbol,
   setActivePhecda,
   useEvent,

package/dist/index.mjs

@@ -7,7 +7,7 @@ var emitter = mitt();
 
 // src/vue/phecda.ts
 import { markRaw } from "vue";
-import { getTag, injectProperty } from "phecda-core";
+import { getProperty, getTag, injectProperty } from "phecda-core";
 var phecdaSymbol = Symbol("phecda");
 function createPhecda(symbol) {
   const phecda = markRaw({
@@ -32,26 +32,49 @@ function createPhecda(symbol) {
         };
       }
       let eventRecord = [];
-      injectProperty("watcher", ({ eventName, instance, key, options }) => {
-        const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-        if (options?.once) {
-          const handler = /* @__PURE__ */ __name((...args) => {
-            fn(...args);
-            emitter.off(eventName, handler);
-          }, "handler");
-          emitter.on(eventName, handler);
-          eventRecord.push([
-            eventName,
-            handler
-          ]);
-        } else {
-          eventRecord.push([
-            eventName,
-            fn
-          ]);
-          emitter.on(eventName, fn);
-        }
-      });
+      if (!getProperty("watcher")) {
+        injectProperty("watcher", ({ eventName, instance, key, options }) => {
+          const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
+          if (options?.once) {
+            const handler = /* @__PURE__ */ __name((...args) => {
+              fn(...args);
+              emitter.off(eventName, handler);
+            }, "handler");
+            emitter.on(eventName, handler);
+            eventRecord.push([
+              eventName,
+              handler
+            ]);
+          } else {
+            eventRecord.push([
+              eventName,
+              fn
+            ]);
+            emitter.on(eventName, fn);
+          }
+        });
+      }
+      if (!getProperty("storage")) {
+        injectProperty("storage", ({ tag, key, instance }) => {
+          if (!tag)
+            return;
+          const initstr = localStorage.getItem(tag);
+          if (initstr) {
+            const data = JSON.parse(initstr);
+            if (key) {
+              instance[key] = data;
+            } else {
+              for (const i in data) {
+                if (i)
+                  instance[i] = data[i];
+              }
+            }
+          }
+          globalThis.addEventListener("beforeunload", () => {
+            localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
+          });
+        });
+      }
       const originUnmount = app.unmount.bind(app);
       app.unmount = () => {
         eventRecord.forEach(([eventName, handler]) => emitter.off(eventName, handler));
@@ -255,23 +278,14 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initalize(Model) {
+function initialize(Model) {
   const instance = useO(Model);
   if (instance) {
     Object.assign(instance, new Model());
     return instance;
   }
 }
-__name(initalize, "initalize");
-function clearStorage(Model, isForceUpdate = true) {
-  localStorage.removeItem(`_phecda_${useO(Model)._symbol}`);
-  isForceUpdate && initalize(Model);
-}
-__name(clearStorage, "clearStorage");
-function deleteStorage(tag) {
-  localStorage.removeItem(`_phecda_${tag}`);
-}
-__name(deleteStorage, "deleteStorage");
+__name(initialize, "initialize");
 
 // src/filter.ts
 import { effectScope as effectScope2, reactive as reactive2, ref } from "vue";
@@ -380,8 +394,10 @@ function createForm(compSet, form, formItem, options = {}) {
       ...props.config[property],
       [`${modelKey}`]: props.data[property],
       [`onUpdate:${modelKey}`]: (v) => {
-        onUpdate?.(property);
-        props.data[property] = v;
+        if (onUpdate)
+          onUpdate(property, v);
+        else
+          props.data[property] = v;
       }
     }, {
       default: () => generateChildVNode(props.config[props.property])
@@ -720,7 +736,6 @@ export {
   FN_RE,
   GetDevUIRules,
   PV,
-  clearStorage,
   createFilter,
   createForm,
   createFormData,
@@ -728,7 +743,6 @@ export {
   createPhecda,
   createPipe,
   createTable,
-  deleteStorage,
   emitter,
   getActivePhecda,
   getAntDRules,
@@ -737,7 +751,7 @@ export {
   getNutUIRules,
   getReactiveMap,
   getVantRules,
-  initalize,
+  initialize,
   phecdaSymbol,
   setActivePhecda,
   useEvent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "provide store/form/table with phecda function to vue",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,7 +14,7 @@
   "dependencies": {
     "mitt": "^3.0.0",
     "vue": "^3.2.45",
-    "phecda-core": "1.1.1"
+    "phecda-core": "1.2.0"
   },
   "devDependencies": {
     "tsup": "^6.5.0"