@fangzhongya/fang-ui 0.1.67 → 0.1.69

package/dist/components/forms/src/setup.cjs

@@ -85,7 +85,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
   const setListValue = (arr, listobj, callback) => {
     arr == null ? void 0 : arr.forEach((obj) => {
       if (listobj) {
-        obj.father = obj.father ?? listobj;
+        obj.__father = obj.__father ?? listobj;
       }
       if (obj.children) {
         setListValue(obj.children, obj, callback);

package/dist/components/forms/src/setup.js

@@ -83,7 +83,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
   const setListValue = (arr, listobj, callback) => {
     arr == null ? void 0 : arr.forEach((obj) => {
       if (listobj) {
-        obj.father = obj.father ?? listobj;
+        obj.__father = obj.__father ?? listobj;
       }
       if (obj.children) {
         setListValue(obj.children, obj, callback);

package/dist/components/list/src/index2.cjs

@@ -74,7 +74,7 @@ const _sfc_main = vue.defineComponent({
     };
     const processObjectVisibility = (obj, listobj, value) => {
       if (listobj) {
-        obj.father = obj.father ?? listobj;
+        obj.__father = obj.__father ?? listobj;
       }
       return !use.useHide(obj, value);
     };

package/dist/components/list/src/index2.js

@@ -72,7 +72,7 @@ const _sfc_main = defineComponent({
     };
     const processObjectVisibility = (obj, listobj, value) => {
       if (listobj) {
-        obj.father = obj.father ?? listobj;
+        obj.__father = obj.__father ?? listobj;
       }
       return !useHide(obj, value);
     };

package/dist/components/menus/src/data.cjs

@@ -42,7 +42,7 @@ const dataProps = buildProps.buildProps({
    * @props { String } value
    * 当前选中的
    */
-  value: {
+  modelValue: {
     type: String
   },
   /**
@@ -56,7 +56,7 @@ const dataProps = buildProps.buildProps({
     }
   }
 });
-const dataEmits = ["select"];
+const dataEmits = ["select", "update:modelValue"];
 const dataSlot = {
   default: "default"
 };

package/dist/components/menus/src/data.d.ts

@@ -41,7 +41,7 @@ export declare const dataProps: {
      * @props { String } value
      * 当前选中的
      */
-    value: {
+    modelValue: {
         type: StringConstructor;
     };
     /**

package/dist/components/menus/src/data.js

@@ -40,7 +40,7 @@ const dataProps = buildProps({
    * @props { String } value
    * 当前选中的
    */
-  value: {
+  modelValue: {
     type: String
   },
   /**
@@ -54,7 +54,7 @@ const dataProps = buildProps({
     }
   }
 });
-const dataEmits = ["select"];
+const dataEmits = ["select", "update:modelValue"];
 const dataSlot = {
   default: "default"
 };

package/dist/components/menus/src/index2.cjs

@@ -3,10 +3,11 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 require("./menu-ll.cjs");
 const data = require("./data.cjs");
-const index$3 = require("../../menu/index.cjs");
+const index$4 = require("../../menu/index.cjs");
 const index$2 = require("../../../hooks/cssname/index.cjs");
 const index$1 = require("../../../hooks/inherit/index.cjs");
 const index = require("../../../hooks/props-default/index.cjs");
+const index$3 = require("../../../hooks/model/index.cjs");
 const menuLl_vue_vue_type_script_lang = require("./menu-ll2.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
@@ -18,6 +19,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const attrs = index$1.useInherit(vue.useAttrs(), data.name);
     const cs = index$2.useCssName(data.name);
     const emit = __emit;
+    const value = index$3.useModel(props, emit);
     const slots = vue.useSlots();
     const config = vue.computed(() => {
       return {
@@ -29,10 +31,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         ...props.config
       };
     });
-    function getChildrenValue(list, value, config2) {
+    function getChildrenValue(list, value2, config2) {
       for (const element of list) {
         const p = config2.prop;
-        if (p && element[p] == value) {
+        if (p && element[p] == value2) {
           return element;
         }
       }
@@ -40,8 +42,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function getChildren(list, arr, config2) {
       let arrObj = [];
       let listarr = list;
-      for (const value of arr) {
-        let v = getChildrenValue(listarr, value, config2);
+      for (const value2 of arr) {
+        let v = getChildrenValue(listarr, value2, config2);
         if (v) {
           arrObj.push({ ...v });
           const c = config2.children;
@@ -54,21 +56,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     function onSelect(id, arr) {
       let arrObj = getChildren(props.list, arr, config.value);
+      value.value = id;
       emit("select", id, arr, arrObj);
     }
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", vue.mergeProps({
         class: vue.unref(cs).z()
       }, vue.unref(attrs).root), [
-        vue.createVNode(vue.unref(index$3.Menu), vue.mergeProps(vue.unref(attrs).assem, {
+        vue.createVNode(vue.unref(index$4.Menu), vue.mergeProps(vue.unref(attrs).assem, {
           class: vue.unref(cs).z("menu"),
           onSelect,
-          "default-active": vue.unref(props).value
+          "default-active": vue.unref(value)
         }), {
           default: vue.withCtx(() => [
             vue.createVNode(menuLl_vue_vue_type_script_lang.default, {
               compons: vue.unref(props).compons,
-              value: vue.unref(props).value,
+              value: vue.unref(value),
               list: vue.unref(props).list,
               level: vue.unref(props).level,
               config: config.value

package/dist/components/menus/src/index2.js

@@ -5,6 +5,7 @@ import { Menu } from "../../menu/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
+import { useModel } from "../../../hooks/model/index.js";
 import _sfc_main$1 from "./menu-ll2.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -16,6 +17,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const attrs = useInherit(useAttrs(), name);
     const cs = useCssName(name);
     const emit = __emit;
+    const value = useModel(props, emit);
     const slots = useSlots();
     const config = computed(() => {
       return {
@@ -27,10 +29,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...props.config
       };
     });
-    function getChildrenValue(list, value, config2) {
+    function getChildrenValue(list, value2, config2) {
       for (const element of list) {
         const p = config2.prop;
-        if (p && element[p] == value) {
+        if (p && element[p] == value2) {
           return element;
         }
       }
@@ -38,8 +40,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getChildren(list, arr, config2) {
       let arrObj = [];
       let listarr = list;
-      for (const value of arr) {
-        let v = getChildrenValue(listarr, value, config2);
+      for (const value2 of arr) {
+        let v = getChildrenValue(listarr, value2, config2);
         if (v) {
           arrObj.push({ ...v });
           const c = config2.children;
@@ -52,6 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function onSelect(id, arr) {
       let arrObj = getChildren(props.list, arr, config.value);
+      value.value = id;
       emit("select", id, arr, arrObj);
     }
     return (_ctx, _cache) => {
@@ -61,12 +64,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         createVNode(unref(Menu), mergeProps(unref(attrs).assem, {
           class: unref(cs).z("menu"),
           onSelect,
-          "default-active": unref(props).value
+          "default-active": unref(value)
         }), {
           default: withCtx(() => [
             createVNode(_sfc_main$1, {
               compons: unref(props).compons,
-              value: unref(props).value,
+              value: unref(value),
               list: unref(props).list,
               level: unref(props).level,
               config: config.value

package/dist/components/menus/src/menu-ll2.cjs

@@ -96,7 +96,7 @@ const _sfc_main = vue.defineComponent({
       let arr = [];
       arrs == null ? void 0 : arrs.forEach((obj, index2) => {
         if (listobj) {
-          obj.father = obj.father ?? listobj;
+          obj.__father = obj.__father ?? listobj;
         }
         if (!use.useHide(obj, props.value)) {
           const v = obj[config.prop];

package/dist/components/menus/src/menu-ll2.js

@@ -94,7 +94,7 @@ const _sfc_main = defineComponent({
       let arr = [];
       arrs == null ? void 0 : arrs.forEach((obj, index) => {
         if (listobj) {
-          obj.father = obj.father ?? listobj;
+          obj.__father = obj.__father ?? listobj;
         }
         if (!useHide(obj, props.value)) {
           const v = obj[config.prop];

package/dist/components/menus/src/util.cjs

@@ -5,13 +5,23 @@ const use = require("../../common/use.cjs");
 function setLabel(value, obj, props, compons, emit, slots, index) {
   let label = value ?? obj.label ?? "";
   obj.label = label;
-  return use.useVNodeComponDom(obj, props.value, slots, emit, {
-    // options: {},
-    compons,
-    index,
-    scope: {
-      config: props
+  return use.useVNodeComponDom(
+    {
+      ...obj,
+      prop: "label",
+      __father: void 0
+    },
+    obj,
+    slots,
+    emit,
+    {
+      // options: {},
+      compons,
+      index,
+      scope: {
+        config: props
+      }
     }
-  });
+  );
 }
 exports.setLabel = setLabel;

package/dist/components/menus/src/util.js

@@ -3,14 +3,24 @@ import { useVNodeComponDom } from "../../common/use.js";
 function setLabel(value, obj, props, compons, emit, slots, index) {
   let label = value ?? obj.label ?? "";
   obj.label = label;
-  return useVNodeComponDom(obj, props.value, slots, emit, {
-    // options: {},
-    compons,
-    index,
-    scope: {
-      config: props
+  return useVNodeComponDom(
+    {
+      ...obj,
+      prop: "label",
+      __father: void 0
+    },
+    obj,
+    slots,
+    emit,
+    {
+      // options: {},
+      compons,
+      index,
+      scope: {
+        config: props
+      }
     }
-  });
+  );
 }
 export {
   setLabel

package/dist/components/page/src/index2.cjs

@@ -33,7 +33,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const filtration = (arr, listobj) => {
         for (const obj of arr) {
           if (listobj) {
-            obj.father = obj.father ?? listobj;
+            obj.__father = obj.__father ?? listobj;
           }
           if (obj.prop) {
             value[obj.prop] = obj;

package/dist/components/page/src/index2.js

@@ -31,7 +31,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const filtration = (arr, listobj) => {
         for (const obj of arr) {
           if (listobj) {
-            obj.father = obj.father ?? listobj;
+            obj.__father = obj.__father ?? listobj;
           }
           if (obj.prop) {
             value[obj.prop] = obj;

package/dist/components/tables/src/columns3.cjs

@@ -6,7 +6,7 @@ function getLists(arrs, emit, props, slots, listobj) {
   let arr = [];
   arrs == null ? void 0 : arrs.forEach((obj, index) => {
     if (listobj) {
-      obj.father = obj.father ?? listobj;
+      obj.__father = obj.__father ?? listobj;
     }
     if (!use.useHide(obj, props.value)) {
       if (obj.children && obj.children.length > 0) {

package/dist/components/tables/src/columns3.js

@@ -4,7 +4,7 @@ function getLists(arrs, emit, props, slots, listobj) {
   let arr = [];
   arrs == null ? void 0 : arrs.forEach((obj, index) => {
     if (listobj) {
-      obj.father = obj.father ?? listobj;
+      obj.__father = obj.__father ?? listobj;
     }
     if (!useHide(obj, props.value)) {
       if (obj.children && obj.children.length > 0) {

package/dist/components/tableset/common/pagin.d.ts

@@ -263,7 +263,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         config?: ObjAny | undefined;
         events?: ObjAny | undefined;
         children?: /*elided*/ any[] | undefined;
-        father?: /*elided*/ any | undefined;
+        __father?: /*elided*/ any | undefined;
         minWidth?: string | number | undefined;
         whole?: boolean | undefined;
         type?: string | undefined;
@@ -304,7 +304,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         config?: ObjAny | undefined;
         events?: ObjAny | undefined;
         children?: /*elided*/ any[] | undefined;
-        father?: /*elided*/ any | undefined;
+        __father?: /*elided*/ any | undefined;
         minWidth?: string | number | undefined;
         whole?: boolean | undefined;
         type?: string | undefined;

package/dist/components/tablesv/src/columns3.cjs

@@ -9,7 +9,7 @@ function getLists(arrs, emit, props, slots, listobj) {
   let arr = [];
   arrs == null ? void 0 : arrs.forEach((obj, index) => {
     if (listobj) {
-      obj.father = obj.father ?? {
+      obj.__father = obj.__father ?? {
         ...listobj,
         children: void 0
       };

package/dist/components/tablesv/src/columns3.js

@@ -7,7 +7,7 @@ function getLists(arrs, emit, props, slots, listobj) {
   let arr = [];
   arrs == null ? void 0 : arrs.forEach((obj, index) => {
     if (listobj) {
-      obj.father = obj.father ?? {
+      obj.__father = obj.__father ?? {
         ...listobj,
         children: void 0
       };

package/dist/icons/index.json

@@ -1,7 +1,7 @@
 {
     "prefix": "fang-ui",
     "info": {},
-    "lastModified": 1768544548153,
+    "lastModified": 1768575098266,
     "icons": {
         "bar": {
             "body": " <path fill=\"currentColor\" d=\"M128 544h768a32 32 0 1 0 0-64H128a32 32 0 0 0 0 64z\" ></path> "

package/dist/type.d.ts

@@ -153,7 +153,7 @@ type ListObj = {
 	events?: ObjAny;
 
 	children?: ListObj[];
-	father?: ListObj;
+	__father?: ListObj;
 
 	minWidth?: string | number;
 	// 是否整行

package/dist/utils/util.cjs

@@ -3,9 +3,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
 const getContent = require("@fangzhongya/utils/basic/string/getContent");
 function getFathers(obj, arr) {
-  if (obj.father) {
-    arr.unshift(obj.father);
-    getFathers(obj.father, arr);
+  if (obj.__father) {
+    arr.unshift(obj.__father);
+    getFathers(obj.__father, arr);
   }
 }
 function getChildrenData(obj, row, is) {
@@ -46,7 +46,7 @@ function getNextValue(obj, currentValue) {
   if (obj.pars) {
     return objValue.getObjValue(obj.prop, currentValue) ?? obj.default;
   }
-  return currentValue[obj.prop] ?? obj.default;
+  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
 }
 function executionMethod(fun, ...arr) {
   var _a;

package/dist/utils/util.js

@@ -1,9 +1,9 @@
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 import { getContents } from "@fangzhongya/utils/basic/string/getContent";
 function getFathers(obj, arr) {
-  if (obj.father) {
-    arr.unshift(obj.father);
-    getFathers(obj.father, arr);
+  if (obj.__father) {
+    arr.unshift(obj.__father);
+    getFathers(obj.__father, arr);
   }
 }
 function getChildrenData(obj, row, is) {
@@ -44,7 +44,7 @@ function getNextValue(obj, currentValue) {
   if (obj.pars) {
     return getObjValue(obj.prop, currentValue) ?? obj.default;
   }
-  return currentValue[obj.prop] ?? obj.default;
+  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
 }
 function executionMethod(fun, ...arr) {
   var _a;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.67",
+  "version": "0.1.69",
   "type": "module",
   "description ": "fang-ui",
   "keywords": [