@fangzhongya/fang-ui 0.1.35 → 0.1.36

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

@@ -2,15 +2,14 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const data = require("./data.cjs");
-require("../../../utils/index.cjs");
+const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
+const objValue = require("@fangzhongya/utils/basic/object/objValue");
 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 index$2 = require("../../../hooks/compons/index.cjs");
 const config = require("../../forms/common/config.cjs");
-const objValue = require("@fangzhongya/utils/basic/object/objValue");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const Components = {};
 const _sfc_main = vue.defineComponent({
   components: Components,
@@ -20,120 +19,154 @@ const _sfc_main = vue.defineComponent({
   setup(p, { emit, slots }) {
     const cs = index.useCssName(data.name);
     const prs = index$1.usePropsDefault(data.name, p, data.dataProps);
-    index$1.viewProps(prs, data.name);
     const props = prs.listobj;
     const compons = index$2.useComponsGet(config.provides.compons);
     const formvalue = vue.computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
-        Object.keys(props.formvalue).forEach((key) => {
+        for (const key of Object.keys(props.formvalue)) {
           const v = props.formvalue[key];
           o[key] = prs.modelValue[v];
-        });
+        }
       }
       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);
-          }
+      if (isEqual.isEqual(prop, computed2)) {
+        return;
+      }
+      if (prop !== record.value) {
+        handlePropNotEqualRecord(prop, value2);
+      } else {
+        handlePropEqualRecord(computed2, value2);
+      }
+      record.value = prop;
+    };
+    const handlePropNotEqualRecord = (prop, value2) => {
+      if (Array.isArray(props.computed)) {
+        handleArrayComputed(prop, value2);
+      } else if (props.computed.set) {
+        props.computed.set(prop, value2, props);
+      }
+    };
+    const handleArrayComputed = (prop, value2) => {
+      for (let i = 0; i < props.computed.length; i++) {
+        const k = props.computed[i];
+        if (Array.isArray(prop)) {
+          value2[k] = prop[i];
         } else {
-          if (props.pars) {
-            objValue.setObjValue(value2, props.prop, computed2);
-          } else {
-            value2[props.prop] = computed2;
-          }
+          value2[k] = prop ? prop[k] : void 0;
         }
       }
-      record.value = prop;
+    };
+    const handlePropEqualRecord = (computed2, value2) => {
+      if (props.pars) {
+        objValue.setObjValue(value2, props.prop, computed2);
+      } else {
+        value2[props.prop] = computed2;
+      }
     };
     const binds = vue.computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
-      Object.keys(obj).forEach((key) => {
+      for (const key of Object.keys(obj)) {
         const v = obj[key];
         if (v !== void 0) {
           binds2[key] = v;
         }
-      });
+      }
       return binds2;
     });
     const value = vue.computed({
       get() {
-        let v = prs.modelValue ?? {};
-        if (props.orig) {
-          v = prs.valueobj ?? {};
-        }
-        const prop = props.prop;
-        let r = v;
-        if (prop) {
-          let z = v[prop];
-          if (props.pars) {
-            z = objValue.getObjValue(prop, v);
-          }
-          r = z;
-        }
-        if (props.computed) {
-          let c;
-          if (props.computed instanceof Array) {
-            c = props.computed.map((k) => {
-              return v[k];
-            });
-          } else if (props.computed.get) {
-            c = props.computed.get(r, v, props);
-          }
-          if (prop) {
-            setPropComputedValue(r, c, v);
-          }
-          r = c;
-        }
-        return r;
+        return getValue();
       },
       set(value2) {
-        let v = prs.modelValue ?? {};
-        if (props.orig) {
-          v = prs.valueobj ?? {};
-        }
-        const prop = props.prop;
-        if (prop) {
-          if (props.pars) {
-            objValue.setObjValue(v, prop, value2);
-          } else {
-            v[prop] = value2;
-          }
-        }
-        if (props.computed) {
-          if (props.computed instanceof Array) {
-            props.computed.forEach((k, i) => {
-              if (value2 instanceof Array) {
-                v[k] = value2[i];
-              } else {
-                v[k] = value2 ? value2[k] : void 0;
-              }
-            });
-          } else if (props.computed.set) {
-            props.computed.set(value2, v, props);
-          }
-        }
-        if (!props.orig) {
-          emit("update:modelValue", v);
-        }
-        if (props.compon != "items") {
-          emit("upform", value2, props, v);
-        }
+        setValue(value2);
       }
     });
+    function getValue() {
+      const v = getSourceObject();
+      const prop = props.prop;
+      let result = v;
+      if (prop) {
+        result = getPropertyValue(v, prop);
+      }
+      if (props.computed) {
+        result = handleComputedGet(result, v);
+      }
+      return result;
+    }
+    function getSourceObject() {
+      let source = prs.modelValue ?? {};
+      if (props.orig) {
+        source = prs.valueobj ?? {};
+      }
+      return source;
+    }
+    function getPropertyValue(source, prop) {
+      if (props.pars) {
+        return objValue.getObjValue(prop, source);
+      }
+      return source[prop];
+    }
+    function handleComputedGet(currentValue, source) {
+      let computedValue;
+      if (Array.isArray(props.computed)) {
+        computedValue = props.computed.map((k) => source[k]);
+      } else if (props.computed.get) {
+        computedValue = props.computed.get(
+          currentValue,
+          source,
+          props
+        );
+      }
+      if (props.prop && computedValue !== void 0) {
+        setPropComputedValue(currentValue, computedValue, source);
+      }
+      return computedValue;
+    }
+    function setValue(newValue) {
+      const v = getSourceObject();
+      const prop = props.prop;
+      if (prop) {
+        setPropertyValue(v, prop, newValue);
+      }
+      if (props.computed) {
+        handleComputedSet(newValue, v);
+      }
+      if (!props.orig) {
+        emit("update:modelValue", v);
+      }
+      if (props.compon !== "items") {
+        emit("upform", newValue, props, v);
+      }
+    }
+    function setPropertyValue(target, prop, value2) {
+      if (props.pars) {
+        objValue.setObjValue(target, prop, value2);
+      } else {
+        target[prop] = value2;
+      }
+    }
+    function handleComputedSet(value2, target) {
+      if (Array.isArray(props.computed)) {
+        setArrayComputedValue(value2, target);
+      } else if (props.computed.set) {
+        props.computed.set(value2, target, props);
+      }
+    }
+    function setArrayComputedValue(value2, target) {
+      for (let i = 0; i < props.computed.length; i++) {
+        const key = props.computed[i];
+        if (Array.isArray(value2)) {
+          target[key] = value2[i];
+        } else {
+          target[key] = value2 ? value2[key] : void 0;
+        }
+      }
+    }
     const options = vue.computed(() => {
       const optionss = prs.optionss;
       if (typeof props.options === "string") {
@@ -179,14 +212,12 @@ const _sfc_main = vue.defineComponent({
         } else {
           return vue.h(vue.resolveComponent(compon), componObj, slots);
         }
+      } else if (typeof compon == "function") {
+        return compon(componObj, slots);
+      } else if (vue.isVNode(compon)) {
+        return compon;
       } else {
-        if (typeof compon == "function") {
-          return compon(componObj, slots);
-        } else if (vue.isVNode(compon)) {
-          return compon;
-        } else {
-          return vue.h(compon, componObj, slots);
-        }
+        return vue.h(compon, componObj, slots);
       }
     };
     const setSslot = () => {

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

@@ -1,14 +1,13 @@
 import { defineComponent, computed, ref, h, resolveComponent, isVNode } from "vue";
 import { name, dataProps, dataEmits, dataExpose } from "./data.js";
-import "../../../utils/index.js";
+import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
+import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 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 { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { useComponsGet } from "../../../hooks/compons/index.js";
 import { provides } from "../../forms/common/config.js";
-import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
-import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 const Components = {};
 const _sfc_main = defineComponent({
   components: Components,
@@ -18,120 +17,154 @@ const _sfc_main = defineComponent({
   setup(p, { emit, slots }) {
     const cs = useCssName(name);
     const prs = usePropsDefault(name, p, dataProps);
-    viewProps(prs, name);
     const props = prs.listobj;
     const compons = useComponsGet(provides.compons);
     const formvalue = computed(() => {
       const o = {};
       if (typeof props.formvalue === "object") {
-        Object.keys(props.formvalue).forEach((key) => {
+        for (const key of Object.keys(props.formvalue)) {
           const v = props.formvalue[key];
           o[key] = prs.modelValue[v];
-        });
+        }
       }
       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);
-          }
+      if (isEqual(prop, computed2)) {
+        return;
+      }
+      if (prop !== record.value) {
+        handlePropNotEqualRecord(prop, value2);
+      } else {
+        handlePropEqualRecord(computed2, value2);
+      }
+      record.value = prop;
+    };
+    const handlePropNotEqualRecord = (prop, value2) => {
+      if (Array.isArray(props.computed)) {
+        handleArrayComputed(prop, value2);
+      } else if (props.computed.set) {
+        props.computed.set(prop, value2, props);
+      }
+    };
+    const handleArrayComputed = (prop, value2) => {
+      for (let i = 0; i < props.computed.length; i++) {
+        const k = props.computed[i];
+        if (Array.isArray(prop)) {
+          value2[k] = prop[i];
         } else {
-          if (props.pars) {
-            setObjValue(value2, props.prop, computed2);
-          } else {
-            value2[props.prop] = computed2;
-          }
+          value2[k] = prop ? prop[k] : void 0;
         }
       }
-      record.value = prop;
+    };
+    const handlePropEqualRecord = (computed2, value2) => {
+      if (props.pars) {
+        setObjValue(value2, props.prop, computed2);
+      } else {
+        value2[props.prop] = computed2;
+      }
     };
     const binds = computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
-      Object.keys(obj).forEach((key) => {
+      for (const key of Object.keys(obj)) {
         const v = obj[key];
         if (v !== void 0) {
           binds2[key] = v;
         }
-      });
+      }
       return binds2;
     });
     const value = computed({
       get() {
-        let v = prs.modelValue ?? {};
-        if (props.orig) {
-          v = prs.valueobj ?? {};
-        }
-        const prop = props.prop;
-        let r = v;
-        if (prop) {
-          let z = v[prop];
-          if (props.pars) {
-            z = getObjValue(prop, v);
-          }
-          r = z;
-        }
-        if (props.computed) {
-          let c;
-          if (props.computed instanceof Array) {
-            c = props.computed.map((k) => {
-              return v[k];
-            });
-          } else if (props.computed.get) {
-            c = props.computed.get(r, v, props);
-          }
-          if (prop) {
-            setPropComputedValue(r, c, v);
-          }
-          r = c;
-        }
-        return r;
+        return getValue();
       },
       set(value2) {
-        let v = prs.modelValue ?? {};
-        if (props.orig) {
-          v = prs.valueobj ?? {};
-        }
-        const prop = props.prop;
-        if (prop) {
-          if (props.pars) {
-            setObjValue(v, prop, value2);
-          } else {
-            v[prop] = value2;
-          }
-        }
-        if (props.computed) {
-          if (props.computed instanceof Array) {
-            props.computed.forEach((k, i) => {
-              if (value2 instanceof Array) {
-                v[k] = value2[i];
-              } else {
-                v[k] = value2 ? value2[k] : void 0;
-              }
-            });
-          } else if (props.computed.set) {
-            props.computed.set(value2, v, props);
-          }
-        }
-        if (!props.orig) {
-          emit("update:modelValue", v);
-        }
-        if (props.compon != "items") {
-          emit("upform", value2, props, v);
-        }
+        setValue(value2);
       }
     });
+    function getValue() {
+      const v = getSourceObject();
+      const prop = props.prop;
+      let result = v;
+      if (prop) {
+        result = getPropertyValue(v, prop);
+      }
+      if (props.computed) {
+        result = handleComputedGet(result, v);
+      }
+      return result;
+    }
+    function getSourceObject() {
+      let source = prs.modelValue ?? {};
+      if (props.orig) {
+        source = prs.valueobj ?? {};
+      }
+      return source;
+    }
+    function getPropertyValue(source, prop) {
+      if (props.pars) {
+        return getObjValue(prop, source);
+      }
+      return source[prop];
+    }
+    function handleComputedGet(currentValue, source) {
+      let computedValue;
+      if (Array.isArray(props.computed)) {
+        computedValue = props.computed.map((k) => source[k]);
+      } else if (props.computed.get) {
+        computedValue = props.computed.get(
+          currentValue,
+          source,
+          props
+        );
+      }
+      if (props.prop && computedValue !== void 0) {
+        setPropComputedValue(currentValue, computedValue, source);
+      }
+      return computedValue;
+    }
+    function setValue(newValue) {
+      const v = getSourceObject();
+      const prop = props.prop;
+      if (prop) {
+        setPropertyValue(v, prop, newValue);
+      }
+      if (props.computed) {
+        handleComputedSet(newValue, v);
+      }
+      if (!props.orig) {
+        emit("update:modelValue", v);
+      }
+      if (props.compon !== "items") {
+        emit("upform", newValue, props, v);
+      }
+    }
+    function setPropertyValue(target, prop, value2) {
+      if (props.pars) {
+        setObjValue(target, prop, value2);
+      } else {
+        target[prop] = value2;
+      }
+    }
+    function handleComputedSet(value2, target) {
+      if (Array.isArray(props.computed)) {
+        setArrayComputedValue(value2, target);
+      } else if (props.computed.set) {
+        props.computed.set(value2, target, props);
+      }
+    }
+    function setArrayComputedValue(value2, target) {
+      for (let i = 0; i < props.computed.length; i++) {
+        const key = props.computed[i];
+        if (Array.isArray(value2)) {
+          target[key] = value2[i];
+        } else {
+          target[key] = value2 ? value2[key] : void 0;
+        }
+      }
+    }
     const options = computed(() => {
       const optionss = prs.optionss;
       if (typeof props.options === "string") {
@@ -177,14 +210,12 @@ const _sfc_main = defineComponent({
         } else {
           return h(resolveComponent(compon), componObj, slots);
         }
+      } else if (typeof compon == "function") {
+        return compon(componObj, slots);
+      } else if (isVNode(compon)) {
+        return compon;
       } else {
-        if (typeof compon == "function") {
-          return compon(componObj, slots);
-        } else if (isVNode(compon)) {
-          return compon;
-        } else {
-          return h(compon, componObj, slots);
-        }
+        return h(compon, componObj, slots);
       }
     };
     const setSslot = () => {

package/dist/components/forms-drag/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const FormsDrag: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { FormsDrag, FormsDrag as default };
+export { FormsDrag };
+export default FormsDrag;

package/dist/components/forms-item/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const FormsItem: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { FormsItem, FormsItem as default };
+export { FormsItem };
+export default FormsItem;

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

@@ -19,7 +19,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const attrs = index.useInherit(vue.useAttrs(), data.name);
     const p = __props;
     const prs = index$1.usePropsDefault(data.name, p, data.dataProps);
-    index$1.viewProps(prs, data.name);
     const props = prs.listobj;
     const emit = __emit;
     const cs = index$2.useCssName(data.name);

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

@@ -5,7 +5,7 @@ import { FormItem } from "../../form-item/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
 import { provides } from "../../forms/common/config.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import Lable from "./label.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ inheritAttrs: false },
@@ -17,7 +17,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const attrs = useInherit(useAttrs(), name);
     const p = __props;
     const prs = usePropsDefault(name, p, dataProps);
-    viewProps(prs, name);
     const props = prs.listobj;
     const emit = __emit;
     const cs = useCssName(name);

package/dist/components/forms-item/src/indexts.d.ts

@@ -52,7 +52,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
 }>, {
     modelValue: Record<string, any>;
     listobj: ListObj;
-    hideLabel: boolean;
     optionss: ObjAny;
+    hideLabel: boolean;
 }, {}, {}, {}, never, ComponentProvideOptions, true, {}, any>;
 export default _default;

package/dist/components/forms-item/src/label.cjs

@@ -65,10 +65,10 @@ const Lable = vue.defineComponent({
       type: Object
     },
     /**
-     * @props {String} label 展示内容
+     * @props {String, Object, Function} label 展示内容
      */
     label: {
-      type: [String, Object]
+      type: [String, Object, Function]
     }
   },
   setup(props, { emit, slots }) {

package/dist/components/forms-item/src/label.d.ts

@@ -22,10 +22,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
     };
     /**
-     * @props {String} label 展示内容
+     * @props {String, Object, Function} label 展示内容
      */
     label: {
-        type: (ObjectConstructor | StringConstructor)[];
+        type: (ObjectConstructor | StringConstructor | FunctionConstructor)[];
     };
 }>, () => any, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, never[], never, PublicProps, Readonly< ExtractPropTypes<{
     /**
@@ -50,10 +50,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
         type: ObjectConstructor;
     };
     /**
-     * @props {String} label 展示内容
+     * @props {String, Object, Function} label 展示内容
      */
     label: {
-        type: (ObjectConstructor | StringConstructor)[];
+        type: (ObjectConstructor | StringConstructor | FunctionConstructor)[];
     };
 }>> & Readonly<{}>, {
     value: Record<string, any>;

package/dist/components/forms-item/src/label.js

@@ -63,10 +63,10 @@ const Lable = defineComponent({
       type: Object
     },
     /**
-     * @props {String} label 展示内容
+     * @props {String, Object, Function} label 展示内容
      */
     label: {
-      type: [String, Object]
+      type: [String, Object, Function]
     }
   },
   setup(props, { emit, slots }) {

package/dist/components/{forms-item → forms-items}/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/forms-items/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const FormsItems: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { FormsItems, FormsItems as default };
+export { FormsItems };
+export default FormsItems;