@fangzhongya/fang-ui 0.1.39 → 0.1.40

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) => {
@@ -395,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",
@@ -414,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) => {
@@ -393,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",
@@ -412,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,7 +39,10 @@ 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, index) {
   let label = obj.label ?? "";
@@ -66,6 +69,5 @@ function setLabel(obj, props, compons, emit, slots, 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;
+/**
+ * 设置标签文本内容，支持插槽和国际化处理
+ * @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,7 +37,10 @@ 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, index) {
   let label = obj.label ?? "";
@@ -65,7 +68,6 @@ function setLabel(obj, props, compons, emit, slots, 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;

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

@@ -25,7 +25,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const prs = __props;
     const props = index$3.usePropsDefault(data.name, prs, data.dataProps);
     const placeholder = vue.computed(() => {
-      if (typeof props.placeholder == "undefined") {
+      if (props.placeholder === void 0) {
         return getLocale("form.select");
       } else {
         return props.placeholder;
@@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emit("click-multiple", listFuObj.getValueObjs(v)[0], is);
     };
     if (props.isEmpty) {
-      const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
+      const emptyValue = "__Symbol('empty')__" + Date.now();
       onClickMultiple = (v, is) => {
         if (v === emptyValue) {
           v = "";

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

@@ -23,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
     const placeholder = computed(() => {
-      if (typeof props.placeholder == "undefined") {
+      if (props.placeholder === void 0) {
         return getLocale("form.select");
       } else {
         return props.placeholder;
@@ -40,7 +40,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("click-multiple", listFuObj.getValueObjs(v)[0], is);
     };
     if (props.isEmpty) {
-      const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
+      const emptyValue = "__Symbol('empty')__" + Date.now();
       onClickMultiple = (v, is) => {
         if (v === emptyValue) {
           v = "";

package/dist/components/stick-edge/src/index2.cjs

@@ -74,8 +74,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       if (props.isFixed) {
         fRect.value = {
-          width: window.innerWidth,
-          height: window.innerHeight,
+          width: globalThis.innerWidth,
+          height: globalThis.innerHeight,
           left: 0,
           top: 0
         };

package/dist/components/stick-edge/src/index2.js

@@ -72,8 +72,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       if (props.isFixed) {
         fRect.value = {
-          width: window.innerWidth,
-          height: window.innerHeight,
+          width: globalThis.innerWidth,
+          height: globalThis.innerHeight,
           left: 0,
           top: 0
         };

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

@@ -30,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const elRef = vue.ref();
     const active = vue.ref({});
     const inactive = vue.ref({});
-    const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
+    const emptyValue = "__Symbol('empty')__" + Date.now();
     vue.watch(
       () => props.options,
       () => {

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

@@ -28,7 +28,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const elRef = ref();
     const active = ref({});
     const inactive = ref({});
-    const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
+    const emptyValue = "__Symbol('empty')__" + Date.now();
     watch(
       () => props.options,
       () => {

package/dist/components/tables/common/com-color2.cjs

@@ -70,7 +70,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           return props.class;
         }
       }
-      return;
     });
     const color = vue.computed(() => {
       if (props.isBackg) {
@@ -80,13 +79,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       } else {
         return getValue();
       }
-      return;
     });
     const backgroundColor = vue.computed(() => {
       if (props.isBackg) {
         return getValue();
       }
-      return;
     });
     function getValue() {
       if (props.formatter) {

package/dist/components/tables/common/com-color2.js

@@ -68,7 +68,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return props.class;
         }
       }
-      return;
     });
     const color = computed(() => {
       if (props.isBackg) {
@@ -78,13 +77,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } else {
         return getValue();
       }
-      return;
     });
     const backgroundColor = computed(() => {
       if (props.isBackg) {
         return getValue();
       }
-      return;
     });
     function getValue() {
       if (props.formatter) {

package/dist/components/tables/common/com-lis2.cjs

@@ -64,7 +64,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           return props.class;
         }
       }
-      return;
     });
     function setValue(item, index2) {
       const value = use.useGetDomValue(

package/dist/components/tables/common/com-lis2.js

@@ -62,7 +62,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return props.class;
         }
       }
-      return;
     });
     function setValue(item, index) {
       const value = useGetDomValue(

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

@@ -231,6 +231,9 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         isdiv?: boolean | undefined;
         orig?: boolean | undefined;
         compon?: string | object | undefined;
+        slots?: string | VNode | {
+            [key: string]: () => string | VNode | undefined;
+        };
         default?: any;
         value?: any;
         label?: string | Function | /*elided*/ any | undefined;
@@ -269,6 +272,9 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         isdiv?: boolean | undefined;
         orig?: boolean | undefined;
         compon?: string | object | undefined;
+        slots?: string | VNode | {
+            [key: string]: () => string | VNode | undefined;
+        };
         default?: any;
         value?: any;
         label?: string | Function | /*elided*/ any | undefined;

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

@@ -16,7 +16,7 @@ function isGreaterThan(a, b, epsilon = 0.03) {
   return a - b > epsilon;
 }
 const getPadding = (el) => {
-  const style = window.getComputedStyle(el, null);
+  const style = globalThis.getComputedStyle(el, null);
   const paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
   const paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
   const paddingTop = Number.parseInt(style.paddingTop, 10) || 0;

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

@@ -14,7 +14,7 @@ function isGreaterThan(a, b, epsilon = 0.03) {
   return a - b > epsilon;
 }
 const getPadding = (el) => {
-  const style = window.getComputedStyle(el, null);
+  const style = globalThis.getComputedStyle(el, null);
   const paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
   const paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
   const paddingTop = Number.parseInt(style.paddingTop, 10) || 0;

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

@@ -157,10 +157,8 @@ function setEmptyDisplay(value, emptyDisplay, isStr) {
     if (value === "" || value === void 0 || value === null) {
       return emptyDisplay;
     }
-  } else {
-    if (value === void 0 || value === null) {
-      return emptyDisplay;
-    }
+  } else if (value === void 0 || value === null) {
+    return emptyDisplay;
   }
 }
 exports.eventAliass = eventAliass;

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

@@ -155,10 +155,8 @@ function setEmptyDisplay(value, emptyDisplay, isStr) {
     if (value === "" || value === void 0 || value === null) {
       return emptyDisplay;
     }
-  } else {
-    if (value === void 0 || value === null) {
-      return emptyDisplay;
-    }
+  } else if (value === void 0 || value === null) {
+    return emptyDisplay;
   }
 }
 export {

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

@@ -40,14 +40,22 @@ function handlePropertyMapping(value, ckey, obj, robj) {
   handler();
 }
 function setSslot(obj, scope, emit, slots, props, index$12) {
-  const slot = use.useSetSlot(obj, scope.row, slots, index$12, scope);
+  const optionss = props.options || {};
+  const slot = use.useSetSlot(
+    obj,
+    scope.row,
+    slots,
+    optionss,
+    emit,
+    index$12,
+    scope
+  );
   if (slot) {
     return slot;
   }
   if (obj.compon) {
     const isComponSelected = props.isComponSelected;
     if (isComponSelected(obj, scope)) {
-      const optionss = props.options || {};
       const column = use.useSetCompon(
         obj,
         scope.row,
@@ -55,7 +63,7 @@ function setSslot(obj, scope, emit, slots, props, index$12) {
         index.useComponsGet(config.provides.compons),
         emit,
         index$12,
-        { ...scope, options: props.options, config: props.table }
+        { ...scope, options: optionss, config: props.table }
       );
       if (column) {
         return column;