@fangzhongya/fang-ui 0.1.34 → 0.1.36

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

@@ -5,11 +5,20 @@ import { useObjComponSelected, useHide } from "../../common/use.js";
 import { useCompons } from "../../../hooks/compons/index.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 { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { name, dataProps, dataExpose, dataEmits } from "./data.js";
 import "../../tables/common/img.js";
+import "../../tables/common/table-but.js";
+import "../../tables/common/table-color.js";
+import "../../tables/common/table-list.js";
 import _sfc_main$1 from "../../tables/common/img2.js";
+import _sfc_main$2 from "../../tables/common/table-list2.js";
+import _sfc_main$3 from "../../tables/common/table-color2.js";
+import _sfc_main$4 from "../../tables/common/table-but2.js";
 const Components = {
+  But: _sfc_main$4,
+  Color: _sfc_main$3,
+  List: _sfc_main$2,
   Img: _sfc_main$1
 };
 const _sfc_main = defineComponent({
@@ -20,7 +29,6 @@ const _sfc_main = defineComponent({
   props: getProps(dataProps),
   setup(prs, { emit, slots }) {
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const compons = useCompons(name, props);
     const cs = useCssName(name);
     const refDom = ref();
@@ -50,91 +58,106 @@ const _sfc_main = defineComponent({
         return true;
       }
     }
+    const calculateLineInfo = (obj, currentLine, column) => {
+      if (obj.whole) {
+        return { newLine: column, shouldBreak: true };
+      }
+      const colspan = obj.colspan || 1;
+      const newPosition = colspan + currentLine;
+      if (newPosition > column) {
+        return { newLine: colspan, shouldBreak: true };
+      }
+      return { newLine: newPosition, shouldBreak: false };
+    };
+    const processObjectVisibility = (obj, listobj, value) => {
+      if (listobj) {
+        obj.father = obj.father ?? listobj;
+      }
+      return !useHide(obj, value);
+    };
+    const createRowAndReset = (arr, trs, resetLine = false) => {
+      if (trs.length > 0) {
+        arr.push(h("tr", {}, trs));
+      }
+      return { newTrs: [], newLine: resetLine ? 0 : -1 };
+    };
     const getLists = (arrs, listobj) => {
-      let arr = [], trs = [], lin = 0;
-      arrs.forEach((obj, index) => {
-        if (listobj) {
-          obj.father = obj.father ?? listobj;
+      const arr = [];
+      let trs = [];
+      let lin = 0;
+      for (let index = 0; index < arrs.length; index++) {
+        const obj = arrs[index];
+        if (!processObjectVisibility(obj, listobj, props.value)) {
+          continue;
         }
-        if (!useHide(obj, props.value)) {
-          let is = false;
-          if (obj.whole) {
-            lin = props.column;
-            is = true;
-          } else {
-            let k = (obj.colspan || 1) + lin;
-            if (k > props.column) {
-              lin = obj.colspan || 1;
-              is = true;
-            } else {
-              lin = k;
-              is = false;
-            }
-          }
-          if (is) {
-            arr.push(h("tr", {}, trs));
-            trs = [];
-          }
-          trs.push(...getTd(obj, index));
-          if (lin >= props.column) {
-            arr.push(h("tr", {}, trs));
-            trs = [];
-            lin = 0;
-          }
+        const { newLine, shouldBreak } = calculateLineInfo(
+          obj,
+          lin,
+          props.column
+        );
+        if (shouldBreak) {
+          ({ newTrs: trs, newLine: lin } = createRowAndReset(
+            arr,
+            trs
+          ));
+        }
+        trs.push(...getTd(obj, index));
+        lin = newLine;
+        if (lin >= props.column) {
+          ({ newTrs: trs, newLine: lin } = createRowAndReset(
+            arr,
+            trs,
+            true
+          ));
         }
-      });
-      if (trs.length > 0) {
-        arr.push(h("tr", {}, trs));
       }
+      createRowAndReset(arr, trs);
       return arr;
     };
     const getListTops = (arrs, listobj) => {
-      let arr = [], trvs = [], trls = [], lin = 0;
-      arrs.forEach((obj, index) => {
-        if (listobj) {
-          obj.father = obj.father ?? listobj;
+      const arr = [];
+      let trls = [];
+      let trvs = [];
+      let lin = 0;
+      for (let index = 0; index < arrs.length; index++) {
+        const obj = arrs[index];
+        if (!processObjectVisibility(obj, listobj, props.value)) {
+          continue;
         }
-        if (!useHide(obj, props.value)) {
-          let is = false;
-          if (obj.whole) {
-            lin = props.column;
-            is = true;
-          } else {
-            let k = (obj.colspan || 1) + lin;
-            if (k > props.column) {
-              lin = obj.colspan || 1;
-              is = true;
-            } else {
-              lin = k;
-              is = false;
-            }
-          }
-          if (is) {
-            arr.push(h("tr", {}, trls));
-            trls = [];
-            arr.push(h("tr", {}, trvs));
-            trvs = [];
-          }
-          if (obj.isdiv) {
-            trls.push(getValue(obj, index, true));
-          } else {
-            trls.push(getlabel(obj, index));
-            trvs.push(getValue(obj, index));
-          }
-          if (lin >= props.column) {
-            arr.push(h("tr", {}, trls));
-            arr.push(h("tr", {}, trvs));
-            trls = [];
-            trvs = [];
-            lin = 0;
-          }
+        const { newLine, shouldBreak } = calculateLineInfo(
+          obj,
+          lin,
+          props.column
+        );
+        if (shouldBreak) {
+          createDoubleRows(arr, trls, trvs);
+          trls = [];
+          trvs = [];
+        }
+        if (obj.isdiv) {
+          trls.push(getValue(obj, index, true));
+        } else {
+          trls.push(getlabel(obj, index));
+          trvs.push(getValue(obj, index));
+        }
+        lin = newLine;
+        if (lin >= props.column) {
+          createDoubleRows(arr, trls, trvs);
+          trls = [];
+          trvs = [];
+          lin = 0;
         }
-      });
+      }
+      if (trls.length > 0) {
+        createDoubleRows(arr, trls, trvs);
+      }
+      return arr;
+    };
+    const createDoubleRows = (arr, trls, trvs) => {
       if (trls.length > 0) {
         arr.push(h("tr", {}, trls));
         arr.push(h("tr", {}, trvs));
       }
-      return arr;
     };
     const getlabel = (obj, index) => {
       return h(
@@ -335,16 +358,13 @@ const _sfc_main = defineComponent({
         } else if (isRow) {
           return 2;
         }
+      } else 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 1;
       }
-      return;
     };
     const onClickTotal = (event) => {
       const isFromGrandchild = event.target.closest(

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

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

package/dist/components/lists/index.css

@@ -1,8 +1,9 @@
+@charset "UTF-8";
 :root {
   --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;
@@ -22,6 +23,141 @@
   line-height: var(--lable-array-height);
 }
 
+.list-div .list-table {
+  width: 100%;
+  height: 100%;
+}
+.list-div .list-table td {
+  text-align: left;
+}
+.list-div .list-table th {
+  font-weight: initial;
+}
+.list-div .list-table .is-whole .list-table-auto {
+  width: 100%;
+}
+.list-div .list-table .is-whole .list-table-value {
+  width: 100%;
+  display: block;
+}
+.list-div .list-table .list-table-td,
+.list-div .list-table .list-table-th {
+  padding: var(--list-interval) var(--list-interval-horizon, var(--list-interval));
+}
+.list-div .list-table .list-table-auto {
+  width: 100%;
+  height: 100%;
+  display: inline-flex;
+  word-break: break-all;
+}
+.list-div .list-table .list-table-auto .list-table-td {
+  flex: 1;
+}
+.list-div .list-table .list-table-auto .list-table-th.itemscenter {
+  display: inline-flex;
+  align-items: center;
+}
+.list-div .list-table .list-table-auto .list-table-th.itemsend {
+  display: inline-flex;
+  align-items: end;
+}
+.list-div .list-table .list-table-auto .list-table-th.alignright {
+  display: inline-flex;
+  justify-content: end;
+}
+.list-div .list-table .list-table-auto .list-table-th.aligncenter {
+  display: inline-flex;
+  justify-content: center;
+}
+.list-div .list-table .list-table-auto .list-table-td.itemscenter {
+  display: inline-flex;
+  align-items: center;
+}
+.list-div .list-table .list-table-auto .list-table-td.itemsend {
+  display: inline-flex;
+  align-items: end;
+}
+.list-div .list-table .list-table-auto .list-table-td.alignright {
+  display: inline-flex;
+  justify-content: end;
+}
+.list-div .list-table .list-table-auto .list-table-td.aligncenter {
+  display: inline-flex;
+  justify-content: center;
+}
+.list-div .list-table .list-table-auto .list-table-label {
+  white-space: nowrap;
+}
+.list-div .list-table .is-width .list-table-label {
+  word-break: break-all;
+  white-space: normal;
+  display: block;
+}
+.list-div .list-table .list-table-th {
+  text-align: left;
+}
+.list-div .list-table .list-table-label {
+  white-space: pre-wrap;
+}
+.list-div .list-table .list-table-value {
+  word-break: break-all;
+  white-space: normal;
+  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;
+}
+.list-div .list-table.center .list-table-th {
+  text-align: center;
+}
+.list-div .list-table.top .list-table-th {
+  padding-bottom: 0;
+}
+.list-div .list-table.is-aliquots {
+  table-layout: fixed;
+}
+.list-div .list-table.is-border {
+  border-right: 1px solid var(--list-border-color);
+  border-top: 1px solid var(--list-border-color);
+  border-bottom: 1px solid var(--list-border-color);
+}
+.list-div .list-table.is-border > tr > td {
+  border-bottom: 1px solid var(--list-border-color);
+  border-left: 1px solid var(--list-border-color);
+}
+.list-div .list-table.is-border > tr > td:last-child {
+  border-right: 1px solid var(--list-border-color);
+}
+.list-div .list-table.is-border > tr > th {
+  border-left: 1px solid var(--list-border-color);
+  border-bottom: 1px solid var(--list-border-color);
+}
+.list-div .list-table.is-border > tr > th:last-child {
+  border-right: 1px solid var(--list-border-color);
+}
+.list-div .list-table.is-border > tr:last-child > td {
+  border-bottom: 0;
+}
+.list-div .list-table.is-border > tr:last-child > th {
+  border-bottom: 0;
+}
+.list-div .list-table.is-border.top > tr > th {
+  border-bottom: 0;
+}
+.list-div .list-table .list-com {
+  display: flex;
+  align-items: center;
+}
+.list-div .list-table .list-com-img {
+  width: 50px;
+  height: 50px;
+}
+
 .lists {
   width: 100%;
   min-height: 100px;
@@ -32,6 +168,7 @@
   background-color: #eee;
 }
 .lists-list {
+  overflow-y: auto;
   padding: 0 var(--lists-interval-horizon, var(--lists-interval));
 }
 .lists-list.is-absolute {
@@ -46,7 +183,7 @@
   margin-top: calc(var(--lists-interval) * 2);
 }
 .lists-list-item {
-  background-color: #fff;
+  background-color: #ffffff;
   margin: 0 var(--lists-interval-horizon, var(--lists-interval));
   margin-bottom: calc(var(--lists-interval) * 2);
 }

package/dist/components/lists/index.d.ts

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

package/dist/components/lists/index.scss

@@ -1,4 +1,5 @@
 @use '../scss/common.scss' as *;
+@use '../list/index.scss' as *;
 
 $lists: 'lists';
 @include b($lists) {
@@ -10,6 +11,7 @@ $lists: 'lists';
 	flex-direction: column;
 	background-color: #eee;
 	&-list {
+		overflow-y: auto;
 		padding: 0
 			var(vdm('interval-horizon', $lists), var(vdm('interval', $lists)));
 		&.#{is('absolute')} {
@@ -26,7 +28,7 @@ $lists: 'lists';
 			&:first-child {
 				margin-top: calc(var(vdm('interval', $lists)) * 2);
 			}
-			background-color: #fff;
+			background-color: #ffffff;
 			margin: 0
 				var(
 					vdm('interval-horizon', $lists),

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

@@ -25,14 +25,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const cs = index$2.useCssName(data.name);
     const prs = __props;
     const props = index$3.usePropsDefault(data.name, prs, data.dataProps);
-    index$3.viewProps(props, data.name);
     const emit = __emit;
     const header = vue.ref([]);
     const footer = vue.ref([]);
     const dataList = vue.ref([]);
     const setList = () => {
       const list = props.list || [];
-      list.forEach((obj) => {
+      for (const obj of list) {
         const fixed = obj.fixed;
         if (fixed) {
           if (typeof fixed === "boolean") {
@@ -45,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         } else {
           dataList.value.push({ ...obj });
         }
-      });
+      }
     };
     vue.watch(
       [() => props.list, () => {
@@ -69,12 +68,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           const paginat = attrs.assem.paginat;
           if (obj.index) {
             value = obj.index(index2, paginat);
+          } else if ((paginat == null ? void 0 : paginat.is) && !paginat.scroll && paginat.current && paginat.pageSize) {
+            value = (paginat.current - 1) * paginat.pageSize + index2 + 1;
           } else {
-            if ((paginat == null ? void 0 : paginat.is) && !paginat.scroll && paginat.current && paginat.pageSize) {
-              value = (paginat.current - 1) * paginat.pageSize + index2 + 1;
-            } else {
-              value = index2 + 1;
-            }
+            value = index2 + 1;
           }
           arr.push({ ...obj, value });
         } else {
@@ -111,10 +108,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const width = v.width ?? props.rowWidth;
       if (width) {
         obj.width = width;
-      } else {
-        if (props.rowColumn > 1) {
-          obj.width = "calc(" + Number((100 / props.rowColumn).toFixed(2)) + "% - " + props.interval + " * 2)";
-        }
+      } else if (props.rowColumn > 1) {
+        obj.width = "calc(" + Number((100 / props.rowColumn).toFixed(2)) + "% - " + props.interval + " * 2)";
       }
       if (minWidth) {
         obj.minWidth = minWidth;
@@ -127,8 +122,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     const selections = vue.ref([]);
     function toggleRowSelection(item, is) {
-      if (is) {
-        selections.value.push(item);
+      if (is === void 0) {
+        const i = selections.value.indexOf(item);
+        if (i != -1) {
+          selections.value.splice(i, 1);
+        } else {
+          selections.value.push(item);
+        }
+      } else if (is) {
+        const i = selections.value.indexOf(item);
+        if (i === -1) {
+          selections.value.push(item);
+        }
       } else {
         const i = selections.value.indexOf(item);
         if (i != -1) {
@@ -143,10 +148,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return selections.value;
     }
     function clearSort() {
+      console.log("clearSort");
     }
-    function setCurrentRow() {
+    function setCurrentRow(item) {
+      rows.value = item;
+      console.log("setCurrentRow");
     }
     function clearCurrentRow() {
+      rows.value = void 0;
+      console.log("clearCurrentRow");
     }
     const getRef = () => {
     };

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

@@ -8,7 +8,7 @@ import { useLocale } from "../../../hooks/locale/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
 import { List } from "../../list/index.js";
 import "../../../utils/css.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { setObjStyle } from "@fangzhongya/utils/css/setObjStyle";
 import { vLoading } from "element-plus/es/components/loading/index";
 const _hoisted_1 = ["onClick"];
@@ -23,14 +23,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cs = useCssName(name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const header = ref([]);
     const footer = ref([]);
     const dataList = ref([]);
     const setList = () => {
       const list = props.list || [];
-      list.forEach((obj) => {
+      for (const obj of list) {
         const fixed = obj.fixed;
         if (fixed) {
           if (typeof fixed === "boolean") {
@@ -43,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           dataList.value.push({ ...obj });
         }
-      });
+      }
     };
     watch(
       [() => props.list, () => {
@@ -67,12 +66,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const paginat = attrs.assem.paginat;
           if (obj.index) {
             value = obj.index(index, paginat);
+          } else if ((paginat == null ? void 0 : paginat.is) && !paginat.scroll && paginat.current && paginat.pageSize) {
+            value = (paginat.current - 1) * paginat.pageSize + index + 1;
           } else {
-            if ((paginat == null ? void 0 : paginat.is) && !paginat.scroll && paginat.current && paginat.pageSize) {
-              value = (paginat.current - 1) * paginat.pageSize + index + 1;
-            } else {
-              value = index + 1;
-            }
+            value = index + 1;
           }
           arr.push({ ...obj, value });
         } else {
@@ -109,10 +106,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const width = v.width ?? props.rowWidth;
       if (width) {
         obj.width = width;
-      } else {
-        if (props.rowColumn > 1) {
-          obj.width = "calc(" + Number((100 / props.rowColumn).toFixed(2)) + "% - " + props.interval + " * 2)";
-        }
+      } else if (props.rowColumn > 1) {
+        obj.width = "calc(" + Number((100 / props.rowColumn).toFixed(2)) + "% - " + props.interval + " * 2)";
       }
       if (minWidth) {
         obj.minWidth = minWidth;
@@ -125,8 +120,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const selections = ref([]);
     function toggleRowSelection(item, is) {
-      if (is) {
-        selections.value.push(item);
+      if (is === void 0) {
+        const i = selections.value.indexOf(item);
+        if (i != -1) {
+          selections.value.splice(i, 1);
+        } else {
+          selections.value.push(item);
+        }
+      } else if (is) {
+        const i = selections.value.indexOf(item);
+        if (i === -1) {
+          selections.value.push(item);
+        }
       } else {
         const i = selections.value.indexOf(item);
         if (i != -1) {
@@ -141,10 +146,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return selections.value;
     }
     function clearSort() {
+      console.log("clearSort");
     }
-    function setCurrentRow() {
+    function setCurrentRow(item) {
+      rows.value = item;
+      console.log("setCurrentRow");
     }
     function clearCurrentRow() {
+      rows.value = void 0;
+      console.log("clearCurrentRow");
     }
     const getRef = () => {
     };

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

@@ -1,3 +1,4 @@
 @use '../../card/style/index2.scss' as *;
 @use '../../loading/style/index2.scss' as *;
+@use '../../list/style/index2.scss' as *;
 @use '../index.scss' as *;