@fangzhongya/page 0.0.26 → 0.0.27

package/dist/components/control/config.cjs

@@ -79,7 +79,7 @@ function getDesignSlots(obj, callback) {
         });
       } else {
         if (!common.isEmpty(slot)) {
-          objs[key] = common.setSlots({ slots: slot }).default;
+          objs[key] = common.getSlots(slot)?.default;
         }
       }
     }

package/dist/components/control/config.js

@@ -1,4 +1,4 @@
-import { isEmpty, setSlots } from "../../render/common.js";
+import { isEmpty, getSlots } from "../../render/common.js";
 import { getScopeObject } from "../../render/config.js";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { setCssSize } from "../../utils/index.js";
@@ -77,7 +77,7 @@ function getDesignSlots(obj, callback) {
         });
       } else {
         if (!isEmpty(slot)) {
-          objs[key] = setSlots({ slots: slot }).default;
+          objs[key] = getSlots(slot)?.default;
         }
       }
     }

package/dist/components/control/design.cjs

@@ -33,7 +33,7 @@ const generals = [
   "PageVifEif",
   "PageHtml"
 ];
-function setSlots(obj, params = {}, temps) {
+function setSlotsDom(obj, params = {}, temps) {
   return (config2) => {
     if (obj.name == "PagePosition") {
       config2.position = void 0;
@@ -142,7 +142,7 @@ function setDesign(obj, params = {}, temps) {
       obj,
       params,
       temps,
-      setSlots(obj, params, temps),
+      setSlotsDom(obj, params, temps),
       setCompon()
     );
   } else {
@@ -177,7 +177,7 @@ function getGeneralDiv(obj, params, temps) {
     assembly: obj
   };
   common.getData(obj, params, temps, config2);
-  const sls = setSlots(obj, params, temps);
+  const sls = setSlotsDom(obj, params, temps);
   const set = setCompon();
   const slots = sls(config2);
   return set(obj, config2, slots);

package/dist/components/control/design.d.ts

@@ -3,7 +3,9 @@ export declare function setDesign(obj: ControlDesign, params: ObjAny | undefined
 export declare function getResizable(slots: Array<ControlDesign>, obj: ControlDesign, params: ObjAny, key: string | undefined, temps: Array<TempsObject>): VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }>;
-export declare function getGeneralDiv(obj: ControlDesign, params: ObjAny, temps: Array<TempsObject>): any;
+export declare function getGeneralDiv(obj: ControlDesign, params: ObjAny, temps: Array<TempsObject>): string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
+    [key: string]: any;
+}>;
 export declare function getRender(params: ObjAny | undefined, lists: Array<ControlDesign> | undefined, temps: Array<TempsObject>): VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }>;

package/dist/components/control/design.js

@@ -31,7 +31,7 @@ const generals = [
   "PageVifEif",
   "PageHtml"
 ];
-function setSlots(obj, params = {}, temps) {
+function setSlotsDom(obj, params = {}, temps) {
   return (config) => {
     if (obj.name == "PagePosition") {
       config.position = void 0;
@@ -140,7 +140,7 @@ function setDesign(obj, params = {}, temps) {
       obj,
       params,
       temps,
-      setSlots(obj, params, temps),
+      setSlotsDom(obj, params, temps),
       setCompon()
     );
   } else {
@@ -175,7 +175,7 @@ function getGeneralDiv(obj, params, temps) {
     assembly: obj
   };
   getData(obj, params, temps, config);
-  const sls = setSlots(obj, params, temps);
+  const sls = setSlotsDom(obj, params, temps);
   const set = setCompon();
   const slots = sls(config);
   return set(obj, config, slots);

package/dist/expand/{chunk-I2RMOBDW.js → chunk-KQKVKAJF.js}

@@ -1,5 +1,5 @@
 // expand/config.ts
-var components = ["container", "grid-layout", "grid-item", "position"];
+var components = ["container", "grid-item", "position", "grid-layout"];
 var sideEffects = ["grid-item", "grid-layout"];
 
 export {

package/dist/expand/{chunk-ZJCFZ63F.cjs → chunk-MYRRDRIS.cjs}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});// expand/config.ts
-var components = ["container", "grid-layout", "grid-item", "position"];
+var components = ["container", "grid-item", "position", "grid-layout"];
 var sideEffects = ["grid-item", "grid-layout"];
 
 

package/dist/expand/components.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkZJCFZ63Fcjs = require('./chunk-ZJCFZ63F.cjs');
+var _chunkMYRRDRIScjs = require('./chunk-MYRRDRIS.cjs');
 
 // node_modules/.pnpm/@fangzhongya+utils@0.0.75/node_modules/@fangzhongya/utils/dist/chunk-J7CICTHH.js
 function humpToLine(name) {
@@ -55,10 +55,10 @@ function namefilter(c, name) {
 function getFrom(mc) {
   const p = config.prefix ? config.prefix + "-" : "";
   const filename = p ? mc.replace(new RegExp("^" + p), "") : mc;
-  if (_chunkZJCFZ63Fcjs.components.includes(filename)) {
+  if (_chunkMYRRDRIScjs.components.includes(filename)) {
     const from = `${config.name}/assemblys/${filename}`;
     let css;
-    if (_chunkZJCFZ63Fcjs.sideEffects.includes(filename)) {
+    if (_chunkMYRRDRIScjs.sideEffects.includes(filename)) {
       css = `${config.name}/assemblys/${filename}.css`;
     }
     return {

package/dist/expand/components.js

@@ -1,7 +1,7 @@
 import {
   components,
   sideEffects
-} from "./chunk-I2RMOBDW.js";
+} from "./chunk-KQKVKAJF.js";
 
 // node_modules/.pnpm/@fangzhongya+utils@0.0.75/node_modules/@fangzhongya/utils/dist/chunk-J7CICTHH.js
 function humpToLine(name) {

package/dist/expand/config.cjs

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkZJCFZ63Fcjs = require('./chunk-ZJCFZ63F.cjs');
+var _chunkMYRRDRIScjs = require('./chunk-MYRRDRIS.cjs');
 
 
 
-exports.components = _chunkZJCFZ63Fcjs.components; exports.sideEffects = _chunkZJCFZ63Fcjs.sideEffects;
+exports.components = _chunkMYRRDRIScjs.components; exports.sideEffects = _chunkMYRRDRIScjs.sideEffects;

package/dist/expand/config.js

@@ -1,7 +1,7 @@
 import {
   components,
   sideEffects
-} from "./chunk-I2RMOBDW.js";
+} from "./chunk-KQKVKAJF.js";
 export {
   components,
   sideEffects

package/dist/render/common.cjs

@@ -7,17 +7,16 @@ const humpToLine = require("@fangzhongya/utils/name/humpToLine");
 const isObject = require("@fangzhongya/utils/basic/object/isObject");
 const render = require("../utils/render.cjs");
 const config = require("./config.cjs");
-function setSlots(obj) {
-  const slots = obj.slots;
+function getSlots(slots) {
   if (vue.isVNode(slots)) {
     return {
-      default: () => slots
+      default: () => [slots]
     };
   } else if (typeof slots === "function") {
     return {
       default: slots
     };
-  } else if (isObject.isObject(slots)) {
+  } else if (slots && isObject.isObject(slots) && !Array.isArray(slots)) {
     return slots;
   } else if (!isEmpty(slots)) {
     return {
@@ -25,32 +24,32 @@ function setSlots(obj) {
     };
   }
 }
-function setComponString(name, attarObj, obj = {}, compons = {}) {
+function getComponString(name, attarObj, obj = {}, compons = {}) {
   if (name === "Template") {
-    return vue.h(vue.Fragment, null, setSlots(obj).default?.());
+    return vue.h(vue.Fragment, null, getSlots(obj.slots)?.default?.());
   }
   compons = vue.inject("components", compons);
   const tcom = humpToLine.humpToLine(name);
   const cms = Object.keys(compons);
   if (cms.includes(name)) {
-    return vue.h(compons[name], attarObj, setSlots(obj));
+    return vue.h(compons[name], attarObj, getSlots(obj.slots));
   } else if (cms.includes(tcom)) {
-    return vue.h(compons[tcom], attarObj, setSlots(obj));
+    return vue.h(compons[tcom], attarObj, getSlots(obj.slots));
   }
   if (shared.isHTMLTag(tcom) || shared.isSVGTag(tcom)) {
-    return vue.h(tcom, attarObj, setSlots(obj).default?.());
+    return vue.h(tcom, attarObj, getSlots(obj.slots)?.default?.());
   }
-  return vue.h(vue.resolveComponent(name), attarObj, setSlots(obj));
+  return vue.h(vue.resolveComponent(name), attarObj, getSlots(obj.slots));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {
-    return setComponString(name, attarObj, obj, compons);
+    return getComponString(name, attarObj, obj, compons);
   } else if (typeof name == "function") {
-    return name(attarObj, setSlots(obj));
+    return name(attarObj, getSlots(obj.slots));
   } else if (vue.isVNode(name)) {
     return name;
   } else {
-    return vue.h(name, attarObj, setSlots(obj));
+    return vue.h(name, attarObj, getSlots(obj.slots));
   }
 }
 function getSlotsArray(obj, key = "default") {
@@ -62,7 +61,7 @@ function isEmpty(v) {
     return true;
   }
 }
-function getSlots(obj, callback) {
+function getSlotsDom(obj, callback) {
   const slots = obj.slots || {};
   const cs = obj.config?.scope;
   if (Array.isArray(slots)) {
@@ -87,7 +86,7 @@ function getSlots(obj, callback) {
         });
       } else {
         if (!isEmpty(slot)) {
-          objs[key] = setSlots({ slots: slot }).default;
+          objs[key] = getSlots(slot)?.default;
         }
       }
     }
@@ -139,7 +138,7 @@ function getCompon(obj, config$1, params, temps) {
     if (slots) {
       return vue.h(vue.Fragment, slots(config$1));
     } else {
-      return setRender(
+      return getRender(
         {
           name: "Template",
           slots: obj.slots
@@ -149,7 +148,7 @@ function getCompon(obj, config$1, params, temps) {
       );
     }
   } else if (name === "Component") {
-    return setRender(
+    return getRender(
       {
         name: config$1.is,
         slots: obj.slots,
@@ -188,7 +187,7 @@ function getCompon(obj, config$1, params, temps) {
                 }
               ];
               const ts = getTempsArr(temps, vfors, "forin");
-              return setRender(
+              return getRender(
                 {
                   name: "Template",
                   slots: obj.slots
@@ -213,7 +212,7 @@ function getCompon(obj, config$1, params, temps) {
               }
             ];
             const ts = getTempsArr(temps, vfors, "forof");
-            return setRender(
+            return getRender(
               {
                 name: "Template",
                 slots: obj.slots
@@ -250,7 +249,7 @@ function getCompon(obj, config$1, params, temps) {
     const slots = [];
     if (vc) {
       getSlotsArray(vc).forEach((v) => {
-        slots.push(setRender(v, params, temps));
+        slots.push(getRender(v, params, temps));
       });
     }
     return vue.h(vue.Fragment, null, slots);
@@ -279,13 +278,13 @@ function assemblyGetRender(obj, params = {}, temps, getSlots2, setCompon) {
     return "";
   }
 }
-function setRender(obj, params = {}, temps) {
+function getRender(obj, params = {}, temps) {
   return assemblyGetRender(
     obj,
     params,
     temps,
     (config2) => {
-      return getSlots(
+      return getSlotsDom(
         obj,
         (slots, key, scope) => {
           const ts = getTempsArr(temps, [scope]);
@@ -293,7 +292,7 @@ function setRender(obj, params = {}, temps) {
             vue.Fragment,
             null,
             slots.map((v) => {
-              return setRender(v, params, ts);
+              return getRender(v, params, ts);
             })
           );
         }
@@ -312,10 +311,9 @@ function setRender(obj, params = {}, temps) {
 }
 exports.assemblyGetRender = assemblyGetRender;
 exports.getData = getData;
+exports.getRender = getRender;
 exports.getSlots = getSlots;
 exports.getSlotsArray = getSlotsArray;
 exports.getTempsArr = getTempsArr;
 exports.isEmpty = isEmpty;
-exports.setRender = setRender;
-exports.setSlots = setSlots;
 exports.useGetCompon = useGetCompon;

package/dist/render/common.d.ts

@@ -1,22 +1,13 @@
-import { VNode } from 'vue';
+import { VNode, Slots } from 'vue';
 /**
  * 设置插槽配置
  * @param obj - 包含slots属性的ListObj对象
  * @returns 返回标准化的插槽配置对象
  */
-export declare function setSlots(obj: ObjAny): any;
-export declare function useGetCompon(name: any, attarObj: ObjAny, obj?: ObjAny, compons?: ObjAny): any;
+export declare function getSlots(slots: any): Slots | undefined;
+export declare function useGetCompon(name: any, attarObj: ObjAny, obj?: ObjAny, compons?: ObjAny): VNode | string;
 export declare function getSlotsArray(obj: ControlRender, key?: string): ControlRender[];
 export declare function isEmpty(v: any): true | undefined;
-/**
- * 生成插槽代码
- * @param obj
- * @param is
- * @returns
- */
-export declare function getSlots(obj: ControlRender, callback: (slots: ControlRender[], key: string, obj: TempsObjectKey) => void): {
-    [key: string]: any;
-};
 export declare function getTempsArr(temps: Array<TempsObject>, value: TempsObjectKey[], type?: string): TempsObject[];
 export declare function getData(obj: ControlRender, params: ObjAny | undefined, temps: Array<TempsObject>, config?: ObjAny): void;
 /**
@@ -30,4 +21,4 @@ export declare function assemblyGetRender(obj: ControlRender, params: ObjAny | u
  * @param obj 数据对象
  * @returns
  */
-export declare function setRender(obj: ControlRender, params: ObjAny | undefined, temps: Array<TempsObject>): VNode | string;
+export declare function getRender(obj: ControlRender, params: ObjAny | undefined, temps: Array<TempsObject>): VNode | string;

package/dist/render/common.js

@@ -5,17 +5,16 @@ import { humpToLine } from "@fangzhongya/utils/name/humpToLine";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { getRenderSlots, getClassId } from "../utils/render.js";
 import { getScopeObject, getForObject, getPropsValue, getConfig, getRefDom, getDirectives, getAttrs, getProps, getEmits } from "./config.js";
-function setSlots(obj) {
-  const slots = obj.slots;
+function getSlots(slots) {
   if (isVNode(slots)) {
     return {
-      default: () => slots
+      default: () => [slots]
     };
   } else if (typeof slots === "function") {
     return {
       default: slots
     };
-  } else if (isObject(slots)) {
+  } else if (slots && isObject(slots) && !Array.isArray(slots)) {
     return slots;
   } else if (!isEmpty(slots)) {
     return {
@@ -23,32 +22,32 @@ function setSlots(obj) {
     };
   }
 }
-function setComponString(name, attarObj, obj = {}, compons = {}) {
+function getComponString(name, attarObj, obj = {}, compons = {}) {
   if (name === "Template") {
-    return h(Fragment, null, setSlots(obj).default?.());
+    return h(Fragment, null, getSlots(obj.slots)?.default?.());
   }
   compons = inject("components", compons);
   const tcom = humpToLine(name);
   const cms = Object.keys(compons);
   if (cms.includes(name)) {
-    return h(compons[name], attarObj, setSlots(obj));
+    return h(compons[name], attarObj, getSlots(obj.slots));
   } else if (cms.includes(tcom)) {
-    return h(compons[tcom], attarObj, setSlots(obj));
+    return h(compons[tcom], attarObj, getSlots(obj.slots));
   }
   if (isHTMLTag(tcom) || isSVGTag(tcom)) {
-    return h(tcom, attarObj, setSlots(obj).default?.());
+    return h(tcom, attarObj, getSlots(obj.slots)?.default?.());
   }
-  return h(resolveComponent(name), attarObj, setSlots(obj));
+  return h(resolveComponent(name), attarObj, getSlots(obj.slots));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {
-    return setComponString(name, attarObj, obj, compons);
+    return getComponString(name, attarObj, obj, compons);
   } else if (typeof name == "function") {
-    return name(attarObj, setSlots(obj));
+    return name(attarObj, getSlots(obj.slots));
   } else if (isVNode(name)) {
     return name;
   } else {
-    return h(name, attarObj, setSlots(obj));
+    return h(name, attarObj, getSlots(obj.slots));
   }
 }
 function getSlotsArray(obj, key = "default") {
@@ -60,7 +59,7 @@ function isEmpty(v) {
     return true;
   }
 }
-function getSlots(obj, callback) {
+function getSlotsDom(obj, callback) {
   const slots = obj.slots || {};
   const cs = obj.config?.scope;
   if (Array.isArray(slots)) {
@@ -85,7 +84,7 @@ function getSlots(obj, callback) {
         });
       } else {
         if (!isEmpty(slot)) {
-          objs[key] = setSlots({ slots: slot }).default;
+          objs[key] = getSlots(slot)?.default;
         }
       }
     }
@@ -137,7 +136,7 @@ function getCompon(obj, config, params, temps) {
     if (slots) {
       return h(Fragment, slots(config));
     } else {
-      return setRender(
+      return getRender(
         {
           name: "Template",
           slots: obj.slots
@@ -147,7 +146,7 @@ function getCompon(obj, config, params, temps) {
       );
     }
   } else if (name === "Component") {
-    return setRender(
+    return getRender(
       {
         name: config.is,
         slots: obj.slots,
@@ -186,7 +185,7 @@ function getCompon(obj, config, params, temps) {
                 }
               ];
               const ts = getTempsArr(temps, vfors, "forin");
-              return setRender(
+              return getRender(
                 {
                   name: "Template",
                   slots: obj.slots
@@ -211,7 +210,7 @@ function getCompon(obj, config, params, temps) {
               }
             ];
             const ts = getTempsArr(temps, vfors, "forof");
-            return setRender(
+            return getRender(
               {
                 name: "Template",
                 slots: obj.slots
@@ -248,7 +247,7 @@ function getCompon(obj, config, params, temps) {
     const slots = [];
     if (vc) {
       getSlotsArray(vc).forEach((v) => {
-        slots.push(setRender(v, params, temps));
+        slots.push(getRender(v, params, temps));
       });
     }
     return h(Fragment, null, slots);
@@ -277,13 +276,13 @@ function assemblyGetRender(obj, params = {}, temps, getSlots2, setCompon) {
     return "";
   }
 }
-function setRender(obj, params = {}, temps) {
+function getRender(obj, params = {}, temps) {
   return assemblyGetRender(
     obj,
     params,
     temps,
     (config) => {
-      return getSlots(
+      return getSlotsDom(
         obj,
         (slots, key, scope) => {
           const ts = getTempsArr(temps, [scope]);
@@ -291,7 +290,7 @@ function setRender(obj, params = {}, temps) {
             Fragment,
             null,
             slots.map((v) => {
-              return setRender(v, params, ts);
+              return getRender(v, params, ts);
             })
           );
         }
@@ -311,11 +310,10 @@ function setRender(obj, params = {}, temps) {
 export {
   assemblyGetRender,
   getData,
+  getRender,
   getSlots,
   getSlotsArray,
   getTempsArr,
   isEmpty,
-  setRender,
-  setSlots,
   useGetCompon
 };

package/dist/render/render.cjs

@@ -5,11 +5,11 @@ const common = require("./common.cjs");
 const config = require("./config.cjs");
 const render = require("../utils/render.cjs");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
-function getRender(params = {}, arrs, temps) {
+function getRenders(params = {}, arrs, temps) {
   if (arrs) {
     return vue.h(vue.Fragment, null, [
       arrs.map((v) => {
-        return common.setRender(v, params, temps);
+        return common.getRender(v, params, temps);
       })
     ]);
   } else {
@@ -62,7 +62,7 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
           config.runCodeBlock(obj.config.unmounted, params);
         }
       });
-      return () => getRender(params, obj.list, temps);
+      return () => getRenders(params, obj.list, temps);
     }
   });
 }

package/dist/render/render.js

@@ -1,13 +1,13 @@
 import { h, Fragment, defineComponent, provide, reactive, onMounted, onActivated, onDeactivated, onUnmounted, defineAsyncComponent, resolveComponent } from "vue";
-import { setRender } from "./common.js";
+import { getRender } from "./common.js";
 import { getObjProps, setCodes, runCodeBlock } from "./config.js";
 import { setStyle, unStyle, getComponentNames, isRenderCompon } from "../utils/render.js";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
-function getRender(params = {}, arrs, temps) {
+function getRenders(params = {}, arrs, temps) {
   if (arrs) {
     return h(Fragment, null, [
       arrs.map((v) => {
-        return setRender(v, params, temps);
+        return getRender(v, params, temps);
       })
     ]);
   } else {
@@ -60,7 +60,7 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
           runCodeBlock(obj.config.unmounted, params);
         }
       });
-      return () => getRender(params, obj.list, temps);
+      return () => getRenders(params, obj.list, temps);
     }
   });
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fangzhongya/page",
   "private": false,
   "type": "module",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description ": "个人组件设计",
   "author": "fangzhongya ",
   "license": "MIT",