@fangzhongya/fang-ui 0.1.38 → 0.1.40

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

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const binds = computed(() => {
       const binds2 = {};
-      const no = /* @__PURE__ */ new Set(["modelValue", "children", "listobj"]);
+      const no = /* @__PURE__ */ new Set(["modelValue", "children", "index", "listobj"]);
       for (const key of Object.keys(prs)) {
         if (!no.has(key)) {
           const v = props[key];
@@ -33,10 +33,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return binds2;
     });
-    const defaultValue = {};
     const value = computed({
       get() {
-        return prs.modelValue ?? defaultValue;
+        return prs.modelValue;
       },
       set(value2) {
         emit("update:modelValue", value2);
@@ -45,6 +44,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setKey(value2, index) {
       return [index, value2.label, value2.prop, value2.compon].join(",");
     }
+    const onUpform = (...arr) => emit("upform", ...arr);
     function setStyles(v) {
       const style = v.style || {};
       let vst;
@@ -54,12 +54,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         vst = style;
       }
       const obj = {};
-      const width = v.rowWidth ?? props.rowWidth ?? form.rowWidth;
+      const minWidth = v.minWidth ?? props.rowMinWidth;
+      const width = v.width ?? v.rowWidth ?? props.rowWidth ?? form.rowWidth;
       if (width) {
         obj.width = width;
       }
+      if (minWidth) {
+        obj.minWidth = minWidth;
+      }
       if (v.whole) {
         obj.display = "block";
+        obj.width = "100%";
+      }
+      if (v.flex) {
+        obj.flex = v.flex;
+      } else if (!obj.width) {
+        obj.flex = 0;
       }
       return setObjStyle(vst, obj);
     }
@@ -68,7 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass(unref(cs).z())
+        class: normalizeClass([unref(cs).z(), unref(cs).co(unref(prs).mode)])
       }, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(unref(props).children, (item, index) => {
           return withDirectives((openBlock(), createElementBlock("div", {
@@ -80,12 +90,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               key: 0,
               ref_for: true
             }, binds.value, {
+              index: [...unref(prs).index, index],
               listobj: item,
               optionss: unref(prs).optionss,
               valueobj: unref(prs).valueobj,
               modelValue: value.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => value.value = $event),
-              onUpform: _cache[1] || (_cache[1] = (...arr) => emit("upform", ...arr))
+              onUpform
             }), createSlots({ _: 2 }, [
               renderList(Object.keys(unref(slots)), (k, i) => {
                 return {
@@ -95,16 +106,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ])
                 };
               })
-            ]), 1040, ["listobj", "optionss", "valueobj", "modelValue"])) : (openBlock(), createBlock(unref(FormsItem), mergeProps({
+            ]), 1040, ["index", "listobj", "optionss", "valueobj", "modelValue"])) : (openBlock(), createBlock(unref(FormsItem), mergeProps({
               key: 1,
               ref_for: true
             }, binds.value, {
+              index: [...unref(prs).index, index],
               listobj: item,
               optionss: unref(prs).optionss,
               valueobj: unref(prs).valueobj,
               modelValue: value.value,
-              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => value.value = $event),
-              onUpform: _cache[3] || (_cache[3] = (...arr) => emit("upform", ...arr))
+              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => value.value = $event),
+              onUpform
             }), createSlots({ _: 2 }, [
               renderList(Object.keys(unref(slots)), (k, i) => {
                 return {
@@ -114,7 +126,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ])
                 };
               })
-            ]), 1040, ["listobj", "optionss", "valueobj", "modelValue"]))
+            ]), 1040, ["index", "listobj", "optionss", "valueobj", "modelValue"]))
           ], 6)), [
             [vShow, !unref(useHide)(item, value.value)]
           ]);

package/dist/components/forms-items/style/index2.scss

@@ -1,2 +1,3 @@
 @use '../../forms-div/style/index2.scss' as *;
 @use '../../forms-item/style/index2.scss' as *;
+@use '../index.scss' as *;

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

@@ -47,8 +47,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             style.push("rotateX(180deg)");
             break;
           case "both":
-            style.push("rotateX(180deg)");
-            style.push("rotateY(180deg)");
+            style.push("rotateX(180deg)", "rotateY(180deg)");
             break;
         }
       }

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

@@ -45,8 +45,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             style.push("rotateX(180deg)");
             break;
           case "both":
-            style.push("rotateX(180deg)");
-            style.push("rotateY(180deg)");
+            style.push("rotateX(180deg)", "rotateY(180deg)");
             break;
         }
       }

package/dist/components/input-history/src/index2.cjs

@@ -32,7 +32,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const width = vue.ref(200);
     const refInput = vue.ref();
     const options = util.useStorage(
-      props.storage || (/* @__PURE__ */ new Date()).getTime() + "",
+      props.storage || Date.now() + "",
       []
     );
     const value = vue.ref("");

package/dist/components/input-history/src/index2.js

@@ -30,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const width = ref(200);
     const refInput = ref();
     const options = useStorage(
-      props.storage || (/* @__PURE__ */ new Date()).getTime() + "",
+      props.storage || Date.now() + "",
       []
     );
     const value = ref("");

package/dist/components/input-select/src/index2.cjs

@@ -75,8 +75,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const v = use.useVueValue(item, props.prop);
       if (v === value.value) {
         return "selected";
-      } else {
-        return;
       }
     }
     function onInput(v, ...arr) {

package/dist/components/input-select/src/index2.js

@@ -73,8 +73,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const v = useVueValue(item, props.prop);
       if (v === value.value) {
         return "selected";
-      } else {
-        return;
       }
     }
     function onInput(v, ...arr) {

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

@@ -25,7 +25,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const elRef = vue.ref();
     const once = setOnce();
     const placeholder = vue.computed(() => {
-      if (typeof props.placeholder == "undefined") {
+      if (props.placeholder === void 0) {
         return getLocale("form.import");
       } else if (props.oncePlaceholder) {
         return once(props.placeholder);

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

@@ -23,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const elRef = ref();
     const once = setOnce();
     const placeholder = computed(() => {
-      if (typeof props.placeholder == "undefined") {
+      if (props.placeholder === void 0) {
         return getLocale("form.import");
       } else if (props.oncePlaceholder) {
         return once(props.placeholder);

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

@@ -157,8 +157,7 @@ const _sfc_main = vue.defineComponent({
     };
     const createDoubleRows = (arr, trls, trvs) => {
       if (trls.length > 0) {
-        arr.push(vue.h("tr", {}, trls));
-        arr.push(vue.h("tr", {}, trvs));
+        arr.push(vue.h("tr", {}, trls), vue.h("tr", {}, trvs));
       }
     };
     const getlabel = (obj, index2) => {
@@ -198,17 +197,7 @@ const _sfc_main = vue.defineComponent({
                 width: obj.labelWidth || props.labelWidth
               }
             },
-            [
-              util.setLabel(
-                obj,
-                props,
-                compons,
-                emit,
-                slots,
-                isComponSelected,
-                index2
-              )
-            ]
+            [util.setLabel(obj, props, compons, emit, slots, index2)]
           )
         ]
       );
@@ -405,10 +394,7 @@ const _sfc_main = vue.defineComponent({
                 class: [
                   cs.z("table"),
                   props.labelPosition ?? "",
-                  cs.is(
-                    "border",
-                    props.border ? true : false
-                  ),
+                  cs.is("border", Boolean(props.border)),
                   cs.is("aliquots", props.aliquots)
                 ].join(" "),
                 cellspacing: "0",
@@ -424,8 +410,8 @@ const _sfc_main = vue.defineComponent({
       }
     };
     vue.onMounted(() => {
-      if (window) {
-        window.addEventListener("click", onClickTotal);
+      if (globalThis) {
+        globalThis.addEventListener("click", onClickTotal);
       }
     });
     return {

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

@@ -155,8 +155,7 @@ const _sfc_main = defineComponent({
     };
     const createDoubleRows = (arr, trls, trvs) => {
       if (trls.length > 0) {
-        arr.push(h("tr", {}, trls));
-        arr.push(h("tr", {}, trvs));
+        arr.push(h("tr", {}, trls), h("tr", {}, trvs));
       }
     };
     const getlabel = (obj, index) => {
@@ -196,17 +195,7 @@ const _sfc_main = defineComponent({
                 width: obj.labelWidth || props.labelWidth
               }
             },
-            [
-              setLabel(
-                obj,
-                props,
-                compons,
-                emit,
-                slots,
-                isComponSelected,
-                index
-              )
-            ]
+            [setLabel(obj, props, compons, emit, slots, index)]
           )
         ]
       );
@@ -403,10 +392,7 @@ const _sfc_main = defineComponent({
                 class: [
                   cs.z("table"),
                   props.labelPosition ?? "",
-                  cs.is(
-                    "border",
-                    props.border ? true : false
-                  ),
+                  cs.is("border", Boolean(props.border)),
                   cs.is("aliquots", props.aliquots)
                 ].join(" "),
                 cellspacing: "0",
@@ -422,8 +408,8 @@ const _sfc_main = defineComponent({
       }
     };
     onMounted(() => {
-      if (window) {
-        window.addEventListener("click", onClickTotal);
+      if (globalThis) {
+        globalThis.addEventListener("click", onClickTotal);
       }
     });
     return {

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

@@ -11,11 +11,11 @@ const setClass = (item, data, index) => {
   return v;
 };
 function setSslot(obj, data, props, compons, emit, slots, isComponSelected, index) {
-  const slot = use.useSetSlot(obj, data, slots, index);
+  const optionss = props.options || {};
+  const slot = use.useSetSlot(obj, data, slots, optionss, emit, index);
   if (slot) {
     return slot;
   }
-  const optionss = props.options || {};
   if (obj.compon) {
     if (isComponSelected(obj)) {
       const column = use.useSetCompon(
@@ -26,7 +26,7 @@ function setSslot(obj, data, props, compons, emit, slots, isComponSelected, inde
         emit,
         index,
         {
-          options: props.options,
+          options: optionss,
           config: props
         }
       );
@@ -39,21 +39,22 @@ function setSslot(obj, data, props, compons, emit, slots, isComponSelected, inde
   return setDomValue(domValue, props);
 }
 function setDomValue(domValue, table) {
-  return (util.setEmptyDisplay(domValue, table.emptyDisplay, table.isEmptyStr) || domValue) ?? "";
+  return (
+    // 如果设置了空值显示处理，则使用处理结果，否则使用原始值；如果都为空则返回空字符串
+    (util.setEmptyDisplay(domValue, table.emptyDisplay, table.isEmptyStr) || domValue) ?? ""
+  );
 }
-function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
+function setLabel(obj, props, compons, emit, slots, index) {
   let label = obj.label ?? "";
   if (label) {
     label = use.useGetDomLabel(
-      label,
       obj,
       props.value,
       slots,
       props.optionss,
       compons,
       emit,
-      index || 0,
-      isComponSelected
+      index || 0
     );
   }
   let colon = props.colon;
@@ -68,6 +69,5 @@ function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
   return label;
 }
 exports.setClass = setClass;
-exports.setDomValue = setDomValue;
 exports.setLabel = setLabel;
 exports.setSslot = setSslot;

package/dist/components/list/src/util.d.ts

@@ -2,8 +2,36 @@ import { Component } from 'vue';
 type Compons = {
     [key: string]: Component;
 };
+/**
+ * 设置类名或CSS样式
+ * @param item - 列表对象，包含状态、属性和CSS设置方法等信息
+ * @param data - 字符串对象，用于查找对应状态或属性的值
+ * @param index - 当前项在列表中的索引位置
+ * @returns 返回设置的CSS类名或通过自定义方法处理后的结果
+ */
 export declare const setClass: (item: ListObj, data: ObjStr, index: number) => any;
+/**
+ * 设置插槽或组件的值
+ * @param obj - 列表对象，包含组件信息
+ * @param data - 数据对象，用于设置值的数据源
+ * @param props - 属性配置对象
+ * @param compons - 组件集合
+ * @param emit - 事件发射函数
+ * @param slots - 插槽配置对象
+ * @param isComponSelected - 判断组件是否被选中的函数
+ * @param index - 可选的索引值
+ * @returns 返回设置后的插槽、组件或DOM值
+ */
 export declare function setSslot(obj: ListObj, data: ObjAny, props: ObjAny, compons: Compons, emit: Function, slots: ObjAny, isComponSelected: Function, index?: number): any;
-export declare function setDomValue(domValue: any, table: ObjAny): any;
-export declare function setLabel(obj: ObjAny, props: ObjAny, compons: Compons, emit: Function, slots: ObjAny, isComponSelected: (obj: ObjAny) => boolean, index?: number): any;
+/**
+ * 设置标签文本内容，支持插槽和国际化处理
+ * @param obj - 对象配置，包含label属性等
+ * @param props - 组件属性对象
+ * @param compons - 组件集合
+ * @param emit - 事件发射函数
+ * @param slots - 插槽对象
+ * @param index - 索引值，可选参数
+ * @returns 处理后的标签内容，可能包含冒号后缀
+ */
+export declare function setLabel(obj: ObjAny, props: ObjAny, compons: Compons, emit: Function, slots: ObjAny, index?: number): any;
 export {};

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

@@ -9,11 +9,11 @@ const setClass = (item, data, index) => {
   return v;
 };
 function setSslot(obj, data, props, compons, emit, slots, isComponSelected, index) {
-  const slot = useSetSlot(obj, data, slots, index);
+  const optionss = props.options || {};
+  const slot = useSetSlot(obj, data, slots, optionss, emit, index);
   if (slot) {
     return slot;
   }
-  const optionss = props.options || {};
   if (obj.compon) {
     if (isComponSelected(obj)) {
       const column = useSetCompon(
@@ -24,7 +24,7 @@ function setSslot(obj, data, props, compons, emit, slots, isComponSelected, inde
         emit,
         index,
         {
-          options: props.options,
+          options: optionss,
           config: props
         }
       );
@@ -37,21 +37,22 @@ function setSslot(obj, data, props, compons, emit, slots, isComponSelected, inde
   return setDomValue(domValue, props);
 }
 function setDomValue(domValue, table) {
-  return (setEmptyDisplay(domValue, table.emptyDisplay, table.isEmptyStr) || domValue) ?? "";
+  return (
+    // 如果设置了空值显示处理，则使用处理结果，否则使用原始值；如果都为空则返回空字符串
+    (setEmptyDisplay(domValue, table.emptyDisplay, table.isEmptyStr) || domValue) ?? ""
+  );
 }
-function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
+function setLabel(obj, props, compons, emit, slots, index) {
   let label = obj.label ?? "";
   if (label) {
     label = useGetDomLabel(
-      label,
       obj,
       props.value,
       slots,
       props.optionss,
       compons,
       emit,
-      index || 0,
-      isComponSelected
+      index || 0
     );
   }
   let colon = props.colon;
@@ -67,7 +68,6 @@ function setLabel(obj, props, compons, emit, slots, isComponSelected, index) {
 }
 export {
   setClass,
-  setDomValue,
   setLabel,
   setSslot
 };

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

@@ -61,8 +61,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     );
     const setListValue = (list, index2) => {
       const arr = [];
-      for (let i = 0; i < list.length; i++) {
-        const obj = list[i];
+      for (const obj of list) {
         if (obj.type == "index") {
           let value = "";
           const paginat = attrs.assem.paginat;

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

@@ -59,8 +59,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     const setListValue = (list, index) => {
       const arr = [];
-      for (let i = 0; i < list.length; i++) {
-        const obj = list[i];
+      for (const obj of list) {
         if (obj.type == "index") {
           let value = "";
           const paginat = attrs.assem.paginat;

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

@@ -2,32 +2,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("vue");
 const use = require("../../common/use.cjs");
-const isObject = require("@fangzhongya/utils/basic/object/isObject");
 function setLabel(value, obj, props, compons, emit, slots, index) {
   let label = value ?? obj.label ?? "";
-  if (label) {
-    if (isObject.isObject(label)) {
-      label = { ...obj, ...label };
-      const slot = use.useSetSlot(label, props.value, slots, index);
-      if (slot) {
-        return slot;
-      }
-      if (label.compon) {
-        const column = use.useSetCompon(
-          label,
-          props.value,
-          {},
-          compons,
-          emit,
-          index
-        );
-        if (column) {
-          return column;
-        }
-      }
-      return use.useGetDomValue(label, props.value, {}, index);
+  obj.label = label;
+  return use.useVNodeComponDom(obj, props.value, slots, emit, {
+    // options: {},
+    compons,
+    index,
+    scope: {
+      config: props
     }
-  }
-  return label;
+  });
 }
 exports.setLabel = setLabel;

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

@@ -1,32 +1,16 @@
 import "vue";
-import { useSetSlot, useSetCompon, useGetDomValue } from "../../common/use.js";
-import { isObject } from "@fangzhongya/utils/basic/object/isObject";
+import { useVNodeComponDom } from "../../common/use.js";
 function setLabel(value, obj, props, compons, emit, slots, index) {
   let label = value ?? obj.label ?? "";
-  if (label) {
-    if (isObject(label)) {
-      label = { ...obj, ...label };
-      const slot = useSetSlot(label, props.value, slots, index);
-      if (slot) {
-        return slot;
-      }
-      if (label.compon) {
-        const column = useSetCompon(
-          label,
-          props.value,
-          {},
-          compons,
-          emit,
-          index
-        );
-        if (column) {
-          return column;
-        }
-      }
-      return useGetDomValue(label, props.value, {}, index);
+  obj.label = label;
+  return useVNodeComponDom(obj, props.value, slots, emit, {
+    // options: {},
+    compons,
+    index,
+    scope: {
+      config: props
     }
-  }
-  return label;
+  });
 }
 export {
   setLabel

package/dist/components/page/index.css

@@ -49,6 +49,24 @@
   display: grid;
 }
 
+.forms-items {
+  width: 100%;
+}
+.forms-items.row {
+  display: flex;
+  flex-direction: row;
+}
+.forms-items.column {
+  display: flex;
+  flex-direction: column;
+}
+.forms-items-li.no-error {
+  --el-color-danger: var(--el-border-color);
+}
+.forms-items-li.no-error .el-input__wrapper.is-focus {
+  --el-color-danger: var(--el-input-focus-border);
+}
+
 .double {
   width: 100%;
   display: inline-flex;

package/dist/components/right-key/src/index2.cjs

@@ -27,10 +27,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const lefty = vue.ref("");
     const dom = vue.ref();
     vue.onMounted(() => {
-      window.addEventListener("mousedown", watchContextmenu);
+      globalThis.addEventListener("mousedown", watchContextmenu);
     });
     vue.onUnmounted(() => {
-      window.removeEventListener("mousedown", watchContextmenu);
+      globalThis.removeEventListener("mousedown", watchContextmenu);
     });
     function watchContextmenu(event) {
       if (refRightKeyBox.value.contains(event.target)) {
@@ -69,7 +69,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           x = event.pageX - 1;
           y = event.pageY - 1;
         }
-        let ww = window ? window.innerWidth : 0;
+        let ww = globalThis ? globalThis.innerWidth : 0;
         let kw = 0;
         if (ww != 0 && x + 120 > ww) {
           kw = 0 - (x + 120 - ww);

package/dist/components/right-key/src/index2.js

@@ -25,10 +25,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const lefty = ref("");
     const dom = ref();
     onMounted(() => {
-      window.addEventListener("mousedown", watchContextmenu);
+      globalThis.addEventListener("mousedown", watchContextmenu);
     });
     onUnmounted(() => {
-      window.removeEventListener("mousedown", watchContextmenu);
+      globalThis.removeEventListener("mousedown", watchContextmenu);
     });
     function watchContextmenu(event) {
       if (refRightKeyBox.value.contains(event.target)) {
@@ -67,7 +67,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           x = event.pageX - 1;
           y = event.pageY - 1;
         }
-        let ww = window ? window.innerWidth : 0;
+        let ww = globalThis ? globalThis.innerWidth : 0;
         let kw = 0;
         if (ww != 0 && x + 120 > ww) {
           kw = 0 - (x + 120 - ww);

package/dist/components/seamless-scroll/src/index2.cjs

@@ -31,7 +31,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }, 1e3 / fps);
       resolve(v);
     });
-    const getTime = () => (/* @__PURE__ */ new Date()).getTime();
+    const getTime = () => Date.now();
     const val = vue.ref();
     const currentFps = vue.ref(60);
     let animation = true;

package/dist/components/seamless-scroll/src/index2.js

@@ -29,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, 1e3 / fps);
       resolve(v);
     });
-    const getTime = () => (/* @__PURE__ */ new Date()).getTime();
+    const getTime = () => Date.now();
     const val = ref();
     const currentFps = ref(60);
     let animation = true;