phecda-vue 2.1.1 → 2.1.3-alpha.0

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Events } from 'phecda-core';
 export * from 'phecda-core';
 import * as vue from 'vue';
-import { Ref, App, UnwrapNestedRefs, Component } from 'vue';
+import { Ref, App, UnwrapNestedRefs } from 'vue';
 import { Handler } from 'mitt';
 
 type ReplaceInstanceValues<I> = {
@@ -10,6 +10,13 @@ type ReplaceInstanceValues<I> = {
 type SchemaToObj<S> = {
     [P in keyof S]: S[P] extends object ? SchemaToObj<S[P]> : (S[P] extends string ? any : S[P]);
 };
+interface PhecdaInstance {
+    useOMap: Map<any, any>;
+    useVMap: WeakMap<any, any>;
+    useRMap: WeakMap<any, any>;
+    fnMap: WeakMap<any, any>;
+    computedMap: WeakMap<any, any>;
+}
 interface PhecdaEmitter {
     on<N extends keyof Events>(eventName: N, cb: (args: Events[N]) => void): void;
     off<N extends keyof Events>(eventName: N, cb?: (args: Events[N]) => void): void;
@@ -23,13 +30,6 @@ declare const interval: any;
 declare function createPhecda(symbol?: string): vue.Raw<{
     install(app: App): void;
 }>;
-interface PhecdaInstance {
-    useVMap: WeakMap<any, any>;
-    useOMap: Map<any, any>;
-    useRMap: WeakMap<any, any>;
-    fnMap: WeakMap<any, any>;
-    computedMap: WeakMap<any, any>;
-}
 declare function setActivePhecda(phecda: PhecdaInstance): void;
 declare function getActivePhecda(): PhecdaInstance;
 declare function getReactiveMap(symbol: string): Map<string, any> | null;
@@ -44,7 +44,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): ReplaceInstanceValues<InstanceType<T>>;
 declare function useEvent<Key extends keyof Events>(eventName: Key, cb: Handler<Events[Key]>): () => void;
-declare function initialize<M extends new (...args: any) => any>(Model: M): InstanceType<M> | void;
+declare function initialize<M extends new (...args: any) => any>(Model: M, deleteOtherProperty?: boolean): InstanceType<M> | void;
 
 declare const RE: RegExp;
 declare function createFilter<Data extends Record<string, any>>(initState?: Object, option?: {
@@ -67,13 +67,6 @@ declare function createFilter<Data extends Record<string, any>>(initState?: Obje
     delState: (key: string) => void;
 };
 
-declare const createLayer: <T>(wrapComp: Component<T>, props?: Partial<T>, modelKey?: string) => <P>(comp: Component<P>, props?: P, modalProps?: Partial<T>) => void;
-
-declare const createDialog: <T>(comp: Component<T>, opts?: {
-    modelKey?: string;
-    props?: Partial<T>;
-}) => (props?: Partial<T>) => void;
-
 declare class PV {
     constructor();
     get tag(): any;
@@ -82,4 +75,4 @@ declare class PV {
     off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
 }
 
-export { PV, PhecdaEmitter, RE, ReplaceInstanceValues, SchemaToObj, createDialog, createFilter, createLayer, createPhecda, emitter, getActivePhecda, getReactiveMap, initialize, interval, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };
+export { PV, PhecdaEmitter, PhecdaInstance, RE, ReplaceInstanceValues, SchemaToObj, createFilter, createPhecda, emitter, getActivePhecda, getReactiveMap, initialize, interval, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };

package/dist/index.js

@@ -30,9 +30,7 @@ var src_exports = {};
 __export(src_exports, {
   PV: () => PV,
   RE: () => RE,
-  createDialog: () => createDialog,
   createFilter: () => createFilter,
-  createLayer: () => createLayer,
   createPhecda: () => createPhecda,
   emitter: () => emitter,
   getActivePhecda: () => getActivePhecda,
@@ -248,18 +246,15 @@ function useRaw(Model) {
 }
 __name(useRaw, "useRaw");
 function usePatch(Model, Data) {
-  useO(Model);
-  const { useOMap } = getActivePhecda();
-  const target = useOMap.get(Model);
-  mergeReactiveObjects(target, Data);
+  const instance = useO(Model);
+  mergeReactiveObjects(instance, Data);
 }
 __name(usePatch, "usePatch");
 function useR(Model) {
-  useO(Model);
-  const { useRMap, useOMap, fnMap } = getActivePhecda();
-  if (useRMap.has(Model))
-    return useRMap.get(Model);
-  const instance = useOMap.get(Model);
+  const { useRMap, fnMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useRMap.has(instance))
+    return useRMap.get(instance);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -279,17 +274,16 @@ function useR(Model) {
       return true;
     }
   });
-  useRMap.set(Model, proxy);
+  useRMap.set(instance, proxy);
   return proxy;
 }
 __name(useR, "useR");
 function useV(Model) {
-  useO(Model);
-  const { useVMap, useOMap, fnMap, computedMap } = getActivePhecda();
-  if (useVMap.has(Model))
-    return useVMap.get(Model);
-  computedMap.set(Model, {});
-  const instance = useOMap.get(Model);
+  const { useVMap, fnMap, computedMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useVMap.has(instance))
+    return useVMap.get(instance);
+  computedMap.set(instance, {});
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -302,7 +296,7 @@ function useV(Model) {
         fnMap.set(target[key], wrapper);
         return wrapper;
       }
-      const cache = computedMap.get(Model);
+      const cache = computedMap.get(instance);
       if (key in cache)
         return cache[key]();
       cache[key] = createSharedReactive(() => {
@@ -314,7 +308,7 @@ function useV(Model) {
       return false;
     }
   });
-  useVMap.set(Model, proxy);
+  useVMap.set(instance, proxy);
   return proxy;
 }
 __name(useV, "useV");
@@ -326,11 +320,15 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initialize(Model) {
+function initialize(Model, deleteOtherProperty = true) {
   const instance = useO(Model);
-  if (instance) {
-    Object.assign(instance, new Model());
-    return instance;
+  const newInstance = new Model();
+  Object.assign(instance, newInstance);
+  if (deleteOtherProperty) {
+    for (const key in instance) {
+      if (!(key in newInstance))
+        delete instance[key];
+    }
   }
 }
 __name(initialize, "initialize");
@@ -433,78 +431,6 @@ __name(createFilter, "createFilter");
 // src/index.ts
 __reExport(src_exports, require("phecda-core"), module.exports);
 
-// src/components/createLayer.ts
-var import_vue5 = require("vue");
-var createLayer = /* @__PURE__ */ __name(function(modalWrapper, content_props = {}, modelKey = "modelValue") {
-  let isMounted = false;
-  const isShow = (0, import_vue5.shallowRef)(true);
-  const content = (0, import_vue5.shallowRef)();
-  const contentProps = (0, import_vue5.shallowRef)({});
-  const modalProps = (0, import_vue5.shallowRef)({});
-  const wrapper = (0, import_vue5.defineComponent)({
-    setup() {
-      return () => (0, import_vue5.h)(modalWrapper, {
-        [modelKey]: isShow.value,
-        [`onUpdate:${modelKey}`]: (v) => {
-          isShow.value = v;
-        },
-        ...modalProps.value
-      }, {
-        default: (slot = {}) => content.value && (0, import_vue5.h)(content.value, {
-          ...contentProps.value,
-          ...slot
-        })
-      });
-    }
-  });
-  return (comp, props, modal_props) => {
-    content.value = comp;
-    contentProps.value = props;
-    modalProps.value = Object.assign({}, content_props, modal_props);
-    if (!isMounted) {
-      const el = document.createElement("div");
-      const vnode = (0, import_vue5.h)(wrapper);
-      vnode.appContext = interval.app?._context;
-      document.body.appendChild(((0, import_vue5.render)(vnode, el), el));
-      isMounted = true;
-    } else {
-      isShow.value = true;
-    }
-  };
-}, "createLayer");
-
-// src/components/createDialog.ts
-var import_vue6 = require("vue");
-var createDialog = /* @__PURE__ */ __name(function(comp, opts = {}) {
-  let isMounted = false;
-  const { modelKey = "modelValue", props = {} } = opts;
-  const isShow = (0, import_vue6.shallowRef)(true);
-  const contentProps = (0, import_vue6.shallowRef)({});
-  const wrapper = (0, import_vue6.defineComponent)({
-    setup() {
-      return () => (0, import_vue6.h)(comp, {
-        [modelKey]: isShow.value,
-        [`onUpdate:${modelKey}`]: (v) => {
-          isShow.value = v;
-        },
-        ...contentProps.value
-      });
-    }
-  });
-  return (_props = {}) => {
-    contentProps.value = Object.assign({}, props, _props);
-    if (!isMounted) {
-      const el = document.createElement("div");
-      const vnode = (0, import_vue6.h)(wrapper);
-      vnode.appContext = interval.app?._context;
-      document.body.appendChild(((0, import_vue6.render)(vnode, el), el));
-      isMounted = true;
-    } else {
-      isShow.value = true;
-    }
-  };
-}, "createDialog");
-
 // src/wrapper.ts
 var PV = class {
   constructor() {
@@ -527,9 +453,7 @@ __name(PV, "PV");
 0 && (module.exports = {
   PV,
   RE,
-  createDialog,
   createFilter,
-  createLayer,
   createPhecda,
   emitter,
   getActivePhecda,

package/dist/index.mjs

@@ -199,18 +199,15 @@ function useRaw(Model) {
 }
 __name(useRaw, "useRaw");
 function usePatch(Model, Data) {
-  useO(Model);
-  const { useOMap } = getActivePhecda();
-  const target = useOMap.get(Model);
-  mergeReactiveObjects(target, Data);
+  const instance = useO(Model);
+  mergeReactiveObjects(instance, Data);
 }
 __name(usePatch, "usePatch");
 function useR(Model) {
-  useO(Model);
-  const { useRMap, useOMap, fnMap } = getActivePhecda();
-  if (useRMap.has(Model))
-    return useRMap.get(Model);
-  const instance = useOMap.get(Model);
+  const { useRMap, fnMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useRMap.has(instance))
+    return useRMap.get(instance);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -230,17 +227,16 @@ function useR(Model) {
       return true;
     }
   });
-  useRMap.set(Model, proxy);
+  useRMap.set(instance, proxy);
   return proxy;
 }
 __name(useR, "useR");
 function useV(Model) {
-  useO(Model);
-  const { useVMap, useOMap, fnMap, computedMap } = getActivePhecda();
-  if (useVMap.has(Model))
-    return useVMap.get(Model);
-  computedMap.set(Model, {});
-  const instance = useOMap.get(Model);
+  const { useVMap, fnMap, computedMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useVMap.has(instance))
+    return useVMap.get(instance);
+  computedMap.set(instance, {});
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -253,7 +249,7 @@ function useV(Model) {
         fnMap.set(target[key], wrapper);
         return wrapper;
       }
-      const cache = computedMap.get(Model);
+      const cache = computedMap.get(instance);
       if (key in cache)
         return cache[key]();
       cache[key] = createSharedReactive(() => {
@@ -265,7 +261,7 @@ function useV(Model) {
       return false;
     }
   });
-  useVMap.set(Model, proxy);
+  useVMap.set(instance, proxy);
   return proxy;
 }
 __name(useV, "useV");
@@ -277,11 +273,15 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initialize(Model) {
+function initialize(Model, deleteOtherProperty = true) {
   const instance = useO(Model);
-  if (instance) {
-    Object.assign(instance, new Model());
-    return instance;
+  const newInstance = new Model();
+  Object.assign(instance, newInstance);
+  if (deleteOtherProperty) {
+    for (const key in instance) {
+      if (!(key in newInstance))
+        delete instance[key];
+    }
   }
 }
 __name(initialize, "initialize");
@@ -384,78 +384,6 @@ __name(createFilter, "createFilter");
 // src/index.ts
 export * from "phecda-core";
 
-// src/components/createLayer.ts
-import { defineComponent, h, render, shallowRef } from "vue";
-var createLayer = /* @__PURE__ */ __name(function(modalWrapper, content_props = {}, modelKey = "modelValue") {
-  let isMounted = false;
-  const isShow = shallowRef(true);
-  const content = shallowRef();
-  const contentProps = shallowRef({});
-  const modalProps = shallowRef({});
-  const wrapper = defineComponent({
-    setup() {
-      return () => h(modalWrapper, {
-        [modelKey]: isShow.value,
-        [`onUpdate:${modelKey}`]: (v) => {
-          isShow.value = v;
-        },
-        ...modalProps.value
-      }, {
-        default: (slot = {}) => content.value && h(content.value, {
-          ...contentProps.value,
-          ...slot
-        })
-      });
-    }
-  });
-  return (comp, props, modal_props) => {
-    content.value = comp;
-    contentProps.value = props;
-    modalProps.value = Object.assign({}, content_props, modal_props);
-    if (!isMounted) {
-      const el = document.createElement("div");
-      const vnode = h(wrapper);
-      vnode.appContext = interval.app?._context;
-      document.body.appendChild((render(vnode, el), el));
-      isMounted = true;
-    } else {
-      isShow.value = true;
-    }
-  };
-}, "createLayer");
-
-// src/components/createDialog.ts
-import { defineComponent as defineComponent2, h as h2, render as render2, shallowRef as shallowRef2 } from "vue";
-var createDialog = /* @__PURE__ */ __name(function(comp, opts = {}) {
-  let isMounted = false;
-  const { modelKey = "modelValue", props = {} } = opts;
-  const isShow = shallowRef2(true);
-  const contentProps = shallowRef2({});
-  const wrapper = defineComponent2({
-    setup() {
-      return () => h2(comp, {
-        [modelKey]: isShow.value,
-        [`onUpdate:${modelKey}`]: (v) => {
-          isShow.value = v;
-        },
-        ...contentProps.value
-      });
-    }
-  });
-  return (_props = {}) => {
-    contentProps.value = Object.assign({}, props, _props);
-    if (!isMounted) {
-      const el = document.createElement("div");
-      const vnode = h2(wrapper);
-      vnode.appContext = interval.app?._context;
-      document.body.appendChild((render2(vnode, el), el));
-      isMounted = true;
-    } else {
-      isShow.value = true;
-    }
-  };
-}, "createDialog");
-
 // src/wrapper.ts
 var PV = class {
   constructor() {
@@ -477,9 +405,7 @@ __name(PV, "PV");
 export {
   PV,
   RE,
-  createDialog,
   createFilter,
-  createLayer,
   createPhecda,
   emitter,
   getActivePhecda,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "2.1.1",
+  "version": "2.1.3-alpha.0",
   "description": "provide store/form/table with phecda function to vue",
   "main": "dist/index.js",
   "module": "dist/index.mjs",