@fangzhongya/fang-ui 0.0.29 → 0.0.30

package/dist/components/tables/index.scss

@@ -1,32 +1,26 @@
 @use '../css/common.scss' as *;
 
-$tables-pag: 'tables-pag';
-@include b($tables-pag) {
+$tables: 'tables';
+@include b($tables) {
+	// height: 100%;
 	width: 100%;
-	height: 100%;
+	min-height: 100px;
+	position: relative;
 	flex: 1;
 	display: flex;
 	flex-direction: column;
-
-	&-main {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-		width: 100%;
-		&.#{is('radio')} {
-			.#{e()}table__header {
-				.#{e()}table-column--selection {
-					.#{e()}checkbox {
-						display: none;
-					}
-				}
-			}
-		}
-	}
-	&-paginat {
-		overflow: hidden;
-		.#{e()}pagination {
-			justify-content: flex-end;
+	&-table {
+		&.#{is('absolute')} {
+			position: absolute;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
 		}
+		// flex: 1;
+		// width: 100%;
+		// 去掉背景色
+		background-color: transparent;
+		--#{e()}table-header-bg-color: rgb(248, 248, 249);
 	}
 }

package/dist/components/{el-tables → tables}/src/column.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-const util = require("../../tables/common/util.cjs");
-const elementPlus = require("element-plus");
+const util = require("../common/util.cjs");
+const index$1 = require("element-plus/es/components/table/index");
 const use = require("../../common/use.cjs");
 const index = require("../../../hooks/inherit/index.cjs");
 const compons = require("../../common/compons.cjs");
@@ -100,7 +100,7 @@ function setHeader(obj, scope, slots, emit, props, index2) {
 function getDom(obj, emit, propss, slots, index2) {
   const props = setProps(obj, propss);
   return vue.h(
-    elementPlus.ElTableColumn,
+    index$1.ElTableColumn,
     {
       ...props,
       className: obj.class,

package/dist/components/{el-tables → tables}/src/column.js

@@ -1,6 +1,6 @@
 import { inject, h } from "vue";
-import { setMinWidth } from "../../tables/common/util.js";
-import { ElTableColumn } from "element-plus";
+import { setMinWidth } from "../common/util.js";
+import { ElTableColumn } from "element-plus/es/components/table/index";
 import { useGetDomLabel, useSetSlot, useSetCompon, useGetDomValue } from "../../common/use.js";
 import { useAttrValue } from "../../../hooks/inherit/index.js";
 import { getCompons } from "../../common/compons.js";

package/dist/components/{el-tables → tables}/src/columns.cjs

@@ -2,9 +2,9 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const columns = require("./columns3.cjs");
-const tableBut_vue_vue_type_script_setup_true_lang = require("../../tables/common/table-but.cjs");
-const tableColor_vue_vue_type_script_setup_true_lang = require("../../tables/common/table-color.cjs");
-const tableList_vue_vue_type_script_setup_true_lang = require("../../tables/common/table-list.cjs");
+const tableBut_vue_vue_type_script_setup_true_lang = require("../common/table-but.cjs");
+const tableColor_vue_vue_type_script_setup_true_lang = require("../common/table-color.cjs");
+const tableList_vue_vue_type_script_setup_true_lang = require("../common/table-list.cjs");
 const _sfc_main = vue.defineComponent({
   emits: ["list-events"],
   components: { But: tableBut_vue_vue_type_script_setup_true_lang.default, Color: tableColor_vue_vue_type_script_setup_true_lang.default, List: tableList_vue_vue_type_script_setup_true_lang.default },

package/dist/components/{el-tables → tables}/src/columns.js

@@ -1,8 +1,8 @@
 import { defineComponent } from "vue";
 import { render } from "./columns3.js";
-import _sfc_main$3 from "../../tables/common/table-but.js";
-import _sfc_main$2 from "../../tables/common/table-color.js";
-import _sfc_main$1 from "../../tables/common/table-list.js";
+import _sfc_main$3 from "../common/table-but.js";
+import _sfc_main$2 from "../common/table-color.js";
+import _sfc_main$1 from "../common/table-list.js";
 const _sfc_main = defineComponent({
   emits: ["list-events"],
   components: { But: _sfc_main$3, Color: _sfc_main$2, List: _sfc_main$1 },

package/dist/components/{el-tables → tables}/src/columns3.cjs

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-const util = require("../../tables/common/util.cjs");
+const util = require("../common/util.cjs");
 const use = require("../../common/use.cjs");
-const elementPlus = require("element-plus");
+const index = require("element-plus/es/components/table/index");
 const column = require("./column.cjs");
 function getLists(arrs, emit, props, slots, listobj) {
   let arr = [];
-  arrs?.forEach((obj, index) => {
+  arrs?.forEach((obj, index$1) => {
     if (listobj) {
       obj.father = obj.father ?? listobj;
     }
@@ -26,7 +26,7 @@ function getLists(arrs, emit, props, slots, listobj) {
         } else {
           arr.push(
             vue.h(
-              elementPlus.ElTableColumn,
+              index.ElTableColumn,
               {
                 ...column.setProps(obj, props),
                 className: obj.class,
@@ -49,7 +49,7 @@ function getLists(arrs, emit, props, slots, listobj) {
                     slots,
                     emit,
                     props,
-                    index
+                    index$1
                   );
                 }
               }
@@ -57,7 +57,7 @@ function getLists(arrs, emit, props, slots, listobj) {
           );
         }
       } else {
-        const dom = column.columnRender(obj, emit, props, slots, index);
+        const dom = column.columnRender(obj, emit, props, slots, index$1);
         if (dom) {
           arr.push(dom);
         }

package/dist/components/{el-tables → tables}/src/columns3.js

@@ -1,7 +1,7 @@
 import { h } from "vue";
-import { setMinWidth } from "../../tables/common/util.js";
+import { setMinWidth } from "../common/util.js";
 import { useHide } from "../../common/use.js";
-import { ElTableColumn } from "element-plus";
+import { ElTableColumn } from "element-plus/es/components/table/index";
 import { setProps, setHeader, columnRender } from "./column.js";
 function getLists(arrs, emit, props, slots, listobj) {
   let arr = [];

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

@@ -1,113 +1,174 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const index$2 = require("../../el-tables/index.cjs");
-const index$1 = require("../../vxe-tables/index.cjs");
-const index$3 = require("../../pagin/index.cjs");
-const pagin = require("../common/pagin.cjs");
+const data = require("./data.cjs");
+const index$2 = require("element-plus/es/components/table/index");
+const index$3 = require("element-plus/es/components/loading/index");
+const columns_vue_vue_type_script_lang = require("./columns.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
+const index$1 = require("../../../hooks/inherit/index.cjs");
+const use = require("../../common/use.cjs");
+const compons = require("../../common/compons.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
-  props: pagin.dataProps,
-  emits: pagin.dataEmit,
+  props: data.dataProps,
+  emits: data.dataEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
-    const cs = index.useCssName("tables-pag");
+    const cs = index.useCssName("tables");
     const slots = vue.useSlots();
+    const attrs = index$1.useInherit(vue.useAttrs());
     const props = __props;
+    vue.provide("tables-compons", compons.getCompons(props.compons));
+    const tableRef = vue.ref();
     const emit = __emit;
-    const refTable = vue.ref();
-    const {
-      getSelection,
-      initData,
-      getData,
-      empty,
-      loading,
-      tableList,
-      tableConfig,
-      onRadioChange,
-      onSortChange,
-      onListEvents,
-      onSelect,
-      onRowClick,
-      onChange,
-      pagconfig,
-      formEvent,
-      onSizeChange,
-      onCurrentChange,
-      paginat,
-      data
-    } = pagin.useInit(props, emit, refTable);
+    const rowObj = vue.ref();
+    const isfocus = vue.ref(false);
+    function onClick() {
+      isfocus.value = true;
+    }
+    function isComponSelected(obj, scope) {
+      if (use.uesObjComponSelected(obj, props)) {
+        if (rowObj.value === scope.row) {
+          if (isfocus.value) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return false;
+        }
+      } else {
+        return true;
+      }
+    }
+    let isSort = false;
+    const tableDefaultSort = vue.computed(() => {
+      return {
+        prop: props.defaultSort?.prop,
+        order: props.defaultSort?.order
+      };
+    });
+    const rowStyle = vue.computed(() => {
+      const height = props.lineHeight;
+      const rowStyle2 = attrs.assem.rowStyle;
+      if (height) {
+        if (rowStyle2) {
+          if (typeof rowStyle2 == "object") {
+            rowStyle2["height"] = height + "px";
+            return rowStyle2;
+          } else {
+            return rowStyle2;
+          }
+        } else {
+          return {
+            height: height + "px"
+          };
+        }
+      } else {
+        return {
+          height: "",
+          ...rowStyle2
+        };
+      }
+    });
+    vue.watch(tableDefaultSort, (newValue, oldValue) => {
+      let prop = tableDefaultSort.value.prop;
+      let order = tableDefaultSort.value.order;
+      if (tableRef.value) {
+        if (prop) {
+          isSort = true;
+          tableRef.value.sort(prop, order);
+        } else {
+          tableRef.value.clearSort();
+        }
+      }
+    });
+    function sortChange(obj) {
+      if (isSort) {
+        isSort = false;
+        return false;
+      }
+      emit("sort-change", obj);
+    }
+    function onListEvents(...arr) {
+      emit("list-events", ...arr);
+    }
+    function onRowClick(row, column, ...arr) {
+      isfocus.value = true;
+      rowObj.value = row;
+      emit("row-click", row, column, ...arr);
+    }
+    function toggleRowSelection(...arr) {
+      tableRef.value.toggleRowSelection(...arr);
+    }
+    function clearSelection() {
+      tableRef.value.clearSelection();
+    }
+    vue.onMounted(() => {
+      if (window) {
+        window.addEventListener("click", () => {
+          isfocus.value = false;
+        });
+      }
+    });
     __expose({
-      getSelection,
-      initData,
-      getList: getData,
-      empty
+      ...data.dataExpose,
+      clearSelection,
+      toggleRowSelection
     });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", {
-        class: vue.normalizeClass(vue.unref(cs).z())
-      }, [
-        vue.unref(tableConfig).type == 1 ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.VxeTables), vue.mergeProps({ key: 0 }, vue.unref(tableConfig).config, vue.toHandlers(vue.unref(formEvent)), {
-          ref_key: "refTable",
-          ref: refTable,
-          class: [vue.unref(cs).z("main")],
-          size: vue.unref(tableConfig).config?.size,
-          value: vue.unref(data).list,
-          list: vue.unref(tableList),
-          paginat: vue.unref(paginat),
-          loading: vue.unref(loading),
-          options: props.options,
-          compons: props.compons,
-          onSortChange: vue.unref(onSortChange),
-          onRadioChange: vue.unref(onRadioChange),
-          onSelectionChange: vue.unref(onChange),
-          onListEvents: vue.unref(onListEvents)
-        }), vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(vue.unref(slots)), (k, i) => {
-            return {
-              name: k,
-              fn: vue.withCtx((scope) => [
-                vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.guardReactiveProps(scope)))
-              ])
-            };
-          })
-        ]), 1040, ["class", "size", "value", "list", "paginat", "loading", "options", "compons", "onSortChange", "onRadioChange", "onSelectionChange", "onListEvents"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$2.ElTables), vue.mergeProps({ key: 1 }, vue.unref(tableConfig).config, vue.toHandlers(vue.unref(formEvent)), {
-          ref_key: "refTable",
-          ref: refTable,
-          class: [
-            vue.unref(cs).z("main"),
-            vue.unref(cs).is("radio", vue.unref(tableConfig).config?.isradio)
-          ],
-          value: vue.unref(data).list,
-          list: vue.unref(tableList),
-          size: vue.unref(tableConfig).config?.size,
-          paginat: vue.unref(paginat),
-          loading: vue.unref(loading),
-          options: props.options,
-          compons: props.compons,
-          onSortChange: vue.unref(onSortChange),
-          onListEvents: vue.unref(onListEvents),
-          onSelect: vue.unref(onSelect),
-          onRowClick: vue.unref(onRowClick),
-          onSelectionChange: vue.unref(onChange)
-        }), vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(vue.unref(slots)), (k, i) => {
-            return {
-              name: k,
-              fn: vue.withCtx((scope) => [
-                vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.guardReactiveProps(scope)))
-              ])
-            };
-          })
-        ]), 1040, ["class", "value", "list", "size", "paginat", "loading", "options", "compons", "onSortChange", "onListEvents", "onSelect", "onRowClick", "onSelectionChange"])),
-        vue.unref(tableConfig).paginat?.is ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.Pagin), vue.mergeProps({ key: 2 }, vue.unref(pagconfig), {
-          class: vue.unref(cs).z("paginat"),
-          paginat: vue.unref(paginat),
-          total: vue.unref(data).total,
-          onSizeChange: vue.unref(onSizeChange),
-          onCurrentChange: vue.unref(onCurrentChange)
-        }), null, 16, ["class", "paginat", "total", "onSizeChange", "onCurrentChange"])) : vue.createCommentVNode("", true)
-      ], 2);
+      return vue.openBlock(), vue.createElementBlock("div", vue.mergeProps({
+        class: vue.unref(cs).z()
+      }, vue.unref(attrs).root), [
+        vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(index$2.ElTable), vue.mergeProps(vue.unref(attrs).assem, {
+          align: "left",
+          ref_key: "tableRef",
+          ref: tableRef,
+          class: [vue.unref(cs).z("table"), vue.unref(cs).is("absolute", props.adaptive)],
+          height: props.height,
+          "scroll-selector": ".el-scrollbar .el-scrollbar__wrap",
+          "row-style": rowStyle.value,
+          data: props.value,
+          "default-sort": tableDefaultSort.value,
+          onRowClick,
+          onSortChange: sortChange,
+          onClick: vue.withModifiers(onClick, ["stop"])
+        }), {
+          empty: vue.withCtx(() => [
+            vue.renderSlot(_ctx.$slots, "no-data", {}, () => [
+              vue.createElementVNode("div", {
+                class: vue.normalizeClass(vue.unref(cs).z("no-data"))
+              }, _cache[0] || (_cache[0] = [
+                vue.createElementVNode("span", null, "暂无数据", -1)
+              ]), 2)
+            ])
+          ]),
+          default: vue.withCtx(() => [
+            vue.createVNode(columns_vue_vue_type_script_lang.default, {
+              table: vue.unref(attrs).assem,
+              value: props.value,
+              list: props.list,
+              options: props.options,
+              isComponSelected,
+              onListEvents
+            }, vue.createSlots({ _: 2 }, [
+              vue.renderList(Object.keys(vue.unref(slots)).filter(
+                (v) => !["empty", "no-data"].includes(v)
+              ), (k, i) => {
+                return {
+                  name: k,
+                  fn: vue.withCtx((scope) => [
+                    vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.guardReactiveProps(scope)))
+                  ])
+                };
+              })
+            ]), 1032, ["table", "value", "list", "options"])
+          ]),
+          _: 3
+        }, 16, ["class", "height", "row-style", "data", "default-sort"])), [
+          [vue.unref(index$3.vLoading), props.loading]
+        ])
+      ], 16);
     };
   }
 });