@fangzhongya/fang-ui 0.1.77 → 0.1.79

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

@@ -12,6 +12,10 @@ const dataProps = {
   },
   disabled: {
     type: Boolean
+  },
+  // 是否禁止冒泡
+  isStop: {
+    type: Boolean
   }
 };
 const dataHandle = list.comHandle;

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

@@ -15,6 +15,9 @@ export declare const dataProps: {
     disabled: {
         type: BooleanConstructor;
     };
+    isStop: {
+        type: BooleanConstructor;
+    };
     options: {
         type: {
             (arrayLength: number): Options[];

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

@@ -10,6 +10,10 @@ const dataProps = {
   },
   disabled: {
     type: Boolean
+  },
+  // 是否禁止冒泡
+  isStop: {
+    type: Boolean
   }
 };
 const dataHandle = comHandle;

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

@@ -25,17 +25,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return props.options;
       }
     });
-    function onClick(obj, index2, $event) {
+    function onClick(obj, index2, event) {
+      if (props.isStop) {
+        event.stopPropagation();
+      }
       const is = index$2.eventAliass(
         (callback) => {
-          callback(obj, index2, $event);
+          callback(obj, index2, event);
         },
         "click",
         obj,
-        $event
+        event
       );
       if (!is) {
-        emit("clicks", obj, index2, $event);
+        emit("clicks", obj, index2, event);
       }
     }
     __expose({

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

@@ -23,17 +23,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return props.options;
       }
     });
-    function onClick(obj, index, $event) {
+    function onClick(obj, index, event) {
+      if (props.isStop) {
+        event.stopPropagation();
+      }
       const is = eventAliass(
         (callback) => {
-          callback(obj, index, $event);
+          callback(obj, index, event);
         },
         "click",
         obj,
-        $event
+        event
       );
       if (!is) {
-        emit("clicks", obj, index, $event);
+        emit("clicks", obj, index, event);
       }
     }
     __expose({

package/dist/components/common/use.cjs

@@ -3,10 +3,50 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const shared = require("../../utils/vues/shared.cjs");
 const index = require("../../hooks/event-aliass/index.cjs");
-const util = require("../../utils/util.cjs");
+const getFathers = require("../../utils/getFathers.cjs");
 const isObject = require("@fangzhongya/utils/basic/object/isObject");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
+function getFatherData(obj, row, is) {
+  if (obj.orig) {
+    return row;
+  }
+  const farrs = [];
+  getFathers.getFathers(obj, farrs);
+  if (farrs.length === 0) {
+    return row;
+  }
+  let currentValue = row;
+  for (const v of farrs) {
+    currentValue = processFatherObject(v, currentValue, row, is);
+  }
+  return currentValue;
+}
+function processFatherObject(obj, currentValue, row, is) {
+  if (obj.orig) {
+    return row;
+  }
+  if (!obj.prop) {
+    return currentValue;
+  }
+  const rValue = getFatherValue(obj, currentValue);
+  if (is) {
+    const rv = rValue ?? {};
+    if (obj.pars) {
+      objValue.setObjValue(currentValue, obj.prop, rv);
+    } else {
+      currentValue[obj.prop] = rv;
+    }
+    return rv;
+  }
+  return rValue;
+}
+function getFatherValue(obj, currentValue) {
+  if (obj.pars) {
+    return objValue.getObjValue(obj.prop, currentValue) ?? obj.default;
+  }
+  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
+}
 function useVueValue(v, key) {
   if (key) {
     if (v && isObject.isObject(v)) {
@@ -48,7 +88,7 @@ function getFormRule(obj) {
     return prop;
   }
   const farrs = [];
-  util.getFathers(obj, farrs);
+  getFathers.getFathers(obj, farrs);
   if (farrs.length === 0) {
     return prop;
   }
@@ -105,7 +145,7 @@ function handleComputedWithoutDefault(obj, v) {
   }
 }
 function setFormDefaultValue(obj, value) {
-  let v = util.getChildrenData(obj, value);
+  let v = getFatherData(obj, value);
   if (obj.orig) {
     v = value ?? {};
   }
@@ -119,7 +159,7 @@ function setFormDefaultValue(obj, value) {
         v[prop] = v[prop] ?? obj.default;
       }
     } else {
-      v = util.getChildrenData(obj, value, true);
+      v = getFatherData(obj, value, true);
       if (obj.pars) {
         objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? obj.default);
       } else {
@@ -129,7 +169,7 @@ function setFormDefaultValue(obj, value) {
   }
 }
 function setValue(value, obj, data) {
-  let v = util.getChildrenData(obj, data);
+  let v = getFatherData(obj, data);
   if (obj.orig) {
     v = data ?? {};
   }
@@ -142,7 +182,7 @@ function setValue(value, obj, data) {
         v[prop] = value;
       }
     } else {
-      v = util.getChildrenData(obj, data, true);
+      v = getFatherData(obj, data, true);
       if (obj.pars) {
         objValue.setObjValue(v, prop, value);
       } else {
@@ -153,7 +193,7 @@ function setValue(value, obj, data) {
 }
 function getValue(obj, data, index2) {
   const prop = obj.prop;
-  const cdata = util.getChildrenData(obj, data);
+  const cdata = getFatherData(obj, data);
   let cellValue;
   if (prop) {
     if (obj.pars) {
@@ -423,7 +463,7 @@ function useVNodeComponDom(obj, data, slots, emit, config) {
 }
 function useObjComponSelected(obj, props) {
   const arrs = [obj];
-  util.getFathers(obj, arrs);
+  getFathers.getFathers(obj, arrs);
   let componSelected = props.componSelected;
   for (const v of arrs) {
     componSelected = v.componSelected ?? componSelected;
@@ -465,7 +505,7 @@ function getLabelText(obj) {
   }
   if (!obj.label) {
     const farrs = [];
-    util.getFathers(obj, farrs);
+    getFathers.getFathers(obj, farrs);
     farrs.reverse();
     for (const v of farrs) {
       if (v.labelText) {

package/dist/components/common/use.js

@@ -1,10 +1,50 @@
 import { isVNode, h, resolveComponent, computed, Fragment, render } from "vue";
 import { isHTMLTag, isSVGTag } from "../../utils/vues/shared.js";
 import { getEventKey, eventAliass } from "../../hooks/event-aliass/index.js";
-import { getFathers, getChildrenData } from "../../utils/util.js";
+import { getFathers } from "../../utils/getFathers.js";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
+function getFatherData(obj, row, is) {
+  if (obj.orig) {
+    return row;
+  }
+  const farrs = [];
+  getFathers(obj, farrs);
+  if (farrs.length === 0) {
+    return row;
+  }
+  let currentValue = row;
+  for (const v of farrs) {
+    currentValue = processFatherObject(v, currentValue, row, is);
+  }
+  return currentValue;
+}
+function processFatherObject(obj, currentValue, row, is) {
+  if (obj.orig) {
+    return row;
+  }
+  if (!obj.prop) {
+    return currentValue;
+  }
+  const rValue = getFatherValue(obj, currentValue);
+  if (is) {
+    const rv = rValue ?? {};
+    if (obj.pars) {
+      setObjValue(currentValue, obj.prop, rv);
+    } else {
+      currentValue[obj.prop] = rv;
+    }
+    return rv;
+  }
+  return rValue;
+}
+function getFatherValue(obj, currentValue) {
+  if (obj.pars) {
+    return getObjValue(obj.prop, currentValue) ?? obj.default;
+  }
+  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
+}
 function useVueValue(v, key) {
   if (key) {
     if (v && isObject(v)) {
@@ -103,7 +143,7 @@ function handleComputedWithoutDefault(obj, v) {
   }
 }
 function setFormDefaultValue(obj, value) {
-  let v = getChildrenData(obj, value);
+  let v = getFatherData(obj, value);
   if (obj.orig) {
     v = value ?? {};
   }
@@ -117,7 +157,7 @@ function setFormDefaultValue(obj, value) {
         v[prop] = v[prop] ?? obj.default;
       }
     } else {
-      v = getChildrenData(obj, value, true);
+      v = getFatherData(obj, value, true);
       if (obj.pars) {
         setObjValue(v, prop, getObjValue(prop, v) ?? obj.default);
       } else {
@@ -127,7 +167,7 @@ function setFormDefaultValue(obj, value) {
   }
 }
 function setValue(value, obj, data) {
-  let v = getChildrenData(obj, data);
+  let v = getFatherData(obj, data);
   if (obj.orig) {
     v = data ?? {};
   }
@@ -140,7 +180,7 @@ function setValue(value, obj, data) {
         v[prop] = value;
       }
     } else {
-      v = getChildrenData(obj, data, true);
+      v = getFatherData(obj, data, true);
       if (obj.pars) {
         setObjValue(v, prop, value);
       } else {
@@ -151,7 +191,7 @@ function setValue(value, obj, data) {
 }
 function getValue(obj, data, index) {
   const prop = obj.prop;
-  const cdata = getChildrenData(obj, data);
+  const cdata = getFatherData(obj, data);
   let cellValue;
   if (prop) {
     if (obj.pars) {

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

@@ -43,7 +43,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       getListValue
     } = setup.setUp(props, emit, cs, refForm, getLocale);
     function setKey(value, index2) {
-      return [index2, value.label, value.prop, value.compon].join(",");
+      return [index2, value.key, value.label, value.prop, value.compon].join(
+        "-"
+      );
     }
     const onUpform = (...arr) => emit("upform", ...arr);
     __expose({

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

@@ -41,7 +41,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getListValue
     } = setUp(props, emit, cs, refForm, getLocale);
     function setKey(value, index) {
-      return [index, value.label, value.prop, value.compon].join(",");
+      return [index, value.key, value.label, value.prop, value.compon].join(
+        "-"
+      );
     }
     const onUpform = (...arr) => emit("upform", ...arr);
     __expose({

package/dist/components/forms-drag/src/index2.cjs

@@ -88,7 +88,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emit("adjust", item, index2, obj, data2);
     }
     function setKey(value, index2) {
-      return [index2, value.label, value.prop, value.compon].join(",");
+      return [index2, value.key, value.label, value.prop, value.compon].join(
+        "-"
+      );
     }
     __expose({
       el: refEl,

package/dist/components/forms-drag/src/index2.js

@@ -86,7 +86,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("adjust", item, index, obj, data);
     }
     function setKey(value, index) {
-      return [index, value.label, value.prop, value.compon].join(",");
+      return [index, value.key, value.label, value.prop, value.compon].join(
+        "-"
+      );
     }
     __expose({
       el: refEl,

package/dist/components/forms-items/src/index2.cjs

@@ -43,7 +43,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     });
     function setKey(value2, index2) {
-      return [index2, value2.label, value2.prop, value2.compon].join(",");
+      return [index2, value2.key, value2.label, value2.prop, value2.compon].join(
+        "-"
+      );
     }
     const onUpform = (...arr) => emit("upform", ...arr);
     function setStyles(v) {

package/dist/components/forms-items/src/index2.js

@@ -41,7 +41,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     function setKey(value2, index) {
-      return [index, value2.label, value2.prop, value2.compon].join(",");
+      return [index, value2.key, value2.label, value2.prop, value2.compon].join(
+        "-"
+      );
     }
     const onUpform = (...arr) => emit("upform", ...arr);
     function setStyles(v) {

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

@@ -7,7 +7,7 @@ const index$2 = require("../../icon/index.cjs");
 const use = require("../../common/use.cjs");
 const index$1 = require("../../../hooks/cssname/index.cjs");
 const util = require("./util.cjs");
-const util$1 = require("../../../utils/util.cjs");
+const getFathers = require("../../../utils/getFathers.cjs");
 const only = require("../../../utils/only.cjs");
 const index = require("../../../hooks/props-default/index.cjs");
 const name = "menu-li";
@@ -86,7 +86,7 @@ const _sfc_main = vue.defineComponent({
     const setIndexValue = (v, obj, config = {}) => {
       if (props.level) {
         const farr = [obj];
-        util$1.getFathers(obj, farr);
+        getFathers.getFathers(obj, farr);
         const p = config.prop;
         const j = typeof props.level === "boolean" ? "-" : props.level;
         return farr.map((o) => o[p]).join(j);

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

@@ -5,7 +5,7 @@ import { Icon } from "../../icon/index.js";
 import { useHide } from "../../common/use.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { setLabel } from "./util.js";
-import { getFathers } from "../../../utils/util.js";
+import { getFathers } from "../../../utils/getFathers.js";
 import { getOnly } from "../../../utils/only.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const name = "menu-li";

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

@@ -86,20 +86,21 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return getColumnList(v);
       } else {
         return getColumnList(props.list, (obj) => {
+          var _a2;
           obj.required = false;
           obj.whole = false;
-          return Boolean(obj.query);
+          return Boolean((_a2 = obj.page) == null ? void 0 : _a2.query);
         });
       }
     };
     const listQuery = vue.ref([]);
     const setListQuery = () => {
-      var _a;
+      var _a, _b;
       const list2 = getListQuery();
       if ((_a = props.config.query) == null ? void 0 : _a.senior) {
         let i = 0;
         for (const obj of list2) {
-          if (obj.querybasis) {
+          if ((_b = obj.page) == null ? void 0 : _b.querybasis) {
             i++;
           } else {
             obj.hide = () => {
@@ -108,7 +109,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           }
         }
         if (i == 0) {
-          list2[0].hide = void 0;
+          if (list2[0]) {
+            list2[0].hide = void 0;
+          }
         }
       }
       listQuery.value = list2;
@@ -179,7 +182,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const getList = () => {
       return getColumnList(props.list, (obj) => {
-        if (obj.componform === true) {
+        var _a;
+        if (((_a = obj.page) == null ? void 0 : _a.componform) === true) {
           obj.compon = void 0;
         }
         return true;
@@ -464,7 +468,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           return getColumnList(v);
         } else {
           return getColumnList(props.list, (obj) => {
-            return obj.form && obj.isedit === false;
+            var _a2, _b2;
+            return ((_a2 = obj.page) == null ? void 0 : _a2.form) && ((_b2 = obj.page) == null ? void 0 : _b2.isedit) === false;
           });
         }
       } else {
@@ -473,7 +478,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           return getColumnList(v);
         } else {
           return getColumnList(props.list, (obj) => {
-            return Boolean(obj.form);
+            var _a2;
+            return Boolean((_a2 = obj.page) == null ? void 0 : _a2.form);
           });
         }
       }
@@ -617,7 +623,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             key: 0,
             class: vue.normalizeClass(vue.unref(cs).z("query"))
           }, [
-            vue.createVNode(vue.unref(index$6.Forms), vue.mergeProps((_b = vue.unref(props).config.query) == null ? void 0 : _b.config, {
+            listQuery.value.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.Forms), vue.mergeProps({ key: 0 }, (_b = vue.unref(props).config.query) == null ? void 0 : _b.config, {
               query: "",
               "label-position": "auto",
               "model-value": vue.unref(props).query,
@@ -636,7 +642,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   ])
                 };
               })
-            ]), 1040, ["model-value", "options", "compons", "list", "buts"])
+            ]), 1040, ["model-value", "options", "compons", "list", "buts"])) : vue.createCommentVNode("", true)
           ], 2)) : vue.createCommentVNode("", true)
         ], 2),
         vue.createElementVNode("div", {
@@ -683,6 +689,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   class: vue.normalizeClass(vue.unref(cs).z("operations"))
                 }, [
                   vue.createVNode(vue.unref(index$8.Buttons), {
+                    isStop: "",
                     options: vue.unref(operationColumn),
                     onClicks: (item) => onOperation(item, row)
                   }, null, 8, ["options", "onClicks"]),

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

@@ -84,20 +84,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return getColumnList(v);
       } else {
         return getColumnList(props.list, (obj) => {
+          var _a2;
           obj.required = false;
           obj.whole = false;
-          return Boolean(obj.query);
+          return Boolean((_a2 = obj.page) == null ? void 0 : _a2.query);
         });
       }
     };
     const listQuery = ref([]);
     const setListQuery = () => {
-      var _a;
+      var _a, _b;
       const list2 = getListQuery();
       if ((_a = props.config.query) == null ? void 0 : _a.senior) {
         let i = 0;
         for (const obj of list2) {
-          if (obj.querybasis) {
+          if ((_b = obj.page) == null ? void 0 : _b.querybasis) {
             i++;
           } else {
             obj.hide = () => {
@@ -106,7 +107,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
         if (i == 0) {
-          list2[0].hide = void 0;
+          if (list2[0]) {
+            list2[0].hide = void 0;
+          }
         }
       }
       listQuery.value = list2;
@@ -177,7 +180,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const getList = () => {
       return getColumnList(props.list, (obj) => {
-        if (obj.componform === true) {
+        var _a;
+        if (((_a = obj.page) == null ? void 0 : _a.componform) === true) {
           obj.compon = void 0;
         }
         return true;
@@ -462,7 +466,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return getColumnList(v);
         } else {
           return getColumnList(props.list, (obj) => {
-            return obj.form && obj.isedit === false;
+            var _a2, _b2;
+            return ((_a2 = obj.page) == null ? void 0 : _a2.form) && ((_b2 = obj.page) == null ? void 0 : _b2.isedit) === false;
           });
         }
       } else {
@@ -471,7 +476,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return getColumnList(v);
         } else {
           return getColumnList(props.list, (obj) => {
-            return Boolean(obj.form);
+            var _a2;
+            return Boolean((_a2 = obj.page) == null ? void 0 : _a2.form);
           });
         }
       }
@@ -615,7 +621,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             key: 0,
             class: normalizeClass(unref(cs).z("query"))
           }, [
-            createVNode(unref(Forms), mergeProps((_b = unref(props).config.query) == null ? void 0 : _b.config, {
+            listQuery.value.length > 0 ? (openBlock(), createBlock(unref(Forms), mergeProps({ key: 0 }, (_b = unref(props).config.query) == null ? void 0 : _b.config, {
               query: "",
               "label-position": "auto",
               "model-value": unref(props).query,
@@ -634,7 +640,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ])
                 };
               })
-            ]), 1040, ["model-value", "options", "compons", "list", "buts"])
+            ]), 1040, ["model-value", "options", "compons", "list", "buts"])) : createCommentVNode("", true)
           ], 2)) : createCommentVNode("", true)
         ], 2),
         createElementVNode("div", {
@@ -681,6 +687,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   class: normalizeClass(unref(cs).z("operations"))
                 }, [
                   createVNode(unref(Buttons), {
+                    isStop: "",
                     options: unref(operationColumn),
                     onClicks: (item) => onOperation(item, row)
                   }, null, 8, ["options", "onClicks"]),

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

@@ -130,6 +130,7 @@ function getTableColumn(obj, emit, props, slots, index2, def) {
     index$1.TableColumn,
     {
       ...setProps(obj, props),
+      key: [index2, obj.key, obj.label, obj.prop, obj.compon].join("-"),
       className: obj.class,
       minWidth: util.setMinWidth(obj, props)
     },

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

@@ -128,6 +128,7 @@ function getTableColumn(obj, emit, props, slots, index, def) {
     TableColumn,
     {
       ...setProps(obj, props),
+      key: [index, obj.key, obj.label, obj.prop, obj.compon].join("-"),
       className: obj.class,
       minWidth: setMinWidth(obj, props)
     },

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

@@ -267,6 +267,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         minWidth?: string | number | undefined;
         whole?: boolean | undefined;
         type?: string | undefined;
+        key?: string | undefined;
     }[], ListObj[] | {
         [x: string]: any;
         isdiv?: boolean | undefined;
@@ -308,6 +309,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         minWidth?: string | number | undefined;
         whole?: boolean | undefined;
         type?: string | undefined;
+        key?: string | undefined;
     }[]>;
     onRadioChange: (obj: ObjAny) => void;
     getSelection: () => ObjStr[];

package/dist/hooks/model/index copy.d.ts

@@ -0,0 +1,2 @@
+import { WritableComputedRef } from 'vue';
+export declare function useModel<T>(props: ObjAny, emit: Function, defaultValue?: T, key?: string): WritableComputedRef<T, T>;

package/dist/hooks/model/index.cjs

@@ -2,24 +2,37 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 function useModel(props, emit, defaultValue, key = "modelValue") {
-  const internalValue = vue.ref(defaultValue);
   const instance = vue.getCurrentInstance();
   const hasExternalValue = vue.computed(() => {
     if (!instance) return false;
     const vnodeProps = instance.vnode.props || {};
     return key in vnodeProps;
   });
-  return vue.computed({
-    get() {
-      return hasExternalValue.value ? props[key] ?? defaultValue : internalValue.value;
+  const state = vue.reactive({
+    internalValue: defaultValue == null ? void 0 : defaultValue(),
+    get value() {
+      if (hasExternalValue.value) {
+        const z = props[key];
+        if (z === void 0) {
+          const v = defaultValue == null ? void 0 : defaultValue();
+          if (v) {
+            emit(`update:${key}`, v);
+            return v;
+          }
+        }
+        return z;
+      } else {
+        return this.internalValue;
+      }
     },
-    set(v) {
+    set value(v) {
       if (hasExternalValue.value) {
-        emit("update:" + key, v);
+        emit(`update:${key}`, v);
       } else {
-        internalValue.value = v;
+        this.internalValue = v;
       }
     }
   });
+  return vue.toRef(state, "value");
 }
 exports.useModel = useModel;

package/dist/hooks/model/index.d.ts

@@ -1,2 +1,2 @@
-import { WritableComputedRef } from 'vue';
-export declare function useModel<T>(props: ObjAny, emit: Function, defaultValue?: T, key?: string): WritableComputedRef<T, T>;
+import { Ref } from 'vue';
+export declare function useModel<T>(props: ObjAny, emit: Function, defaultValue?: () => T, key?: string): Ref<any, any>;

package/dist/hooks/model/index.js

@@ -1,24 +1,37 @@
-import { ref, getCurrentInstance, computed } from "vue";
+import { getCurrentInstance, computed, reactive, toRef } from "vue";
 function useModel(props, emit, defaultValue, key = "modelValue") {
-  const internalValue = ref(defaultValue);
   const instance = getCurrentInstance();
   const hasExternalValue = computed(() => {
     if (!instance) return false;
     const vnodeProps = instance.vnode.props || {};
     return key in vnodeProps;
   });
-  return computed({
-    get() {
-      return hasExternalValue.value ? props[key] ?? defaultValue : internalValue.value;
+  const state = reactive({
+    internalValue: defaultValue == null ? void 0 : defaultValue(),
+    get value() {
+      if (hasExternalValue.value) {
+        const z = props[key];
+        if (z === void 0) {
+          const v = defaultValue == null ? void 0 : defaultValue();
+          if (v) {
+            emit(`update:${key}`, v);
+            return v;
+          }
+        }
+        return z;
+      } else {
+        return this.internalValue;
+      }
     },
-    set(v) {
+    set value(v) {
       if (hasExternalValue.value) {
-        emit("update:" + key, v);
+        emit(`update:${key}`, v);
       } else {
-        internalValue.value = v;
+        this.internalValue = v;
       }
     }
   });
+  return toRef(state, "value");
 }
 export {
   useModel

package/dist/icons/index.json

@@ -1,7 +1,7 @@
 {
     "prefix": "fang-ui",
     "info": {},
-    "lastModified": 1769523190151,
+    "lastModified": 1769590320505,
     "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

@@ -159,6 +159,8 @@ type ListObj = {
 	// 是否整行
 	whole?: boolean;
 	type?: string;
+	// 唯一值 调整位置有用
+	key?: string;
 	// column
 	[key: string]: any;
 };

package/dist/utils/getFathers.cjs

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+function getFathers(obj, arr) {
+  if (obj.__father) {
+    arr.unshift(obj.__father);
+    getFathers(obj.__father, arr);
+  }
+}
+exports.getFathers = getFathers;

package/dist/utils/getFathers.d.ts

@@ -0,0 +1 @@
+export declare function getFathers(obj: ListObj, arr: ListObj[]): void;

package/dist/utils/getFathers.js

@@ -0,0 +1,9 @@
+function getFathers(obj, arr) {
+  if (obj.__father) {
+    arr.unshift(obj.__father);
+    getFathers(obj.__father, arr);
+  }
+}
+export {
+  getFathers
+};

package/dist/utils/index.d.ts

@@ -1,6 +1,7 @@
 export * from './vues';
 export * from './css';
 export * from './enums';
+export * from './getFathers';
 export * from './getOnlyKey';
 export * from './local';
 export * from './only';

package/dist/utils/util.cjs

@@ -1,53 +1,6 @@
 "use strict";
 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);
-  }
-}
-function getChildrenData(obj, row, is) {
-  if (obj.orig) {
-    return row;
-  }
-  const farrs = [];
-  getFathers(obj, farrs);
-  if (farrs.length === 0) {
-    return row;
-  }
-  let currentValue = row;
-  for (const obj2 of farrs) {
-    currentValue = processFatherObject(obj2, currentValue, is, row);
-  }
-  return currentValue;
-}
-function processFatherObject(obj, currentValue, is, row) {
-  if (obj.orig) {
-    return row;
-  }
-  if (!obj.prop) {
-    return currentValue;
-  }
-  const nextValue = getNextValue(obj, currentValue);
-  if (is) {
-    const rv = nextValue ?? {};
-    if (obj.pars) {
-      objValue.setObjValue(currentValue, obj.prop, rv);
-    } else {
-      currentValue[obj.prop] = rv;
-    }
-    return rv;
-  }
-  return nextValue;
-}
-function getNextValue(obj, currentValue) {
-  if (obj.pars) {
-    return objValue.getObjValue(obj.prop, currentValue) ?? obj.default;
-  }
-  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
-}
 function executionMethod(fun, ...arr) {
   var _a;
   if (typeof fun === "string") {
@@ -57,5 +10,3 @@ function executionMethod(fun, ...arr) {
   }
 }
 exports.executionMethod = executionMethod;
-exports.getChildrenData = getChildrenData;
-exports.getFathers = getFathers;

package/dist/utils/util.d.ts

@@ -1,9 +1 @@
-export declare function getFathers(obj: ListObj, arr: ListObj[]): void;
-/**
- * @error
- * 代码过于复杂，
- * 做了些无用的工作，
- * 使用情况极低
- */
-export declare function getChildrenData(obj: ListObj, row: ObjAny, is?: boolean): ObjAny;
 export declare function executionMethod<T>(fun: Function | string, ...arr: any[]): T;

package/dist/utils/util.js

@@ -1,51 +1,4 @@
-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);
-  }
-}
-function getChildrenData(obj, row, is) {
-  if (obj.orig) {
-    return row;
-  }
-  const farrs = [];
-  getFathers(obj, farrs);
-  if (farrs.length === 0) {
-    return row;
-  }
-  let currentValue = row;
-  for (const obj2 of farrs) {
-    currentValue = processFatherObject(obj2, currentValue, is, row);
-  }
-  return currentValue;
-}
-function processFatherObject(obj, currentValue, is, row) {
-  if (obj.orig) {
-    return row;
-  }
-  if (!obj.prop) {
-    return currentValue;
-  }
-  const nextValue = getNextValue(obj, currentValue);
-  if (is) {
-    const rv = nextValue ?? {};
-    if (obj.pars) {
-      setObjValue(currentValue, obj.prop, rv);
-    } else {
-      currentValue[obj.prop] = rv;
-    }
-    return rv;
-  }
-  return nextValue;
-}
-function getNextValue(obj, currentValue) {
-  if (obj.pars) {
-    return getObjValue(obj.prop, currentValue) ?? obj.default;
-  }
-  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
-}
 function executionMethod(fun, ...arr) {
   var _a;
   if (typeof fun === "string") {
@@ -55,7 +8,5 @@ function executionMethod(fun, ...arr) {
   }
 }
 export {
-  executionMethod,
-  getChildrenData,
-  getFathers
+  executionMethod
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.77",
+  "version": "0.1.79",
   "type": "module",
   "description ": "fang-ui",
   "keywords": [
@@ -51,14 +51,14 @@
     "vue": "^3.5.27",
     "vue-tsc": "^3.2.2",
     "vxe-table": "4.6.20",
+    "@fang-ui/components": "0.0.1-0",
     "@fang-ui/directives": "0.0.1-0",
     "@fang-ui/hooks": "0.0.1-0",
-    "@fang-ui/components": "0.0.1-0",
     "@fang-ui/icons": "0.0.1-0",
     "@fang-ui/locale": "0.0.1-0",
+    "@fang-ui/theme": "0.0.1-0",
     "@fang-ui/types": "0.0.1-0",
-    "@fang-ui/utils": "0.0.1-0",
-    "@fang-ui/theme": "0.0.1-0"
+    "@fang-ui/utils": "0.0.1-0"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",