@fangzhongya/fang-ui 0.1.17 → 0.1.19

package/dist/components/common/use.cjs

@@ -53,11 +53,50 @@ function getFormRule(obj) {
     }
   }
 }
+function setComputed(obj, v) {
+  if (obj.computed) {
+    if (obj.default) {
+      const value = obj.default;
+      if (obj.computed instanceof Array) {
+        obj.computed.forEach((k, i) => {
+          if (value instanceof Array) {
+            v[k] = value[i];
+          } else {
+            v[k] = value ? value[k] : void 0;
+          }
+        });
+      } else if (obj.computed.set) {
+        obj.computed.set(value, v, obj);
+      }
+    } else {
+      if (obj.prop) {
+        const r = v[obj.prop];
+        if (obj.computed instanceof Array) {
+          v[obj.prop] = obj.computed.map((k) => {
+            return v[k];
+          });
+        } else if (obj.computed.get) {
+          v[obj.prop] = obj.computed.get(r, v, obj);
+        }
+        obj.default = v[obj.prop];
+      } else {
+        if (obj.computed instanceof Array) {
+          obj.default = obj.computed.map((k) => {
+            return v[k];
+          });
+        } else if (obj.computed.get) {
+          obj.default = obj.computed.get(void 0, v, obj);
+        }
+      }
+    }
+  }
+}
 function setFormDefaultValue(obj, value) {
   let v = util.getChildrenData(obj, value, true) ?? {};
   if (obj.orig) {
     v = value;
   }
+  setComputed(obj, v);
   const prop = obj.prop;
   if (prop) {
     if (obj.pars) {

package/dist/components/common/use.js

@@ -51,11 +51,50 @@ function getFormRule(obj) {
     }
   }
 }
+function setComputed(obj, v) {
+  if (obj.computed) {
+    if (obj.default) {
+      const value = obj.default;
+      if (obj.computed instanceof Array) {
+        obj.computed.forEach((k, i) => {
+          if (value instanceof Array) {
+            v[k] = value[i];
+          } else {
+            v[k] = value ? value[k] : void 0;
+          }
+        });
+      } else if (obj.computed.set) {
+        obj.computed.set(value, v, obj);
+      }
+    } else {
+      if (obj.prop) {
+        const r = v[obj.prop];
+        if (obj.computed instanceof Array) {
+          v[obj.prop] = obj.computed.map((k) => {
+            return v[k];
+          });
+        } else if (obj.computed.get) {
+          v[obj.prop] = obj.computed.get(r, v, obj);
+        }
+        obj.default = v[obj.prop];
+      } else {
+        if (obj.computed instanceof Array) {
+          obj.default = obj.computed.map((k) => {
+            return v[k];
+          });
+        } else if (obj.computed.get) {
+          obj.default = obj.computed.get(void 0, v, obj);
+        }
+      }
+    }
+  }
+}
 function setFormDefaultValue(obj, value) {
   let v = getChildrenData(obj, value, true) ?? {};
   if (obj.orig) {
     v = value;
   }
+  setComputed(obj, v);
   const prop = obj.prop;
   if (prop) {
     if (obj.pars) {

package/dist/components/date-picker/style/element.scss

@@ -1,7 +1,7 @@
-/**
- * @config cover=true
- */
-@use 'element-plus/theme-chalk/src/base.scss' as *;
-// @use '../../date-picker-panel/style/index2.scss' as *;
-@use 'element-plus/theme-chalk/src/popper.scss' as *;
-@use 'element-plus/theme-chalk/src/date-picker.scss' as *;
+/**
+ * @config cover=true
+ */
+@use 'element-plus/theme-chalk/src/base.scss' as *;
+// @use '../../date-picker-panel/style/index2.scss' as *;
+@use 'element-plus/theme-chalk/src/popper.scss' as *;
+@use 'element-plus/theme-chalk/src/date-picker.scss' as *;

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

@@ -95,6 +95,20 @@ function setUp(props, emit, cs, refForm, getLocale) {
     }
     return setObjStyle.setObjStyle(vst, obj);
   }
+  function setReset() {
+    const setListValue = (arr, listobj) => {
+      arr == null ? void 0 : arr.forEach((obj) => {
+        if (listobj) {
+          obj.father = obj.father ?? listobj;
+        }
+        if (obj.children) {
+          setListValue(obj.children, obj);
+        }
+        use.setFormDefaultValue(obj, dataForm.value);
+      });
+    };
+    setListValue(props.list);
+  }
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
@@ -106,9 +120,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
         if (obj.children) {
           setListValue(obj.children, obj);
         }
-        if (obj.prop) {
-          use.setFormDefaultValue(obj, dataForm.value);
-        }
+        use.setFormDefaultValue(obj, dataForm.value);
         let trigger = 1;
         if (typeof obj.compon == "string") {
           if (Changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
@@ -199,6 +211,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
   function resetFields() {
     var _a;
     (_a = refForm.value) == null ? void 0 : _a.resetFields();
+    setReset();
   }
   function validateField(...arr) {
     var _a;

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

@@ -93,6 +93,20 @@ function setUp(props, emit, cs, refForm, getLocale) {
     }
     return setObjStyle(vst, obj);
   }
+  function setReset() {
+    const setListValue = (arr, listobj) => {
+      arr == null ? void 0 : arr.forEach((obj) => {
+        if (listobj) {
+          obj.father = obj.father ?? listobj;
+        }
+        if (obj.children) {
+          setListValue(obj.children, obj);
+        }
+        setFormDefaultValue(obj, dataForm.value);
+      });
+    };
+    setListValue(props.list);
+  }
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
@@ -104,9 +118,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
         if (obj.children) {
           setListValue(obj.children, obj);
         }
-        if (obj.prop) {
-          setFormDefaultValue(obj, dataForm.value);
-        }
+        setFormDefaultValue(obj, dataForm.value);
         let trigger = 1;
         if (typeof obj.compon == "string") {
           if (Changes.includes(lineToLargeHump(obj.compon))) {
@@ -197,6 +209,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
   function resetFields() {
     var _a;
     (_a = refForm.value) == null ? void 0 : _a.resetFields();
+    setReset();
   }
   function validateField(...arr) {
     var _a;

package/dist/components/forms-div/src/data.cjs

@@ -29,6 +29,12 @@ const dataProps = {
   valueobj: {
     type: Object
   },
+  compon: {
+    type: [String, Object]
+  },
+  componValueName: {
+    type: String
+  },
   /**
    * 传入值
    * @props { Object } modelValue={} ( )

package/dist/components/forms-div/src/data.d.ts

@@ -27,6 +27,12 @@ export declare const dataProps: {
     valueobj: {
         type: ObjectConstructor;
     };
+    compon: {
+        type: (ObjectConstructor | StringConstructor)[];
+    };
+    componValueName: {
+        type: StringConstructor;
+    };
     /**
      * 传入值
      * @props { Object } modelValue={} ( )

package/dist/components/forms-div/src/data.js

@@ -27,6 +27,12 @@ const dataProps = {
   valueobj: {
     type: Object
   },
+  compon: {
+    type: [String, Object]
+  },
+  componValueName: {
+    type: String
+  },
   /**
    * 传入值
    * @props { Object } modelValue={} ( )

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

@@ -5,6 +5,7 @@ const data = require("./data.cjs");
 require("../../../utils/index.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
 const use = require("../../common/use.cjs");
+const isEqual = require("@fangzhongya/utils/basic/object/isEqual");
 const index$1 = require("../../../hooks/props-default/index.cjs");
 const data$1 = require("../../forms/src/data.cjs");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
@@ -20,7 +21,6 @@ const _sfc_main = vue.defineComponent({
     const prs = index$1.usePropsDefault(data.name, p, data.dataProps);
     index$1.viewProps(prs, data.name);
     const props = prs.listobj;
-    console.log("props", props);
     const compons = vue.inject(data$1.provides.compons, {});
     const formvalue = vue.computed(() => {
       const o = {};
@@ -32,6 +32,31 @@ const _sfc_main = vue.defineComponent({
       }
       return o;
     });
+    const record = vue.ref();
+    const setPropComputedValue = (prop, computed2, value2) => {
+      if (!isEqual.isEqual(prop, computed2)) {
+        if (prop !== record.value) {
+          if (props.computed instanceof Array) {
+            props.computed.forEach((k, i) => {
+              if (prop instanceof Array) {
+                value2[k] = prop[i];
+              } else {
+                value2[k] = prop ? prop[k] : void 0;
+              }
+            });
+          } else if (props.computed.set) {
+            props.computed.set(prop, value2, props);
+          }
+        } else {
+          if (props.pars) {
+            objValue.setObjValue(value2, props.prop, computed2);
+          } else {
+            value2[props.prop] = computed2;
+          }
+        }
+      }
+      record.value = prop;
+    };
     const binds = vue.computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
@@ -59,13 +84,18 @@ const _sfc_main = vue.defineComponent({
           r = z;
         }
         if (props.computed) {
+          let c;
           if (props.computed instanceof Array) {
-            r = props.computed.map((k) => {
+            c = props.computed.map((k) => {
               return v[k];
             });
           } else if (props.computed.get) {
-            r = props.computed.get(r, v, props);
+            c = props.computed.get(r, v, props);
+          }
+          if (prop) {
+            setPropComputedValue(r, c, v);
           }
+          r = c;
         }
         return r;
       },
@@ -116,8 +146,8 @@ const _sfc_main = vue.defineComponent({
       }
     });
     const render = () => {
-      const compon = props.compon || "input";
-      const componValueName = "modelValue";
+      const compon = props.compon || prs.compon || "input";
+      const componValueName = prs.componValueName || "modelValue";
       const componObj = {
         ...binds.value,
         ...use.getOnObjs(

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

@@ -1,8 +1,9 @@
-import { defineComponent, inject, computed, h, resolveComponent } from "vue";
+import { defineComponent, inject, computed, ref, h, resolveComponent } from "vue";
 import { name, dataProps, dataEmits, dataExpose } from "./data.js";
 import "../../../utils/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { getOnObjs } from "../../common/use.js";
+import { isEqual } from "@fangzhongya/utils/basic/object/isEqual";
 import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
 import { provides } from "../../forms/src/data.js";
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
@@ -18,7 +19,6 @@ const _sfc_main = defineComponent({
     const prs = usePropsDefault(name, p, dataProps);
     viewProps(prs, name);
     const props = prs.listobj;
-    console.log("props", props);
     const compons = inject(provides.compons, {});
     const formvalue = computed(() => {
       const o = {};
@@ -30,6 +30,31 @@ const _sfc_main = defineComponent({
       }
       return o;
     });
+    const record = ref();
+    const setPropComputedValue = (prop, computed2, value2) => {
+      if (!isEqual(prop, computed2)) {
+        if (prop !== record.value) {
+          if (props.computed instanceof Array) {
+            props.computed.forEach((k, i) => {
+              if (prop instanceof Array) {
+                value2[k] = prop[i];
+              } else {
+                value2[k] = prop ? prop[k] : void 0;
+              }
+            });
+          } else if (props.computed.set) {
+            props.computed.set(prop, value2, props);
+          }
+        } else {
+          if (props.pars) {
+            setObjValue(value2, props.prop, computed2);
+          } else {
+            value2[props.prop] = computed2;
+          }
+        }
+      }
+      record.value = prop;
+    };
     const binds = computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
@@ -57,13 +82,18 @@ const _sfc_main = defineComponent({
           r = z;
         }
         if (props.computed) {
+          let c;
           if (props.computed instanceof Array) {
-            r = props.computed.map((k) => {
+            c = props.computed.map((k) => {
               return v[k];
             });
           } else if (props.computed.get) {
-            r = props.computed.get(r, v, props);
+            c = props.computed.get(r, v, props);
+          }
+          if (prop) {
+            setPropComputedValue(r, c, v);
           }
+          r = c;
         }
         return r;
       },
@@ -114,8 +144,8 @@ const _sfc_main = defineComponent({
       }
     });
     const render = () => {
-      const compon = props.compon || "input";
-      const componValueName = "modelValue";
+      const compon = props.compon || prs.compon || "input";
+      const componValueName = prs.componValueName || "modelValue";
       const componObj = {
         ...binds.value,
         ...getOnObjs(

package/dist/components/index.scss

@@ -117,4 +117,5 @@
 @use './tables/index.scss' as *;
 @use './tablesp/index.scss' as *;
 @use './tabless/index.scss' as *;
-@use './tablesv/index.scss' as *;
+@use './tablesv/index.scss' as *;
+@use './tablesvp/index.scss' as *;

package/dist/components/tables/common/pagin.cjs

@@ -481,7 +481,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
   function getFrontPaginatValue(obj) {
     var _a2;
     if (paginat.is && paginat.front) {
-      const list = obj.value;
+      const list = obj.value || [];
       const total = list.length;
       const c = paginat.current;
       const z = paginat.pageSize;

package/dist/components/tables/common/pagin.js

@@ -479,7 +479,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
   function getFrontPaginatValue(obj) {
     var _a2;
     if (paginat.is && paginat.front) {
-      const list = obj.value;
+      const list = obj.value || [];
       const total = list.length;
       const c = paginat.current;
       const z = paginat.pageSize;

package/dist/css/index.css

@@ -1772,4 +1772,26 @@
   left: 0;
   z-index: 1;
   opacity: 0;
+}
+
+.tablesvp {
+  width: 100%;
+  height: var(--tablesvp-height);
+  display: flex;
+  flex-direction: column;
+}
+.tablesvp-main {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  width: 100%;
+}
+.tablesvp-main.is-radio .el-table__header .el-table-column--selection .el-checkbox {
+  display: none;
+}
+.tablesvp-paginat {
+  overflow: hidden;
+}
+.tablesvp-paginat .el-pagination {
+  justify-content: flex-end;
 }

package/dist/icons/index.json

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

package/dist/index.css

@@ -1772,4 +1772,26 @@
   left: 0;
   z-index: 1;
   opacity: 0;
+}
+
+.tablesvp {
+  width: 100%;
+  height: var(--tablesvp-height);
+  display: flex;
+  flex-direction: column;
+}
+.tablesvp-main {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  width: 100%;
+}
+.tablesvp-main.is-radio .el-table__header .el-table-column--selection .el-checkbox {
+  display: none;
+}
+.tablesvp-paginat {
+  overflow: hidden;
+}
+.tablesvp-paginat .el-pagination {
+  justify-content: flex-end;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.17",
+  "version": "0.1.19",
   "type": "module",
   "description ": "fang-ui",
   "keywords": [
@@ -24,7 +24,7 @@
     "fangui": "bin/fang-ui.js"
   },
   "dependencies": {
-    "@fangzhongya/utils": "0.0.45"
+    "@fangzhongya/utils": "0.0.46"
   },
   "devDependencies": {
     "@fangzhongya/create": "0.2.41",
@@ -48,15 +48,15 @@
     "vue": "^3.5.24",
     "vue-tsc": "^3.1.3",
     "vuedraggable": "4.1.0",
-    "vxe-table": "4.17.12",
+    "vxe-table": "4.17.13",
     "@fang-ui/components": "0.0.1-0",
+    "@fang-ui/directives": "0.0.1-0",
     "@fang-ui/icons": "0.0.1-0",
     "@fang-ui/hooks": "0.0.1-0",
-    "@fang-ui/directives": "0.0.1-0",
     "@fang-ui/locale": "0.0.1-0",
     "@fang-ui/theme": "0.0.1-0",
-    "@fang-ui/utils": "0.0.1-0",
-    "@fang-ui/types": "0.0.1-0"
+    "@fang-ui/types": "0.0.1-0",
+    "@fang-ui/utils": "0.0.1-0"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",