@fangzhongya/fang-ui 0.1.81 → 0.1.82

package/dist/components/common/use.cjs

@@ -43,9 +43,9 @@ function processFatherObject(obj, currentValue, row, is) {
 }
 function getFatherValue(obj, currentValue) {
   if (obj.pars) {
-    return objValue.getObjValue(obj.prop, currentValue) ?? obj.default;
+    return objValue.getObjValue(obj.prop, currentValue) ?? getDefault(obj);
   }
-  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
+  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? getDefault(obj);
 }
 function useVueValue(v, key) {
   if (key) {
@@ -103,6 +103,16 @@ function getFormRule(obj) {
   fps.push(prop);
   return fps.join(".");
 }
+function getDefault(obj) {
+  if (obj.default) {
+    if (typeof obj.default == "function") {
+      return obj.default(obj);
+    } else {
+      return obj.default;
+    }
+  }
+  return void 0;
+}
 function setComputed(obj, v) {
   if (!obj.computed) return;
   if (obj.default) {
@@ -112,7 +122,7 @@ function setComputed(obj, v) {
   }
 }
 function handleComputedWithDefault(obj, v) {
-  const value = obj.default;
+  const value = getDefault(obj);
   if (Array.isArray(obj.computed)) {
     handleArrayComputedWithDefault(obj.computed, value, v);
   } else if (obj.computed.set) {
@@ -137,11 +147,14 @@ function handleComputedWithoutDefault(obj, v) {
     } else if (obj.computed.get) {
       v[obj.prop] = obj.computed.get(currentValue, v, obj);
     }
-    obj.default = v[obj.prop];
+    const z = v[obj.prop];
+    obj.default = () => z;
   } else if (Array.isArray(obj.computed)) {
-    obj.default = obj.computed.map((key) => v[key]);
+    const z = obj.computed.map((key) => v[key]);
+    obj.default = () => z;
   } else if (obj.computed.get) {
-    obj.default = obj.computed.get(void 0, v, obj);
+    const z = obj.computed.get(void 0, v, obj);
+    obj.default = () => z;
   }
 }
 function setFormDefaultValue(obj, value) {
@@ -154,16 +167,16 @@ function setFormDefaultValue(obj, value) {
   if (prop) {
     if (v) {
       if (obj.pars) {
-        objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? obj.default);
+        objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? getDefault(obj));
       } else {
-        v[prop] = v[prop] ?? obj.default;
+        v[prop] = v[prop] ?? getDefault(obj);
       }
     } else {
       v = getFatherData(obj, value, true);
       if (obj.pars) {
-        objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? obj.default);
+        objValue.setObjValue(v, prop, objValue.getObjValue(prop, v) ?? getDefault(obj));
       } else {
-        v[prop] = v[prop] ?? obj.default;
+        v[prop] = v[prop] ?? getDefault(obj);
       }
     }
   }
@@ -207,7 +220,7 @@ function getValue(obj, data, index2) {
   if (obj.formatter) {
     return obj.formatter(data, obj, cellValue, index2, cdata);
   } else {
-    return cellValue ?? obj.default;
+    return cellValue ?? getDefault(obj);
   }
 }
 function getListObjValue(value, obj, data, index2) {

package/dist/components/common/use.js

@@ -41,9 +41,9 @@ function processFatherObject(obj, currentValue, row, is) {
 }
 function getFatherValue(obj, currentValue) {
   if (obj.pars) {
-    return getObjValue(obj.prop, currentValue) ?? obj.default;
+    return getObjValue(obj.prop, currentValue) ?? getDefault(obj);
   }
-  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? obj.default;
+  return (currentValue == null ? void 0 : currentValue[obj.prop]) ?? getDefault(obj);
 }
 function useVueValue(v, key) {
   if (key) {
@@ -101,6 +101,16 @@ function getFormRule(obj) {
   fps.push(prop);
   return fps.join(".");
 }
+function getDefault(obj) {
+  if (obj.default) {
+    if (typeof obj.default == "function") {
+      return obj.default(obj);
+    } else {
+      return obj.default;
+    }
+  }
+  return void 0;
+}
 function setComputed(obj, v) {
   if (!obj.computed) return;
   if (obj.default) {
@@ -110,7 +120,7 @@ function setComputed(obj, v) {
   }
 }
 function handleComputedWithDefault(obj, v) {
-  const value = obj.default;
+  const value = getDefault(obj);
   if (Array.isArray(obj.computed)) {
     handleArrayComputedWithDefault(obj.computed, value, v);
   } else if (obj.computed.set) {
@@ -135,11 +145,14 @@ function handleComputedWithoutDefault(obj, v) {
     } else if (obj.computed.get) {
       v[obj.prop] = obj.computed.get(currentValue, v, obj);
     }
-    obj.default = v[obj.prop];
+    const z = v[obj.prop];
+    obj.default = () => z;
   } else if (Array.isArray(obj.computed)) {
-    obj.default = obj.computed.map((key) => v[key]);
+    const z = obj.computed.map((key) => v[key]);
+    obj.default = () => z;
   } else if (obj.computed.get) {
-    obj.default = obj.computed.get(void 0, v, obj);
+    const z = obj.computed.get(void 0, v, obj);
+    obj.default = () => z;
   }
 }
 function setFormDefaultValue(obj, value) {
@@ -152,16 +165,16 @@ function setFormDefaultValue(obj, value) {
   if (prop) {
     if (v) {
       if (obj.pars) {
-        setObjValue(v, prop, getObjValue(prop, v) ?? obj.default);
+        setObjValue(v, prop, getObjValue(prop, v) ?? getDefault(obj));
       } else {
-        v[prop] = v[prop] ?? obj.default;
+        v[prop] = v[prop] ?? getDefault(obj);
       }
     } else {
       v = getFatherData(obj, value, true);
       if (obj.pars) {
-        setObjValue(v, prop, getObjValue(prop, v) ?? obj.default);
+        setObjValue(v, prop, getObjValue(prop, v) ?? getDefault(obj));
       } else {
-        v[prop] = v[prop] ?? obj.default;
+        v[prop] = v[prop] ?? getDefault(obj);
       }
     }
   }
@@ -205,7 +218,7 @@ function getValue(obj, data, index) {
   if (obj.formatter) {
     return obj.formatter(data, obj, cellValue, index, cdata);
   } else {
-    return cellValue ?? obj.default;
+    return cellValue ?? getDefault(obj);
   }
 }
 function getListObjValue(value, obj, data, index) {

package/dist/icons/index.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.81",
+  "version": "0.1.82",
   "type": "module",
   "description ": "fang-ui",
   "keywords": [
@@ -52,12 +52,12 @@
     "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/icons": "0.0.1-0",
-    "@fang-ui/locale": "0.0.1-0",
+    "@fang-ui/directives": "0.0.1-0",
     "@fang-ui/theme": "0.0.1-0",
+    "@fang-ui/hooks": "0.0.1-0",
     "@fang-ui/types": "0.0.1-0",
+    "@fang-ui/locale": "0.0.1-0",
     "@fang-ui/utils": "0.0.1-0"
   },
   "main": "./dist/index.cjs",