@fangzhongya/fang-ui 0.1.19 → 0.1.20

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

@@ -84,6 +84,9 @@ export declare const dataProps: {
     align: {
         type: StringConstructor;
     };
+    showOverflow: {
+        type: (BooleanConstructor | StringConstructor)[];
+    };
     /**
      * @props { String } labelAlign ( )
      * 标签展示左右位置
@@ -91,6 +94,13 @@ export declare const dataProps: {
     labelAlign: {
         type: StringConstructor;
     };
+    /**
+     * @props { String } items ( )
+     * 展示上下位置
+     */
+    items: {
+        type: StringConstructor;
+    };
     /**
      * @props { String } labelItems=center ( )
      * 标签展示上下位置
@@ -99,9 +109,20 @@ export declare const dataProps: {
         type: StringConstructor;
         default: string;
     };
-    items: {
+    /**
+     * @props { String } rowMaxHeight ( )
+     * 最大高度
+     */
+    rowMaxHeight: {
         type: StringConstructor;
     };
+    /**
+     * @props { Number } lineClamp ( )
+     * 超出几行隐藏
+     */
+    lineClamp: {
+        type: NumberConstructor;
+    };
     /**
      * @props { Boolean, String } border=true ( )
      * 是否需要边框，边框颜色

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

@@ -74,6 +74,9 @@ const dataProps = {
   align: {
     type: String
   },
+  showOverflow: {
+    type: [Boolean, String]
+  },
   /**
    * @props { String } labelAlign ( )
    * 标签展示左右位置
@@ -81,6 +84,13 @@ const dataProps = {
   labelAlign: {
     type: String
   },
+  /**
+   * @props { String } items ( )
+   * 展示上下位置
+   */
+  items: {
+    type: String
+  },
   /**
    * @props { String } labelItems=center ( )
    * 标签展示上下位置
@@ -89,8 +99,17 @@ const dataProps = {
     type: String,
     default: "center"
   },
-  items: {
-    type: String
+  /**
+   * @props { String } rowMaxHeight ( )
+   * 最大高度
+   */
+  rowMaxHeight: { type: String },
+  /**
+   * @props { Number } lineClamp ( )
+   * 超出几行隐藏
+   */
+  lineClamp: {
+    type: Number
   },
   /**
    * @props { Boolean, String } border=true ( )

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

@@ -6,6 +6,7 @@ const css = require("../../common/css.cjs");
 const use = require("../../common/use.cjs");
 const compons = require("../../common/compons.cjs");
 const index$1 = require("../../../hooks/cssname/index.cjs");
+const tooltip = require("../../tables/common/tooltip.cjs");
 const index = require("../../../hooks/props-default/index.cjs");
 const data = require("./data.cjs");
 require("../../tables/common/img.cjs");
@@ -24,6 +25,7 @@ const _sfc_main = vue.defineComponent({
     index.viewProps(props, data.name);
     const compons$1 = compons.getCompons(props.compons);
     const cs = index$1.useCssName(data.name);
+    const refDom = vue.ref();
     const isfocus = vue.ref(false);
     const rowObj = vue.ref();
     const borderColor = vue.computed(() => {
@@ -61,9 +63,9 @@ const _sfc_main = vue.defineComponent({
             lin = props.column;
             is = true;
           } else {
-            let k = (obj.column || 1) + lin;
+            let k = (obj.colspan || 1) + lin;
             if (k > props.column) {
-              lin = obj.column || 1;
+              lin = obj.colspan || 1;
               is = true;
             } else {
               lin = k;
@@ -99,9 +101,9 @@ const _sfc_main = vue.defineComponent({
             lin = props.column;
             is = true;
           } else {
-            let k = (obj.column || 1) + lin;
+            let k = (obj.colspan || 1) + lin;
             if (k > props.column) {
-              lin = obj.column || 1;
+              lin = obj.colspan || 1;
               is = true;
             } else {
               lin = k;
@@ -156,6 +158,7 @@ const _sfc_main = vue.defineComponent({
             obj.class ?? ""
           ].join(" "),
           colspan: props.labelPosition == "top" ? setColspan(obj) : void 0,
+          rowspan: props.labelPosition == "top" ? void 0 : setRowspan(obj),
           onClick: (event) => {
             isfocus.value = true;
             rowObj.value = obj;
@@ -187,6 +190,20 @@ const _sfc_main = vue.defineComponent({
         ]
       );
     };
+    const handleCellMouseLeave = ($event) => {
+      tooltip.hideTooltip($event);
+    };
+    const handleCellMouseEnter = ($event, obj) => {
+      const showOverflow = obj.showOverflow ?? props.showOverflow;
+      if (showOverflow) {
+        tooltip.showTooltip(
+          $event,
+          refDom.value,
+          showOverflow,
+          props.lineClamp
+        );
+      }
+    };
     const getChildrenValue = (obj, index2) => {
       if (obj.children) {
         return [
@@ -208,7 +225,10 @@ const _sfc_main = vue.defineComponent({
               class: cs.z("table-value"),
               style: {
                 textAlign: obj.align || props.align
-              }
+              },
+              title: obj.title,
+              onMouseenter: ($event) => handleCellMouseEnter($event, obj),
+              onMouseleave: handleCellMouseLeave
             },
             [
               util.setSslot(
@@ -239,7 +259,7 @@ const _sfc_main = vue.defineComponent({
             obj.class ?? ""
           ].join(" "),
           colspan: setColspan(obj),
-          rowspan: isRow ? 2 : void 0,
+          rowspan: setRowspan(obj, isRow),
           onClick: (event) => {
             isfocus.value = true;
             rowObj.value = obj;
@@ -261,6 +281,7 @@ const _sfc_main = vue.defineComponent({
             "td",
             {
               colspan: setColspan(obj),
+              rowspan: setRowspan(obj),
               class: cs.is("whole", obj.whole)
             },
             [
@@ -287,8 +308,8 @@ const _sfc_main = vue.defineComponent({
       if (["auto", "top"].includes(props.labelPosition)) {
         if (obj.whole) {
           return props.column;
-        } else if (obj.column) {
-          return obj.column;
+        } else if (obj.colspan) {
+          return obj.colspan;
         } else {
           return "";
         }
@@ -296,21 +317,51 @@ const _sfc_main = vue.defineComponent({
         const j = !obj.isdiv ? 0 : 1;
         if (obj.whole) {
           return (props.column - 1) * 2 + 1 + j;
-        } else if (obj.column) {
-          return (obj.column - 1) * 2 + 1 + j;
+        } else if (obj.colspan) {
+          return (obj.colspan - 1) * 2 + 1 + j;
         } else {
           return 1 + j;
         }
       }
     };
+    const setRowspan = (obj, isRow) => {
+      if (props.labelPosition == "top") {
+        const j = !obj.isdiv ? 0 : 1;
+        if (obj.rowspan) {
+          return (obj.rowspan - 1) * 2 + 1 + j;
+        } else if (isRow) {
+          return 2;
+        }
+      } else if (props.labelPosition == "auto") {
+        if (obj.rowspan) {
+          return obj.rowspan;
+        } else if (isRow) {
+          return 2;
+        }
+      } else {
+        if (obj.rowspan) {
+          return obj.rowspan;
+        } else if (isRow) {
+          return 2;
+        } else {
+          return 1;
+        }
+      }
+      return;
+    };
     const renderValue = () => {
       if (props.list && props.list.length > 0) {
         return vue.h(
           "div",
           {
+            ref: (el) => {
+              refDom.value = el;
+            },
             class: cs.z("div"),
             style: cs.vdo({
               borderColor: borderColor.value,
+              rowMaxHeight: props.rowMaxHeight,
+              lineClamp: props.lineClamp,
               interval: props.interval
             })
             // onClick(event: Event) {

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

@@ -4,6 +4,7 @@ import { setStyles } from "../../common/css.js";
 import { useObjComponSelected, useHide } from "../../common/use.js";
 import { getCompons } from "../../common/compons.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
+import { hideTooltip, showTooltip } from "../../tables/common/tooltip.js";
 import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
 import { name, dataProps, dataExpose, dataEmits } from "./data.js";
 import "../../tables/common/img.js";
@@ -22,6 +23,7 @@ const _sfc_main = defineComponent({
     viewProps(props, name);
     const compons = getCompons(props.compons);
     const cs = useCssName(name);
+    const refDom = ref();
     const isfocus = ref(false);
     const rowObj = ref();
     const borderColor = computed(() => {
@@ -59,9 +61,9 @@ const _sfc_main = defineComponent({
             lin = props.column;
             is = true;
           } else {
-            let k = (obj.column || 1) + lin;
+            let k = (obj.colspan || 1) + lin;
             if (k > props.column) {
-              lin = obj.column || 1;
+              lin = obj.colspan || 1;
               is = true;
             } else {
               lin = k;
@@ -97,9 +99,9 @@ const _sfc_main = defineComponent({
             lin = props.column;
             is = true;
           } else {
-            let k = (obj.column || 1) + lin;
+            let k = (obj.colspan || 1) + lin;
             if (k > props.column) {
-              lin = obj.column || 1;
+              lin = obj.colspan || 1;
               is = true;
             } else {
               lin = k;
@@ -154,6 +156,7 @@ const _sfc_main = defineComponent({
             obj.class ?? ""
           ].join(" "),
           colspan: props.labelPosition == "top" ? setColspan(obj) : void 0,
+          rowspan: props.labelPosition == "top" ? void 0 : setRowspan(obj),
           onClick: (event) => {
             isfocus.value = true;
             rowObj.value = obj;
@@ -185,6 +188,20 @@ const _sfc_main = defineComponent({
         ]
       );
     };
+    const handleCellMouseLeave = ($event) => {
+      hideTooltip($event);
+    };
+    const handleCellMouseEnter = ($event, obj) => {
+      const showOverflow = obj.showOverflow ?? props.showOverflow;
+      if (showOverflow) {
+        showTooltip(
+          $event,
+          refDom.value,
+          showOverflow,
+          props.lineClamp
+        );
+      }
+    };
     const getChildrenValue = (obj, index) => {
       if (obj.children) {
         return [
@@ -206,7 +223,10 @@ const _sfc_main = defineComponent({
               class: cs.z("table-value"),
               style: {
                 textAlign: obj.align || props.align
-              }
+              },
+              title: obj.title,
+              onMouseenter: ($event) => handleCellMouseEnter($event, obj),
+              onMouseleave: handleCellMouseLeave
             },
             [
               setSslot(
@@ -237,7 +257,7 @@ const _sfc_main = defineComponent({
             obj.class ?? ""
           ].join(" "),
           colspan: setColspan(obj),
-          rowspan: isRow ? 2 : void 0,
+          rowspan: setRowspan(obj, isRow),
           onClick: (event) => {
             isfocus.value = true;
             rowObj.value = obj;
@@ -259,6 +279,7 @@ const _sfc_main = defineComponent({
             "td",
             {
               colspan: setColspan(obj),
+              rowspan: setRowspan(obj),
               class: cs.is("whole", obj.whole)
             },
             [
@@ -285,8 +306,8 @@ const _sfc_main = defineComponent({
       if (["auto", "top"].includes(props.labelPosition)) {
         if (obj.whole) {
           return props.column;
-        } else if (obj.column) {
-          return obj.column;
+        } else if (obj.colspan) {
+          return obj.colspan;
         } else {
           return "";
         }
@@ -294,21 +315,51 @@ const _sfc_main = defineComponent({
         const j = !obj.isdiv ? 0 : 1;
         if (obj.whole) {
           return (props.column - 1) * 2 + 1 + j;
-        } else if (obj.column) {
-          return (obj.column - 1) * 2 + 1 + j;
+        } else if (obj.colspan) {
+          return (obj.colspan - 1) * 2 + 1 + j;
         } else {
           return 1 + j;
         }
       }
     };
+    const setRowspan = (obj, isRow) => {
+      if (props.labelPosition == "top") {
+        const j = !obj.isdiv ? 0 : 1;
+        if (obj.rowspan) {
+          return (obj.rowspan - 1) * 2 + 1 + j;
+        } else if (isRow) {
+          return 2;
+        }
+      } else if (props.labelPosition == "auto") {
+        if (obj.rowspan) {
+          return obj.rowspan;
+        } else if (isRow) {
+          return 2;
+        }
+      } else {
+        if (obj.rowspan) {
+          return obj.rowspan;
+        } else if (isRow) {
+          return 2;
+        } else {
+          return 1;
+        }
+      }
+      return;
+    };
     const renderValue = () => {
       if (props.list && props.list.length > 0) {
         return h(
           "div",
           {
+            ref: (el) => {
+              refDom.value = el;
+            },
             class: cs.z("div"),
             style: cs.vdo({
               borderColor: borderColor.value,
+              rowMaxHeight: props.rowMaxHeight,
+              lineClamp: props.lineClamp,
               interval: props.interval
             })
             // onClick(event: Event) {

package/dist/components/list/style/index2.scss

@@ -1 +1,2 @@
+@use '../../tooltip/style/index2.scss' as *;
 @use '../index.scss' as *;

package/dist/components/page/index.css

@@ -697,6 +697,17 @@
 .list-div .list-table .list-table-th {
   text-align: left;
 }
+.list-div .list-table .list-table-value {
+  word-break: break-all;
+  white-space: normal;
+  display: block;
+  max-height: var(--list-row-max-height);
+  display: -webkit-box;
+  -webkit-line-clamp: var(--list-line-clamp); /* 显示的行数 */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 .list-div .list-table.right .list-table-th {
   text-align: right;
 }

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

@@ -52,7 +52,7 @@ const dataProps = {
     }
   }
 };
-const dataEmit = ["list-events", "selection"];
+const dataEmit = ["list-events", "selection", "drag", "update:value"];
 const useInit = (props2, emit, refTable, getLocale, isEl) => {
   var _a, _b;
   const loading = vue.ref(false);
@@ -75,8 +75,11 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
   const pagconfig = vue.ref(mpagconfig);
   const paginat = vue.reactive({
     is: false,
+    // 跨页多选
     cross: false,
+    // 前端分页
     front: false,
+    // 滚动加载
     scroll: false,
     current: 1,
     pageSize: mpagconfig.pageSize,
@@ -222,24 +225,26 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     console.log("crossPageData", crossPageData);
   }
   function getCrossPageValue(sarr, index) {
+    var _a2;
     const cross = paginat.cross;
     if (cross) {
-      if (typeof cross === "string") {
+      const rowKey = typeof cross === "string" ? cross : (_a2 = tableConfig.value.config) == null ? void 0 : _a2.rowKey;
+      if (rowKey) {
         const sv = /* @__PURE__ */ new Set();
         const is = [];
         if (sarr && index) {
           crossPageData.value.forEach((arr, i) => {
             if (i === index) {
               sarr.forEach((v) => {
-                if (!is.includes(v[cross])) {
-                  is.push(v[cross]);
+                if (!is.includes(v[rowKey])) {
+                  is.push(v[rowKey]);
                   sv.add(v);
                 }
               });
             } else {
               arr.forEach((v) => {
-                if (!is.includes(v[cross])) {
-                  is.push(v[cross]);
+                if (!is.includes(v[rowKey])) {
+                  is.push(v[rowKey]);
                   sv.add(v);
                 }
               });
@@ -247,8 +252,8 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
           });
           if (!crossPageData.value[index]) {
             sarr.forEach((v) => {
-              if (!is.includes(v[cross])) {
-                is.push(v[cross]);
+              if (!is.includes(v[rowKey])) {
+                is.push(v[rowKey]);
                 sv.add(v);
               }
             });
@@ -256,8 +261,8 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
         } else {
           crossPageData.value.forEach((arr) => {
             arr.forEach((v) => {
-              if (!is.includes(v[cross])) {
-                is.push(v[cross]);
+              if (!is.includes(v[rowKey])) {
+                is.push(v[rowKey]);
                 sv.add(v);
               }
             });
@@ -297,14 +302,16 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     }
   }
   function toggleCrossPage() {
+    var _a2;
     const cross = paginat.cross;
     if (paginat.is && cross && !paginat.scroll) {
       const datas = data.list;
       const vs = getCrossPageValue();
-      if (typeof cross == "string") {
-        const iss = vs.map((o) => o[cross]);
+      const rowKey = typeof cross === "string" ? cross : (_a2 = tableConfig.value.config) == null ? void 0 : _a2.rowKey;
+      if (rowKey) {
+        const iss = vs.map((o) => o[rowKey]);
         const ts = datas.filter((v) => {
-          return iss.includes(v[cross]);
+          return iss.includes(v[rowKey]);
         });
         vue.nextTick(() => {
           ts.forEach((v) => {
@@ -485,7 +492,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       const total = list.length;
       const c = paginat.current;
       const z = paginat.pageSize;
-      const data2 = list.slice((c - 1) * z, c * z);
+      const v = list.slice((c - 1) * z, c * z);
       const value = {};
       let ajaxData = {};
       if (typeof tableConfig.value.ajax === "object") {
@@ -493,7 +500,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       }
       const l = (ajaxData == null ? void 0 : ajaxData.list) ?? mpagconfig.data.list;
       const t = (ajaxData == null ? void 0 : ajaxData.total) ?? mpagconfig.data.total;
-      objValue.setObjValue(value, l, data2);
+      objValue.setObjValue(value, l, v);
       objValue.setObjValue(value, t, total);
       obj.value = value;
     }
@@ -637,6 +644,41 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       onChange: onScroll
     };
   });
+  function onSortable({
+    oldIndex,
+    newIndex
+  }) {
+    if (oldIndex === newIndex) return;
+    const movedItem = data.list.splice(oldIndex, 1)[0];
+    data.list.splice(newIndex, 0, movedItem);
+    if (paginat.is && paginat.front) {
+      const q = (paginat.current - 1) * paginat.pageSize;
+      const movedItem2 = props2.value.splice(q + oldIndex, 1)[0];
+      props2.value.splice(q + newIndex, 0, movedItem2);
+      if (props2.isValue) {
+        emit("update:value", props2.value);
+      }
+    } else {
+      if (props2.isValue) {
+        emit("update:value", data.list);
+      }
+    }
+    emit("drag", data.list, newIndex, oldIndex);
+  }
+  const sortable = vue.computed(() => {
+    var _a2;
+    let is = false;
+    if ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isdrag) {
+      is = true;
+    }
+    return {
+      is,
+      onEnd: onSortable
+    };
+  });
+  const datavalue = vue.computed(() => {
+    return data.list;
+  });
   setValue();
   return {
     height,
@@ -650,6 +692,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     empty,
     loading,
     scroll,
+    sortable,
     onSortChange,
     onListEvents,
     onSelect,
@@ -660,7 +703,8 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     onSizeChange,
     onCurrentChange,
     paginat,
-    data
+    data,
+    datavalue
   };
 };
 exports.dataEmit = dataEmit;

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

@@ -266,6 +266,13 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         loadText: string;
         onChange: () => void;
     }>;
+    sortable: ComputedRef<{
+        is: boolean;
+        onEnd: ({ oldIndex, newIndex, }: {
+            oldIndex: number;
+            newIndex: number;
+        }) => void;
+    }>;
     onSortChange: (obj: ObjAny) => void;
     onListEvents: (...arr: any) => void;
     onSelect: (s: ObjAny, row: ObjStr) => void;
@@ -335,4 +342,5 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         total: number;
         list: ObjAny[];
     };
+    datavalue: ComputedRef<ObjAny[]>;
 };