@fangzhongya/fang-ui 0.1.25 → 0.1.27

package/dist/components/retract/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .retract {
   position: relative;
 }

package/dist/components/right-key/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .right-key-box {
   width: 140px;
   position: absolute;

package/dist/components/scss/common.scss

@@ -17,3 +17,8 @@
 	);
 	--#{$cssname}g-main-bg: var(--#{$cssname}bg-color-page);
 }
+
+.com-footer {
+	border-top: 1px solid var(--#{$cssname}border);
+	padding: 20px 20px;
+}

package/dist/components/seamless-scroll/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .seamless-scroll {
   position: relative;
   overflow: hidden;

package/dist/components/select-scroll/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .select-scroll {
   flex: 1;
   float: left;

package/dist/components/selector/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .select-scroll {
   flex: 1;
   float: left;

package/dist/components/selects/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .selects-select {
   height: 100%;
   min-width: 60px;

package/dist/components/sliders/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .sliders {
   width: 100%;
   position: relative;

package/dist/components/switchs/index.css

@@ -12,6 +12,11 @@
   --g-main-bg: var(--bg-color-page);
 }
 
+.com-footer {
+  border-top: 1px solid var(--border);
+  padding: 20px 20px;
+}
+
 .switchs-switch {
   height: 100%;
 }

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

@@ -9,26 +9,40 @@ const util = require("../../../utils/util.cjs");
 const objValue = require("@fangzhongya/utils/basic/object/objValue");
 const dataProps = {
   ...urls.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
@@ -171,13 +185,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;
@@ -403,23 +417,37 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       emit("selection", [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;
@@ -433,7 +461,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;
@@ -649,6 +677,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) {

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;
@@ -86,7 +102,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 +113,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 +162,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 +173,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;

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
@@ -169,13 +183,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;
@@ -401,23 +415,37 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       emit("selection", [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 +459,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;
@@ -647,6 +675,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) {

package/dist/components/tables/index.css

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

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

@@ -11,7 +11,6 @@ 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"];
@@ -20,7 +19,7 @@ function setProps(obj, props) {
       if (obj[key] !== "") {
         robj[key] = obj[key];
         if (key == "sortable") {
-          if (issort && obj[key]) {
+          if (obj[key]) {
             robj[key] = "custom";
           }
         }

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

@@ -9,7 +9,6 @@ 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"];
@@ -18,7 +17,7 @@ function setProps(obj, props) {
       if (obj[key] !== "") {
         robj[key] = obj[key];
         if (key == "sortable") {
-          if (issort && obj[key]) {
+          if (obj[key]) {
             robj[key] = "custom";
           }
         }

package/dist/components/tables/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 表格

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

@@ -49,11 +49,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     }
     let isSort = false;
+    const orderMap = {
+      asc: "ascending",
+      ascending: "ascending",
+      desc: "descending",
+      descending: "descending"
+    };
     const tableDefaultSort = vue.computed(() => {
       var _a, _b;
       return {
         prop: (_a = props.defaultSort) == null ? void 0 : _a.prop,
-        order: (_b = props.defaultSort) == null ? void 0 : _b.order
+        order: orderMap[(_b = props.defaultSort) == null ? void 0 : _b.order]
       };
     });
     const rowStyle = vue.computed(() => {
@@ -106,6 +112,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       rowObj.value = row;
       emit("row-click", row, column, ...arr);
     }
+    function clearSort() {
+      var _a;
+      (_a = tableRef.value) == null ? void 0 : _a.clearSort();
+    }
     function toggleRowSelection(...arr) {
       tableRef.value.toggleRowSelection(...arr);
     }
@@ -126,6 +136,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     __expose({
       ...data.dataExpose,
       clearSelection,
+      clearSort,
       getSelections,
       toggleRowSelection
     });

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

@@ -47,11 +47,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     let isSort = false;
+    const orderMap = {
+      asc: "ascending",
+      ascending: "ascending",
+      desc: "descending",
+      descending: "descending"
+    };
     const tableDefaultSort = computed(() => {
       var _a, _b;
       return {
         prop: (_a = props.defaultSort) == null ? void 0 : _a.prop,
-        order: (_b = props.defaultSort) == null ? void 0 : _b.order
+        order: orderMap[(_b = props.defaultSort) == null ? void 0 : _b.order]
       };
     });
     const rowStyle = computed(() => {
@@ -104,6 +110,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       rowObj.value = row;
       emit("row-click", row, column, ...arr);
     }
+    function clearSort() {
+      var _a;
+      (_a = tableRef.value) == null ? void 0 : _a.clearSort();
+    }
     function toggleRowSelection(...arr) {
       tableRef.value.toggleRowSelection(...arr);
     }
@@ -124,6 +134,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     __expose({
       ...dataExpose,
       clearSelection,
+      clearSort,
       getSelections,
       toggleRowSelection
     });

package/dist/components/tablesp/index.css

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

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

@@ -52,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       empty
     });
     return (_ctx, _cache) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       return vue.openBlock(), vue.createElementBlock("div", {
         class: vue.normalizeClass(vue.unref(cs).z()),
         style: vue.normalizeStyle({
@@ -72,8 +72,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           value: vue.unref(data$1).list,
           list: vue.unref(tableList),
           size: (_b = vue.unref(tableConfig).config) == null ? void 0 : _b.size,
+          defaultSort: ((_c = vue.unref(tableConfig).sort) == null ? void 0 : _c.is) ? {
+            order: vue.unref(paginat).order,
+            prop: vue.unref(paginat).prop
+          } : void 0,
           paginat: vue.unref(paginat),
-          loading: ((_c = vue.unref(tableConfig).config) == null ? void 0 : _c.noloading) || vue.unref(paginat).scroll && vue.unref(paginat).current > 1 ? false : vue.unref(loading),
+          loading: ((_d = vue.unref(tableConfig).config) == null ? void 0 : _d.noloading) || vue.unref(paginat).scroll && vue.unref(paginat).current > 1 ? false : vue.unref(loading),
           options: vue.unref(props).options,
           compons: vue.unref(props).compons,
           onSortChange: vue.unref(onSortChange),
@@ -86,14 +90,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             return {
               name: k,
               fn: vue.withCtx((scope) => [
-                vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.guardReactiveProps(scope)))
+                vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.guardReactiveProps(scope || {})))
               ])
             };
           })
-        ]), 1040, ["height", "class", "scroll-selector", "value", "list", "size", "paginat", "loading", "options", "compons", "onSortChange", "onListEvents", "onSelect", "onRowClick", "onSelectionChange"])), [
+        ]), 1040, ["height", "class", "scroll-selector", "value", "list", "size", "defaultSort", "paginat", "loading", "options", "compons", "onSortChange", "onListEvents", "onSelect", "onRowClick", "onSelectionChange"])), [
           [vue.unref(index$4.default), vue.unref(scroll)]
         ]),
-        ((_d = vue.unref(paginat)) == null ? void 0 : _d.is) && !vue.unref(paginat).scroll ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.Paging), vue.mergeProps({ key: 0 }, vue.unref(pagconfig), {
+        ((_e = vue.unref(paginat)) == null ? void 0 : _e.is) && !vue.unref(paginat).scroll ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.Paging), vue.mergeProps({ key: 0 }, vue.unref(pagconfig), {
           class: vue.unref(cs).z("paginat"),
           paginat: vue.unref(paginat),
           total: vue.unref(data$1).total,