@fangzhongya/fang-ui 0.1.26 → 0.1.28

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

@@ -1,16 +1,29 @@
 import { Ref, Component, ExtractPropTypes, ComputedRef } from 'vue';
 import { Translator } from '../../types/locale';
 export declare const dataProps: {
+    /**
+     * @props { Boolean } isValue 用value数据
+     */
     isValue: {
         type: BooleanConstructor;
     };
+    /**
+     * @props { Object } configs 总表格的配置
+     * config 和 list 的结合
+     */
     configs: {
         type: () => Config;
     };
+    /**
+     * @props { Object } config={} 表格的配置
+     */
     config: {
         type: () => TableConfig;
         default(): {};
     };
+    /**
+     * @props { Array<ListObj> } list=[] 展示列的数组
+     */
     list: {
         type: {
             (arrayLength: number): ListObj[];
@@ -30,6 +43,9 @@ export declare const dataProps: {
         };
         default(): never[];
     };
+    /**
+     * @props { Boolean } load=true 默认加载
+     */
     load: {
         type: BooleanConstructor;
         default: boolean;
@@ -41,6 +57,12 @@ export declare const dataProps: {
         type: ObjectConstructor;
         default(): {};
     };
+    /**
+     * @props { Boolean } isCompons 是否使用默认的配置
+     */
+    isCompons: {
+        type: BooleanConstructor;
+    };
     /**
      * @props { Object } compons 外部组件集合
      */
@@ -86,7 +108,6 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
             border?: boolean | undefined;
             align?: string | undefined;
             resizable?: boolean | undefined;
-            sort?: boolean | undefined;
             fit?: boolean | undefined;
             showHeader?: boolean | undefined;
             highlightCurrentRow?: boolean | undefined;
@@ -98,9 +119,14 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         events?: {
             [key: string]: string | Function;
         } | undefined;
-        defaultSort?: {
-            prop?: string | undefined;
-            order?: "asc" | "ascending" | "desc" | "descending" | "" | undefined;
+        sort?: {
+            is?: boolean | undefined;
+            front?: boolean | undefined;
+            frontSort?: Function | undefined;
+            default?: {
+                prop?: string | undefined;
+                order?: "asc" | "ascending" | "desc" | "descending" | "" | undefined;
+            } | undefined;
         } | undefined;
         paginat?: {
             is?: boolean | undefined;
@@ -142,7 +168,6 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
             border?: boolean | undefined;
             align?: string | undefined;
             resizable?: boolean | undefined;
-            sort?: boolean | undefined;
             fit?: boolean | undefined;
             showHeader?: boolean | undefined;
             highlightCurrentRow?: boolean | undefined;
@@ -154,9 +179,14 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         events?: {
             [key: string]: string | Function;
         } | undefined;
-        defaultSort?: {
-            prop?: string | undefined;
-            order?: "asc" | "ascending" | "desc" | "descending" | "" | undefined;
+        sort?: {
+            is?: boolean | undefined;
+            front?: boolean | undefined;
+            frontSort?: Function | undefined;
+            default?: {
+                prop?: string | undefined;
+                order?: "asc" | "ascending" | "desc" | "descending" | "" | undefined;
+            } | undefined;
         } | undefined;
         paginat?: {
             is?: boolean | undefined;
@@ -252,7 +282,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         type?: string | undefined;
     }[]>;
     onRadioChange: (obj: ObjAny) => void;
-    getSelection: () => any;
+    getSelection: () => ObjStr[];
     initData: (callback?: () => void) => void;
     getData: (p?: ObjAny, callback?: (d?: ObjAny) => void) => void;
     clean: () => void;
@@ -277,6 +307,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
     onListEvents: (...arr: any) => void;
     onSelect: (s: ObjAny, row: ObjStr) => void;
     onRowClick: (row: ObjAny) => void;
+    onCellClick: (row: ObjAny) => void;
     onChange: (arr: ObjStr[]) => void;
     pagconfig: Ref<{
         pageSize: number;

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

@@ -7,26 +7,40 @@ import { executionMethod } from "../../../utils/util.js";
 import { setObjValue, getObjValue } from "@fangzhongya/utils/basic/object/objValue";
 const dataProps = {
   ...props,
+  /**
+   * @props { Boolean } isValue 用value数据
+   */
   isValue: {
     type: Boolean
   },
-  // 总表格的配置
+  /**
+   * @props { Object } configs 总表格的配置
+   * config 和 list 的结合
+   */
   configs: {
     type: Object
   },
-  // 表格的配置
+  /**
+   * @props { Object } config={} 表格的配置
+   */
   config: {
     type: Object,
     default() {
       return {};
     }
   },
+  /**
+   * @props { Array<ListObj> } list=[] 展示列的数组
+   */
   list: {
     type: Array,
     default() {
       return [];
     }
   },
+  /**
+   * @props { Boolean } load=true 默认加载
+   */
   load: {
     type: Boolean,
     default: true
@@ -40,6 +54,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */
@@ -169,13 +189,13 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     tableList.value = list;
   };
   const setConfig = () => {
-    var _a2;
+    var _a2, _b2;
     const configs = props2.configs;
     const config = (configs == null ? void 0 : configs.config) ?? props2.config;
-    if ((_a2 = config.config) == null ? void 0 : _a2.defaultSort) {
-      const v = config.config.defaultSort;
-      paginat.order = orderMap[v.order] ?? "";
-      paginat.prop = v.prop;
+    if ((_a2 = config.sort) == null ? void 0 : _a2.default) {
+      const v = ((_b2 = config.sort) == null ? void 0 : _b2.default) || {};
+      paginat.order = orderMap[v.order || ""] ?? "";
+      paginat.prop = v.prop ?? "";
     }
     const pagin = config.paginat ?? {};
     paginat.is = pagin.is || false;
@@ -336,88 +356,137 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       return arr;
     }
   }
+  const selections = ref([]);
   function getSelection() {
-    return refTable.value.getSelections();
+    return selections.value;
+  }
+  function setSelection(array) {
+    selections.value = array;
+    emit("selection", selections.value);
   }
   function onChange(arr) {
     var _a2;
+    console.log("onChange");
     if (!((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio)) {
-      console.log("onChange");
-      emit("selection", getSelectionValue(arr, paginat.current));
+      setSelection(getSelectionValue(arr, paginat.current));
+    }
+  }
+  const isHighlight = computed(() => {
+    const c = tableConfig.value.config || {};
+    if ((c == null ? void 0 : c.highlightCurrentRow) || c["highlight-current-row"]) {
+      return true;
+    } else {
+      return false;
+    }
+  });
+  function setSelectRow(row, is) {
+    var _a2, _b2;
+    if ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio) {
+      if ((_b2 = tableConfig.value.config) == null ? void 0 : _b2.isCancelAgain) {
+        if (selections.value[0] == row) {
+          refTable.value.clearSelection();
+          refTable.value.clearCurrentRow();
+          setSelection([]);
+        } else {
+          refTable.value.clearSelection();
+          refTable.value.toggleRowSelection(row, true);
+          setSelection([row]);
+        }
+      } else {
+        refTable.value.clearSelection();
+        refTable.value.toggleRowSelection(row, true);
+        setSelection([row]);
+      }
+    } else {
+      if (is) {
+        refTable.value.toggleRowSelection(row);
+      }
     }
   }
   function onRowClick(row) {
-    var _a2, _b2, _c, _d;
-    if (!((_a2 = tableConfig.value.config) == null ? void 0 : _a2.noRowSelect)) {
+    var _a2, _b2;
+    if ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isRowSelect) {
       const selectable = (_b2 = tableConfig.value.config) == null ? void 0 : _b2.selectable;
       if (selectable) {
         const index = data.list.findIndex((obj) => {
           obj === row;
         });
         if (selectable(row, index)) {
-          if ((_c = tableConfig.value.config) == null ? void 0 : _c.isradio) {
-            refTable.value.clearSelection();
-            refTable.value.toggleRowSelection(row, true);
-            console.log("onRowClick");
-            emit("selection", [row]);
-          } else {
-            refTable.value.toggleRowSelection(row);
-          }
+          setSelectRow(row, true);
         }
       } else {
-        if ((_d = tableConfig.value.config) == null ? void 0 : _d.isradio) {
-          refTable.value.clearSelection();
-          refTable.value.toggleRowSelection(row, true);
-          console.log("onRowClick");
-          emit("selection", [row]);
-        } else {
-          refTable.value.toggleRowSelection(row);
-        }
+        setSelectRow(row, true);
+      }
+    } else {
+      if (!isHighlight.value) {
+        refTable.value.clearCurrentRow();
       }
     }
   }
   function empty() {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c, _d;
     if (istype.value && ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio)) {
       (_b2 = refTable.value) == null ? void 0 : _b2.clearRadioRow();
     }
     (_c = refTable.value) == null ? void 0 : _c.clearSelection();
-    console.log("empty");
-    emit("selection", []);
+    (_d = refTable.value) == null ? void 0 : _d.clearCurrentRow();
+    setSelection([]);
   }
   function onSelect(s, row) {
-    var _a2;
+    setSelectRow(row, false);
+  }
+  function onCellClick(row) {
+    var _a2, _b2;
     if ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio) {
-      refTable.value.clearSelection();
-      refTable.value.toggleRowSelection(row, true);
-      console.log("onSelect");
-      emit("selection", [row]);
+      if ((_b2 = tableConfig.value.config) == null ? void 0 : _b2.isCancelAgain) {
+        if (selections.value[0] == row) {
+          console.log("onCellClick", row);
+          refTable.value.clearSelection();
+          refTable.value.clearCurrentRow();
+          setSelection([]);
+        }
+      }
     }
   }
   function onRadioChange(obj) {
     var _a2;
     if ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio) {
-      console.log("onRadioChange");
-      emit("selection", [obj.row]);
+      nextTick(() => {
+        onRowClick(obj.row);
+      });
     }
   }
+  function getFrontSort(ao, bo, prop) {
+    var _a2, _b2;
+    if ((_a2 = tableConfig.value.sort) == null ? void 0 : _a2.frontSort) {
+      return (_b2 = tableConfig.value.sort) == null ? void 0 : _b2.frontSort(ao, bo, prop);
+    } else {
+      const a = ao[prop];
+      const b = bo[prop];
+      const c = Number(a) - Number(b);
+      if (isNaN(c)) {
+        return (a + "").length - (b + "").length;
+      } else {
+        return c;
+      }
+    }
+  }
+  function clearSort() {
+    var _a2, _b2;
+    paginat.prop = "";
+    paginat.order = "";
+    (_b2 = (_a2 = refTable.value).clearSort) == null ? void 0 : _b2.call(_a2);
+  }
   function defaultSort(arr) {
-    var _a2, _b2, _c, _d, _e;
-    if (!((_a2 = tableConfig.value.config) == null ? void 0 : _a2.sort)) {
+    var _a2, _b2;
+    if (!((_b2 = (_a2 = tableConfig.value) == null ? void 0 : _a2.sort) == null ? void 0 : _b2.front)) {
       return arr;
     } else {
-      const prop = (_c = (_b2 = tableConfig.value.config) == null ? void 0 : _b2.defaultSort) == null ? void 0 : _c.prop;
-      const order = orderMap[(_e = (_d = tableConfig.value.config) == null ? void 0 : _d.defaultSort) == null ? void 0 : _e.order] || "";
+      const prop = paginat.prop;
+      const order = paginat.order;
       if (prop && order) {
         const vs = arr.sort((ao, bo) => {
-          const a = ao[prop];
-          const b = bo[prop];
-          const c = Number(a) - Number(b);
-          if (isNaN(c)) {
-            return (a + "").length - (b + "").length;
-          } else {
-            return c;
-          }
+          return getFrontSort(ao, bo, prop);
         });
         if (order == "asc") {
           return vs;
@@ -431,7 +500,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
   }
   function onSortChange(obj) {
     var _a2;
-    if (!((_a2 = tableConfig.value.config) == null ? void 0 : _a2.sort)) {
+    if ((_a2 = tableConfig.value.sort) == null ? void 0 : _a2.is) {
       paginat.order = orderMap[obj.order] || "";
       paginat.prop = obj.field || obj.prop;
       paginat.current = 1;
@@ -468,7 +537,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     console.log("clean");
     (_a2 = refTable.value) == null ? void 0 : _a2.clearSelection();
     crossPageData.value = [];
-    emit("selection", []);
+    setSelection([]);
   }
   function getParam(param) {
     var _a2;
@@ -647,6 +716,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     newIndex
   }) {
     if (oldIndex === newIndex) return;
+    clearSort();
     const movedItem = data.list.splice(oldIndex, 1)[0];
     data.list.splice(newIndex, 0, movedItem);
     if (paginat.is && paginat.front) {
@@ -695,6 +765,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     onListEvents,
     onSelect,
     onRowClick,
+    onCellClick,
     onChange,
     pagconfig,
     formEvent,

package/dist/components/tables/index.css

@@ -12,6 +12,15 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
+.com-lable-array {
+  line-height: 18px;
+}
+
 .tables {
   width: 100%;
   min-height: var(--tables-min-height, 70px);

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

@@ -1,36 +1,36 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-const util = require("../common/util.cjs");
-const index = require("../../table-column/index.cjs");
 const use = require("../../common/use.cjs");
 const getAttrValue = require("../../../utils/vues/getAttrValue.cjs");
-const compons = require("../../common/compons.cjs");
+const index = require("../../../hooks/compons/index.cjs");
 const config = require("../common/config.cjs");
+const util = require("../common/util.cjs");
+const index$1 = require("../../table-column/index.cjs");
 const noProps = ["children", "class", "minWidth", "label"];
 function setProps(obj, props) {
   const table = props.table;
   const robj = {};
-  const issort = table["sort"];
   robj["showOverflowTooltip"] = Boolean(getAttrValue.getAttrValue(obj, "showOverflow")) || getAttrValue.getAttrValue(table, "showOverflowTooltip") || Boolean(getAttrValue.getAttrValue(table, "showOverflow"));
   robj["header-align"] = table["align"];
   robj["align"] = getAttrValue.getAttrValue(obj, "headerAlign") || table["align"];
   Object.keys(obj).forEach((key) => {
     if (!noProps.includes(key)) {
       if (obj[key] !== "") {
-        robj[key] = obj[key];
         if (key == "sortable") {
-          if (issort && obj[key]) {
+          if (obj[key]) {
             robj[key] = "custom";
           }
+        } else {
+          robj[key] = obj[key];
         }
       }
     }
   });
   return robj;
 }
-function setSslot(obj, scope, emit, slots, props, index2) {
-  const slot = use.useSetSlot(obj, scope.row, slots, index2, scope);
+function setSslot(obj, scope, emit, slots, props, index$12) {
+  const slot = use.useSetSlot(obj, scope.row, slots, index$12, scope);
   if (slot) {
     return slot;
   }
@@ -42,9 +42,9 @@ function setSslot(obj, scope, emit, slots, props, index2) {
         obj,
         scope.row,
         optionss,
-        compons.useGetCompons(config.provides.compons),
+        index.useComponsGet(config.provides.compons),
         emit,
-        index2,
+        index$12,
         scope
       );
       if (column) {
@@ -52,7 +52,7 @@ function setSslot(obj, scope, emit, slots, props, index2) {
       }
     }
   }
-  return defaultDom(obj, scope, props, index2);
+  return defaultDom(obj, scope, props, index$12);
 }
 function defaultDom(obj, scope, props, index2) {
   var _a;
@@ -86,7 +86,7 @@ function defaultDom(obj, scope, props, index2) {
     domValue ?? table.emptyDisplay ?? ""
   );
 }
-function setHeader(obj, scope, slots, emit, props, index2) {
+function setHeader(obj, scope, slots, emit, props, index$12) {
   const optionss = props.options || {};
   return use.useGetDomLabel(
     obj.label,
@@ -94,17 +94,22 @@ function setHeader(obj, scope, slots, emit, props, index2) {
     scope.row,
     slots,
     optionss,
-    compons.useGetCompons(config.provides.compons),
+    index.useComponsGet(config.provides.compons),
     emit,
-    index2
+    index$12
   );
 }
-function getTableColumn(obj, emit, props, slots, index$1, def) {
+function getDom(obj, emit, propss, slots, index2) {
+  return getTableColumn(obj, emit, propss, slots, index2, (scope) => {
+    return setSslot(obj, scope, emit, slots, propss, index2);
+  });
+}
+function getTableColumn(obj, emit, props, slots, index2, def) {
   if (obj.type == "selection") {
     def = void 0;
   }
   return vue.h(
-    index.TableColumn,
+    index$1.TableColumn,
     {
       ...setProps(obj, props),
       className: obj.class,
@@ -113,18 +118,14 @@ function getTableColumn(obj, emit, props, slots, index$1, def) {
     {
       default: def,
       header: (scope) => {
-        return setHeader(obj, scope, slots, emit, props, index$1);
+        return setHeader(obj, scope, slots, emit, props, index2);
       }
     }
   );
 }
-function getDom(obj, emit, props, slots, index2) {
-  return getTableColumn(obj, emit, props, slots, index2, (scope) => {
-    return setSslot(obj, scope, emit, slots, props, index2);
-  });
-}
 function columnRender(obj, emit, props, slots, index2) {
   return getDom(obj, emit, props, slots, index2);
 }
 exports.columnRender = columnRender;
 exports.getTableColumn = getTableColumn;
+exports.setHeader = setHeader;

package/dist/components/tables/src/column.d.ts

@@ -1,4 +1,7 @@
 import { VNode, RendererNode, RendererElement } from 'vue';
+export declare function setHeader(obj: ListObj, scope: ObjAny, slots: ObjAny, emit: Function, props: ObjAny, index: number): string | VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}>;
 export declare function getTableColumn(obj: ListObj, emit: Function, props: ObjAny, slots: ObjAny, index: number, def?: Function): VNode<RendererNode, RendererElement, {
     [key: string]: any;
 }>;

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

@@ -1,26 +1,26 @@
 import { h } from "vue";
-import { setMinWidth } from "../common/util.js";
-import { TableColumn } from "../../table-column/index.js";
 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 "../common/config.js";
+import { setMinWidth } from "../common/util.js";
+import { TableColumn } from "../../table-column/index.js";
 const noProps = ["children", "class", "minWidth", "label"];
 function setProps(obj, props) {
   const table = props.table;
   const robj = {};
-  const issort = table["sort"];
   robj["showOverflowTooltip"] = Boolean(getAttrValue(obj, "showOverflow")) || getAttrValue(table, "showOverflowTooltip") || Boolean(getAttrValue(table, "showOverflow"));
   robj["header-align"] = table["align"];
   robj["align"] = getAttrValue(obj, "headerAlign") || table["align"];
   Object.keys(obj).forEach((key) => {
     if (!noProps.includes(key)) {
       if (obj[key] !== "") {
-        robj[key] = obj[key];
         if (key == "sortable") {
-          if (issort && obj[key]) {
+          if (obj[key]) {
             robj[key] = "custom";
           }
+        } else {
+          robj[key] = obj[key];
         }
       }
     }
@@ -40,7 +40,7 @@ function setSslot(obj, scope, emit, slots, props, index) {
         obj,
         scope.row,
         optionss,
-        useGetCompons(provides.compons),
+        useComponsGet(provides.compons),
         emit,
         index,
         scope
@@ -92,11 +92,16 @@ function setHeader(obj, scope, slots, emit, props, index) {
     scope.row,
     slots,
     optionss,
-    useGetCompons(provides.compons),
+    useComponsGet(provides.compons),
     emit,
     index
   );
 }
+function getDom(obj, emit, propss, slots, index) {
+  return getTableColumn(obj, emit, propss, slots, index, (scope) => {
+    return setSslot(obj, scope, emit, slots, propss, index);
+  });
+}
 function getTableColumn(obj, emit, props, slots, index, def) {
   if (obj.type == "selection") {
     def = void 0;
@@ -116,15 +121,11 @@ function getTableColumn(obj, emit, props, slots, index, def) {
     }
   );
 }
-function getDom(obj, emit, props, slots, index) {
-  return getTableColumn(obj, emit, props, slots, index, (scope) => {
-    return setSslot(obj, scope, emit, slots, props, index);
-  });
-}
 function columnRender(obj, emit, props, slots, index) {
   return getDom(obj, emit, props, slots, index);
 }
 export {
   columnRender,
-  getTableColumn
+  getTableColumn,
+  setHeader
 };

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

@@ -73,12 +73,21 @@ const dataProps = {
       return [];
     }
   },
+  rowKey: {
+    type: String
+  },
   /**
    * 行高度
    */
   lineHeight: {
     type: [String, Number]
   },
+  size: {
+    type: String,
+    default() {
+      return "default";
+    }
+  },
   /**
    * @props { Object } options 选择数据集合
    */
@@ -88,6 +97,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */