phecda-vue 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/index.d.ts

@@ -38,6 +38,7 @@ type _DeepPartial<T> = {
 };
 
 declare function useO<T extends new (...args: any) => any>(Model: T): UnwrapNestedRefs<InstanceType<T>>;
+declare function useRaw<T extends new (...args: any) => any>(Model: T): InstanceType<T>;
 declare function usePatch<T extends new (...args: any) => any>(Model: T, Data: _DeepPartial<InstanceType<T>>): void;
 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>>;
@@ -97,7 +98,13 @@ declare const createLayer: <T>(wrapComp: Component<T>, props?: Partial<T>, model
 
 declare function createTable<P extends {
     $props: any;
-}>(compSet: Record<string, Component> | any, table: Component<P>, tableColumn: Component | false, data?: any): DefineComponent<{
+}>(compSet: Record<string, Component> | any, options: {
+    table: Component<P>;
+    column?: Component | false;
+    data?: any;
+    columnSlot?: string;
+    cellSlot?: string;
+}): DefineComponent<{
     config: Object;
 } & P['$props']>;
 
@@ -129,4 +136,4 @@ declare class PV {
     off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
 }
 
-export { EXPRESS_RE, FN_RE, GetDevUIRules, PV, PhecdaEmitter, ReplaceInstanceValues, SchemaToObj, createFilter, createForm, createFormData, createLayer, createModal, createPhecda, createPipe, createTable, emitter, getActivePhecda, getAntDRules, getArcoRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initialize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useV };
+export { EXPRESS_RE, FN_RE, GetDevUIRules, PV, PhecdaEmitter, ReplaceInstanceValues, SchemaToObj, createFilter, createForm, createFormData, createLayer, createModal, createPhecda, createPipe, createTable, emitter, getActivePhecda, getAntDRules, getArcoRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initialize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };

package/dist/index.js

@@ -56,6 +56,7 @@ __export(src_exports, {
   useO: () => useO,
   usePatch: () => usePatch,
   useR: () => useR,
+  useRaw: () => useRaw,
   useV: () => useV
 });
 module.exports = __toCommonJS(src_exports);
@@ -251,6 +252,10 @@ function useO(Model) {
   return useOMap.get(Model);
 }
 __name(useO, "useO");
+function useRaw(Model) {
+  return (0, import_vue3.toRaw)(useO(Model));
+}
+__name(useRaw, "useRaw");
 function usePatch(Model, Data) {
   useO(Model);
   const { useOMap } = getActivePhecda();
@@ -749,28 +754,35 @@ var createLayer = /* @__PURE__ */ __name(function(modalWrapper, content_props =
 
 // src/components/createTable.ts
 var import_vue8 = require("vue");
-function createTable(compSet, table, tableColumn, data) {
+function createTable(compSet, options) {
+  const { table, column: tableColumn, data, cellSlot = "default", columnSlot = "default" } = options;
   const TableColumn = (0, import_vue8.defineComponent)({
     name: "PhecdaTableColumn",
-    props: {
-      tableColumn: {
-        type: Object,
-        required: true
-      }
-    },
-    setup(props) {
-      const compName = props.tableColumn._component;
-      return () => (0, import_vue8.h)(tableColumn, {
-        ...props.tableColumn
-      }, {
-        default: (scope) => {
+    setup(_props, { attrs }) {
+      const compName = attrs._component;
+      const childrens = attrs._children && {
+        default: () => attrs._children.map((child) => (0, import_vue8.h)(tableColumn, child))
+      };
+      if (tableColumn) {
+        return () => (0, import_vue8.h)(tableColumn, attrs, compName ? {
+          [`${cellSlot}`]: (scope) => {
+            const childrenProps = typeof attrs._props === "function" ? attrs._props?.(scope) : attrs._props;
+            return (0, import_vue8.h)(compSet[compName], {
+              data,
+              ...childrenProps || {}
+            }, childrenProps?._slots);
+          }
+        } : childrens);
+      } else {
+        return (scope) => {
+          const childrenProps = typeof attrs._props === "function" ? attrs._props?.(scope) : attrs._props;
           return compName ? (0, import_vue8.h)(compSet[compName], {
             scope,
             data,
-            ...props.tableColumn._props || {}
-          }) : null;
-        }
-      });
+            ...childrenProps || {}
+          }, childrenProps?._slots) : childrens;
+        };
+      }
     }
   });
   return (0, import_vue8.defineComponent)({
@@ -792,10 +804,9 @@ function createTable(compSet, table, tableColumn, data) {
         return (0, import_vue8.h)(table, Object.assign({
           ref: dom
         }, ctx.attrs), {
-          default: () => props.config.map((item) => {
-            return (0, import_vue8.h)(TableColumn, {
-              tableColumn: item
-            });
+          [`${columnSlot}`]: (scope) => props.config.map((item) => {
+            item = typeof item === "function" ? item(scope) : item;
+            return (0, import_vue8.h)(TableColumn, item);
           })
         });
       };
@@ -907,5 +918,6 @@ __name(PV, "PV");
   useO,
   usePatch,
   useR,
+  useRaw,
   useV
 });

package/dist/index.mjs

@@ -115,7 +115,7 @@ function getReactiveMap(symbol) {
 __name(getReactiveMap, "getReactiveMap");
 
 // src/vue/composable.ts
-import { computed, onBeforeUnmount, reactive } from "vue";
+import { computed, onBeforeUnmount, reactive, toRaw } from "vue";
 import { getHandler, register } from "phecda-core";
 
 // src/vue/utils.ts
@@ -192,6 +192,10 @@ function useO(Model) {
   return useOMap.get(Model);
 }
 __name(useO, "useO");
+function useRaw(Model) {
+  return toRaw(useO(Model));
+}
+__name(useRaw, "useRaw");
 function usePatch(Model, Data) {
   useO(Model);
   const { useOMap } = getActivePhecda();
@@ -690,28 +694,35 @@ var createLayer = /* @__PURE__ */ __name(function(modalWrapper, content_props =
 
 // src/components/createTable.ts
 import { defineComponent as defineComponent3, h as h3, onMounted as onMounted2, ref as ref3 } from "vue";
-function createTable(compSet, table, tableColumn, data) {
+function createTable(compSet, options) {
+  const { table, column: tableColumn, data, cellSlot = "default", columnSlot = "default" } = options;
   const TableColumn = defineComponent3({
     name: "PhecdaTableColumn",
-    props: {
-      tableColumn: {
-        type: Object,
-        required: true
-      }
-    },
-    setup(props) {
-      const compName = props.tableColumn._component;
-      return () => h3(tableColumn, {
-        ...props.tableColumn
-      }, {
-        default: (scope) => {
+    setup(_props, { attrs }) {
+      const compName = attrs._component;
+      const childrens = attrs._children && {
+        default: () => attrs._children.map((child) => h3(tableColumn, child))
+      };
+      if (tableColumn) {
+        return () => h3(tableColumn, attrs, compName ? {
+          [`${cellSlot}`]: (scope) => {
+            const childrenProps = typeof attrs._props === "function" ? attrs._props?.(scope) : attrs._props;
+            return h3(compSet[compName], {
+              data,
+              ...childrenProps || {}
+            }, childrenProps?._slots);
+          }
+        } : childrens);
+      } else {
+        return (scope) => {
+          const childrenProps = typeof attrs._props === "function" ? attrs._props?.(scope) : attrs._props;
           return compName ? h3(compSet[compName], {
             scope,
             data,
-            ...props.tableColumn._props || {}
-          }) : null;
-        }
-      });
+            ...childrenProps || {}
+          }, childrenProps?._slots) : childrens;
+        };
+      }
     }
   });
   return defineComponent3({
@@ -733,10 +744,9 @@ function createTable(compSet, table, tableColumn, data) {
         return h3(table, Object.assign({
           ref: dom
         }, ctx.attrs), {
-          default: () => props.config.map((item) => {
-            return h3(TableColumn, {
-              tableColumn: item
-            });
+          [`${columnSlot}`]: (scope) => props.config.map((item) => {
+            item = typeof item === "function" ? item(scope) : item;
+            return h3(TableColumn, item);
           })
         });
       };
@@ -847,5 +857,6 @@ export {
   useO,
   usePatch,
   useR,
+  useRaw,
   useV
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "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": "2.0.0-alpha.2"
+    "phecda-core": "2.0.0-alpha.3"
   },
   "devDependencies": {
     "tsup": "^6.5.0"