@fangzhongya/fang-ui 0.1.27 → 0.1.29

package/dist/components/tablesv/src/column.js

@@ -1,7 +1,7 @@
 import { h } from "vue";
 import { useSetSlot, useSetCompon, useGetDomValue, useGetDomLabel } from "../../common/use.js";
 import { getAttrValue } from "../../../utils/vues/getAttrValue.js";
-import { useGetCompons } from "../../common/compons.js";
+import { useComponsGet } from "../../../hooks/compons/index.js";
 import { provides } from "../../tables/common/config.js";
 import { setMinWidth } from "../../tables/common/util.js";
 import "../../../utils/index.js";
@@ -9,106 +9,6 @@ import { VxeColumn } from "vxe-table/es/column";
 import { Radio } from "../../radio/index.js";
 import { Checkbox } from "../../checkbox/index.js";
 import { lineToSmallHump } from "@fangzhongya/utils/name/lineToSmallHump";
-function setBox(props, obj, emit, propss, slots, index) {
-  if (props.type == "radio") {
-    return h(
-      VxeColumn,
-      {
-        ...props,
-        className: obj.class,
-        minWidth: setMinWidth(obj, propss)
-      },
-      {
-        radio: (scope) => {
-          return h(
-            "span",
-            {
-              class: "fv-custom-radio " + props.align + " " + (scope.disabled ? "is-disabled" : ""),
-              onClick(event) {
-                emit("list-events", "radio", scope);
-              }
-            },
-            [
-              h(
-                Radio,
-                {
-                  modelValue: scope.checked,
-                  value: true,
-                  label: true,
-                  disabled: scope.disabled
-                },
-                {
-                  default() {
-                    return "";
-                  }
-                }
-              ),
-              h("span", {
-                class: "fv-custom-radio-mask"
-              })
-            ]
-          );
-        }
-      }
-    );
-  } else {
-    return h(
-      VxeColumn,
-      {
-        ...props,
-        className: obj.class,
-        minWidth: setMinWidth(obj, propss)
-      },
-      {
-        header: (scope) => {
-          return h(
-            "span",
-            {
-              class: "fv-custom-checkbox",
-              onClick(event) {
-                emit("list-events", "checkbox-all", scope);
-              }
-            },
-            [
-              h(
-                Checkbox,
-                {
-                  indeterminate: scope.indeterminate,
-                  modelValue: scope.checked
-                },
-                obj.label
-              ),
-              h("span", {
-                class: "fv-custom-checkbox-mask"
-              })
-            ]
-          );
-        },
-        checkbox: (scope) => {
-          return h(
-            "span",
-            {
-              class: "fv-custom-checkbox " + (scope.disabled ? "is-disabled" : ""),
-              onClick(event) {
-                emit("list-events", "checkbox", scope);
-              }
-            },
-            [
-              h(Checkbox, {
-                indeterminate: scope.indeterminate,
-                modelValue: scope.checked,
-                disabled: scope.disabled
-              }),
-              h("span", {
-                class: "fv-custom-checkbox-mask"
-              })
-            ]
-          );
-        }
-      }
-    );
-  }
-}
 const noProps = ["children", "class", "minWidth"];
 function setProps(obj, props) {
   const table = props.table;
@@ -124,13 +24,14 @@ function setProps(obj, props) {
     const ckey = lineToSmallHump(key);
     if (!noProps.includes(ckey)) {
       if (obj[key] !== "") {
-        robj[key] = obj[key];
         if (key == "label") {
           robj["title"] = obj[key];
         } else if (ckey == "showOverflowTooltip") {
           if (obj[key]) {
             robj["show-overflow"] = "tooltip";
           }
+        } else if (key == "sortable") {
+          robj[key] = obj[key] ? true : void 0;
         } else if (key == "prop") {
           robj["field"] = obj[key];
         } else if (key == "fixed") {
@@ -160,6 +61,8 @@ function setProps(obj, props) {
           } else if (obj[key] == "index") {
             robj[key] = "seq";
           }
+        } else {
+          robj[key] = obj[key];
         }
       }
     }
@@ -167,7 +70,7 @@ function setProps(obj, props) {
   return robj;
 }
 function setSslot(obj, scope, emit, slots, props, index) {
-  const slot = useSetSlot(obj, scope.row, slots, index);
+  const slot = useSetSlot(obj, scope.row, slots, index, scope);
   if (slot) {
     return slot;
   }
@@ -179,9 +82,10 @@ function setSslot(obj, scope, emit, slots, props, index) {
         obj,
         scope.row,
         optionss,
-        useGetCompons(provides.compons),
+        useComponsGet(provides.compons),
         emit,
-        index
+        index,
+        scope
       );
       if (column) {
         return column;
@@ -230,7 +134,7 @@ function setHeader(obj, scope, slots, emit, props, index) {
     scope.row,
     slots,
     optionss,
-    useGetCompons(provides.compons),
+    useComponsGet(provides.compons),
     emit,
     index
   );
@@ -264,6 +168,106 @@ function getDom(obj, emit, propss, slots, index) {
 function columnRender(obj, emit, props, slots, index) {
   return getDom(obj, emit, props, slots, index);
 }
+function setBox(props, obj, emit, propss, slots, index) {
+  if (props.type == "radio") {
+    return h(
+      VxeColumn,
+      {
+        ...props,
+        className: obj.class,
+        minWidth: setMinWidth(obj, propss)
+      },
+      {
+        radio: (scope) => {
+          return h(
+            "span",
+            {
+              class: "fv-custom-radio " + props.align + " " + (scope.disabled ? "is-disabled" : ""),
+              onClick(event) {
+                emit("list-events", "radio", scope);
+              }
+            },
+            [
+              h(
+                Radio,
+                {
+                  modelValue: scope.checked,
+                  value: true,
+                  label: true,
+                  disabled: scope.disabled
+                },
+                {
+                  default() {
+                    return "";
+                  }
+                }
+              ),
+              h("span", {
+                class: "fv-custom-radio-mask"
+              })
+            ]
+          );
+        }
+      }
+    );
+  } else {
+    return h(
+      VxeColumn,
+      {
+        ...props,
+        className: obj.class,
+        minWidth: setMinWidth(obj, propss)
+      },
+      {
+        header: (scope) => {
+          return h(
+            "span",
+            {
+              class: "fv-custom-checkbox",
+              onClick(event) {
+                emit("list-events", "checkbox-all", scope);
+              }
+            },
+            [
+              h(
+                Checkbox,
+                {
+                  indeterminate: scope.indeterminate,
+                  modelValue: scope.checked
+                },
+                obj.label
+              ),
+              h("span", {
+                class: "fv-custom-checkbox-mask"
+              })
+            ]
+          );
+        },
+        checkbox: (scope) => {
+          return h(
+            "span",
+            {
+              class: "fv-custom-checkbox " + (scope.disabled ? "is-disabled" : ""),
+              onClick(event) {
+                emit("list-events", "checkbox", scope);
+              }
+            },
+            [
+              h(Checkbox, {
+                indeterminate: scope.indeterminate,
+                modelValue: scope.checked,
+                disabled: scope.disabled
+              }),
+              h("span", {
+                class: "fv-custom-checkbox-mask"
+              })
+            ]
+          );
+        }
+      }
+    );
+  }
+}
 export {
   columnRender,
   setHeader,

package/dist/components/tablesv/src/data.cjs

@@ -11,12 +11,29 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { String, Number } height='auto' 高度
+   */
   height: {
     type: [String, Number],
     default() {
       return "auto";
     }
   },
+  /**
+   * @props { String, Number } maxHeight
+   * 最大高度 设置了最大高度 height 值将无效化
+   */
+  maxHeight: {
+    type: String
+  },
+  /**
+   * @props { String, Number } minHeight
+   * 最小高度
+   */
+  minHeight: {
+    type: String
+  },
   /**
    * 加载中
    */
@@ -56,6 +73,9 @@ const dataProps = {
       return [];
     }
   },
+  rowKey: {
+    type: String
+  },
   /**
    * 行高度
    */
@@ -77,6 +97,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */
@@ -85,6 +111,22 @@ const dataProps = {
     default() {
       return {};
     }
+  },
+  /**
+   * @props { String } interval='6px'
+   * 查询模式的上下间距
+   */
+  interval: {
+    type: String,
+    default: "8px"
+  },
+  /**
+   * @props { String } intervalHorizon
+   * 查询模式的左右间距
+   */
+  intervalHorizon: {
+    type: String,
+    default: "12px"
   }
 };
 const dataEmits = [
@@ -93,6 +135,8 @@ const dataEmits = [
   "scope-click",
   "selection-list",
   "list-events",
+  "row-click",
+  "cell-click",
   "selection-change"
 ];
 const dataExpose = {};

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

@@ -1,7 +1,7 @@
 import { ExtractPropTypes, Component } from 'vue';
 export type DefaultSort = {
     prop: string;
-    order: 'ascending' | 'descending';
+    order: string;
 };
 /**
  * @title FTable 表格
@@ -21,10 +21,27 @@ export declare const dataProps: {
         type: () => DefaultSort;
         default(): {};
     };
+    /**
+     * @props { String, Number } height='auto' 高度
+     */
     height: {
         type: (StringConstructor | NumberConstructor)[];
         default(): string;
     };
+    /**
+     * @props { String, Number } maxHeight
+     * 最大高度 设置了最大高度 height 值将无效化
+     */
+    maxHeight: {
+        type: StringConstructor;
+    };
+    /**
+     * @props { String, Number } minHeight
+     * 最小高度
+     */
+    minHeight: {
+        type: StringConstructor;
+    };
     /**
      * 加载中
      */
@@ -89,6 +106,9 @@ export declare const dataProps: {
         };
         default(): never[];
     };
+    rowKey: {
+        type: StringConstructor;
+    };
     /**
      * 行高度
      */
@@ -106,6 +126,12 @@ export declare const dataProps: {
         type: ObjectConstructor;
         default(): {};
     };
+    /**
+     * @props { Boolean } isCompons 是否使用默认的配置
+     */
+    isCompons: {
+        type: BooleanConstructor;
+    };
     /**
      * @props { Object } compons 外部组件集合
      */
@@ -115,6 +141,22 @@ export declare const dataProps: {
         };
         default(): {};
     };
+    /**
+     * @props { String } interval='6px'
+     * 查询模式的上下间距
+     */
+    interval: {
+        type: StringConstructor;
+        default: string;
+    };
+    /**
+     * @props { String } intervalHorizon
+     * 查询模式的左右间距
+     */
+    intervalHorizon: {
+        type: StringConstructor;
+        default: string;
+    };
 };
 export type DataProps = ExtractPropTypes<typeof dataProps>;
 /**

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

@@ -9,12 +9,29 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { String, Number } height='auto' 高度
+   */
   height: {
     type: [String, Number],
     default() {
       return "auto";
     }
   },
+  /**
+   * @props { String, Number } maxHeight
+   * 最大高度 设置了最大高度 height 值将无效化
+   */
+  maxHeight: {
+    type: String
+  },
+  /**
+   * @props { String, Number } minHeight
+   * 最小高度
+   */
+  minHeight: {
+    type: String
+  },
   /**
    * 加载中
    */
@@ -54,6 +71,9 @@ const dataProps = {
       return [];
     }
   },
+  rowKey: {
+    type: String
+  },
   /**
    * 行高度
    */
@@ -75,6 +95,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */
@@ -83,6 +109,22 @@ const dataProps = {
     default() {
       return {};
     }
+  },
+  /**
+   * @props { String } interval='6px'
+   * 查询模式的上下间距
+   */
+  interval: {
+    type: String,
+    default: "8px"
+  },
+  /**
+   * @props { String } intervalHorizon
+   * 查询模式的左右间距
+   */
+  intervalHorizon: {
+    type: String,
+    default: "12px"
   }
 };
 const dataEmits = [
@@ -91,6 +133,8 @@ const dataEmits = [
   "scope-click",
   "selection-list",
   "list-events",
+  "row-click",
+  "cell-click",
   "selection-change"
 ];
 const dataExpose = {};

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

@@ -2,16 +2,18 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const table = require("vxe-table/es/table");
+require("../../loading/index.cjs");
 const data = require("./data.cjs");
 const config = require("../../tables/common/config.cjs");
 require("./columns.cjs");
-const index$3 = require("../../no-data/index.cjs");
+const index$4 = require("../../no-data/index.cjs");
 const use = require("../../common/use.cjs");
 const index$1 = require("../../../hooks/inherit/index.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
-const compons = require("../../common/compons.cjs");
+const index$3 = require("../../../hooks/compons/index.cjs");
 const index$2 = require("../../../hooks/props-default/index.cjs");
 const columns_vue_vue_type_script_lang = require("./columns2.cjs");
+const index$5 = require("element-plus/es/components/loading/index");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: index$2.getProps(data.dataProps),
@@ -23,9 +25,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const prs = __props;
     const props = index$2.usePropsDefault(data.name, prs, data.dataProps);
     index$2.viewProps(props, data.name);
-    compons.useCompons(config.provides.compons, props.compons);
+    index$3.useCompons(config.provides.compons, props);
     const tableRef = vue.ref();
     const emit = __emit;
+    console.log("props.maxHeight", props.maxHeight);
     const rowObj = vue.ref();
     const isfocus = vue.ref(false);
     function onClick() {
@@ -80,7 +83,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       nocustomize: attrs.assem.__B("nocustomize"),
       row: {
         isCurrent: setHover(),
-        isHover: setHover()
+        isHover: setHover(),
+        keyField: props.rowKey
       },
       column: {
         minWidth: attrs.assem.minWidth,
@@ -95,10 +99,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       },
       seq: {},
       checkbox: {
-        trigger: attrs.assem.noRowSelect ? "cell" : "row"
+        trigger: attrs.assem.isRowSelect ? "row" : "cell"
       },
       radio: {
-        trigger: attrs.assem.noRowSelect ? "cell" : "row"
+        trigger: attrs.assem.isRowSelect ? "row" : "cell"
       }
     });
     const rowStyle = vue.computed(() => {
@@ -166,9 +170,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     function onCellClick(scope) {
       rowObj.value = scope.row;
+      emit("cell-click", scope.row, scope.row, scope);
     }
     function toggleRowSelection(row) {
-      tableRef.value.toggleRowSelection(row);
     }
     function clearSelection() {
       tableRef.value.clearCheckboxRow();
@@ -176,6 +180,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function clearRadioRow() {
       tableRef.value.clearRadioRow();
     }
+    function getSelections() {
+    }
+    function clearSort() {
+      tableRef.value.clearSort();
+    }
+    function setCurrentRow(row) {
+      tableRef.value.setRadioRow(row);
+    }
+    function clearCurrentRow() {
+      tableRef.value.clearRadioRow();
+      tableRef.value.clearCurrentRow();
+    }
     vue.onMounted(() => {
       if (window) {
         window.addEventListener("click", () => {
@@ -186,19 +202,24 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     __expose({
       ...data.dataExpose,
       clearSelection,
-      clearRadioRow
+      clearRadioRow,
+      clearSort,
+      setCurrentRow,
+      clearCurrentRow,
+      getSelections,
+      toggleRowSelection
     });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", vue.mergeProps({
         class: vue.unref(cs).z()
       }, vue.unref(attrs).root), [
-        vue.createVNode(vue.unref(table.VxeTable), vue.mergeProps(vue.unref(attrs).assem, {
+        vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(table.VxeTable), vue.mergeProps(vue.unref(attrs).assem, {
+          size: size.value,
           ref_key: "tableRef",
           ref: tableRef,
-          height: vue.unref(props).height == "auto" ? "" : vue.unref(props).height,
           class: [vue.unref(cs).z("table"), vue.unref(cs).is("absolute", vue.unref(props).adaptive)],
-          size: size.value,
-          loading: vue.unref(props).loading,
+          height: vue.unref(props).maxHeight ? void 0 : vue.unref(props).height,
+          "max-height": vue.unref(props).maxHeight,
           "column-config": config$1.value.column,
           "row-style": rowStyle.value,
           "row-config": config$1.value.row,
@@ -215,7 +236,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }), {
           empty: vue.withCtx(() => [
             vue.renderSlot(_ctx.$slots, "no-data", {}, () => [
-              vue.createVNode(vue.unref(index$3.NoData))
+              vue.createVNode(vue.unref(index$4.NoData))
             ])
           ]),
           default: vue.withCtx(() => [
@@ -241,7 +262,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ]), 1032, ["table", "vxeconfig", "value", "list", "options"])
           ]),
           _: 3
-        }, 16, ["height", "class", "size", "loading", "column-config", "row-style", "row-config", "seq-config", "sort-config", "checkbox-config", "radio-config", "data"])
+        }, 16, ["size", "class", "height", "max-height", "column-config", "row-style", "row-config", "seq-config", "sort-config", "checkbox-config", "radio-config", "data"])), [
+          [vue.unref(index$5.vLoading), vue.unref(props).loading]
+        ])
       ], 16);
     };
   }