@fangzhongya/fang-ui 0.1.26 → 0.1.28

package/dist/components/message/src/index.js

@@ -1,3 +1,4 @@
+import "./data.js";
 const SrcVue = {};
 export {
   SrcVue as default

package/dist/components/message-box/src/data.cjs

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const buildProps = require("../../../utils/vues/buildProps.cjs");
+const name = "message-box";
+const dataProps = buildProps.buildProps({});
+const dataEmits = [];
+const dataSlot = {};
+const dataExpose = { name };
+exports.dataEmits = dataEmits;
+exports.dataExpose = dataExpose;
+exports.dataProps = dataProps;
+exports.dataSlot = dataSlot;
+exports.name = name;

package/dist/components/message-box/src/data.d.ts

@@ -0,0 +1,17 @@
+import { ExtractPublicPropTypes } from 'vue';
+/**
+ * @title {h3} MessageBox 消息弹框
+ * @text 目前完全继承 element-plus 中 el-message-box
+ */
+export declare const name = "message-box";
+export declare const dataProps: {};
+export type DataProps = ExtractPublicPropTypes<typeof dataProps>;
+export declare const dataEmits: never[];
+export type DataEmits = typeof dataEmits;
+export declare const dataSlot: {};
+/**
+ * @expose { Element } refEl 获取当前组件在element-plus中暴露的方法
+ */
+export declare const dataExpose: {
+    name: string;
+};

package/dist/components/message-box/src/data.js

@@ -0,0 +1,13 @@
+import { buildProps } from "../../../utils/vues/buildProps.js";
+const name = "message-box";
+const dataProps = buildProps({});
+const dataEmits = [];
+const dataSlot = {};
+const dataExpose = { name };
+export {
+  dataEmits,
+  dataExpose,
+  dataProps,
+  dataSlot,
+  name
+};

package/dist/components/message-box/src/index.cjs

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+require("./data.cjs");
 const SrcVue = {};
 exports.default = SrcVue;

package/dist/components/message-box/src/index.d.ts

@@ -1,6 +1,2 @@
-/**
- * @title {h2} ElMessageBox 消息弹框
- * @text 目前完全继承 element-plus 中 ElMessageBox
- */
 declare const _default: {};
 export default _default;

package/dist/components/message-box/src/index.js

@@ -1,3 +1,4 @@
+import "./data.js";
 const SrcVue = {};
 export {
   SrcVue as default

package/dist/components/no-data/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;
+}
+
 .no-data {
   text-align: center;
   display: flex;

package/dist/components/page/index.css

@@ -13,6 +13,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;
+}
+
 .forms-div {
   width: 100%;
   height: 100%;
@@ -101,12 +110,6 @@
   font-size: 0;
 }
 
-.dates .dates-date {
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box;
-}
-
 .selects-select {
   height: 100%;
   min-width: 60px;
@@ -116,6 +119,12 @@
   height: 100%;
 }
 
+.dates .dates-date {
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+}
+
 .inputs-input {
   height: 100%;
 }

package/dist/components/page/src/set-column2.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Draggable = require("vuedraggable");
+const index$6 = require("../../draggable/index.cjs");
 const index$3 = require("../../dialogs/index.cjs");
 const index$5 = require("../../no-data/index.cjs");
 const index$4 = require("../../checkbox/index.cjs");
@@ -154,7 +154,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 vue.createElementVNode("div", {
                   class: vue.normalizeClass(vue.unref(cs).z("already-list"))
                 }, [
-                  value.value && value.value.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(Draggable), vue.mergeProps({ key: 0 }, dragOptions, {
+                  value.value && value.value.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.Draggable), vue.mergeProps({ key: 0 }, dragOptions, {
                     onStart: _cache[1] || (_cache[1] = ($event) => drag.value = true),
                     onEnd: _cache[2] || (_cache[2] = ($event) => drag.value = false),
                     modelValue: value.value,

package/dist/components/page/src/set-column2.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, watch, createElementBlock, openBlock, normalizeClass, unref, createVNode, withCtx, createTextVNode, toDisplayString, createElementVNode, createBlock, Fragment, renderList, mergeProps, withModifiers } from "vue";
-import Draggable from "vuedraggable";
+import { Draggable } from "../../draggable/index.js";
 import { Dialogs } from "../../dialogs/index.js";
 import { NoData } from "../../no-data/index.js";
 import { Checkbox } from "../../checkbox/index.js";

package/dist/components/paging/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;
+}
+
 .paging {
   width: 100%;
   padding: 10px;

package/dist/components/popup/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;
+}
+
 .box-mask {
   display: block;
   opacity: 0.5;

package/dist/components/retract/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;
+}
+
 .retract {
   position: relative;
 }

package/dist/components/right-key/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;
+}
+
 .right-key-box {
   width: 140px;
   position: absolute;

package/dist/components/scss/common.scss

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

package/dist/components/seamless-scroll/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;
+}
+
 .seamless-scroll {
   position: relative;
   overflow: hidden;

package/dist/components/select-scroll/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;
+}
+
 .select-scroll {
   flex: 1;
   float: left;

package/dist/components/selector/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;
+}
+
 .select-scroll {
   flex: 1;
   float: left;

package/dist/components/selects/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;
+}
+
 .selects-select {
   height: 100%;
   min-width: 60px;

package/dist/components/sliders/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;
+}
+
 .sliders {
   width: 100%;
   position: relative;

package/dist/components/switchs/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;
+}
+
 .switchs-switch {
   height: 100%;
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const provides = {
-  compons: "table-compons"
+  compons: "table"
 };
 exports.provides = provides;

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

@@ -1,5 +1,5 @@
 const provides = {
-  compons: "table-compons"
+  compons: "table"
 };
 export {
   provides

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
@@ -42,6 +56,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */
@@ -171,13 +191,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;
@@ -338,88 +358,137 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
       return arr;
     }
   }
+  const selections = vue.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 = vue.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]);
+      vue.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;
@@ -433,7 +502,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;
@@ -470,7 +539,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;
@@ -649,6 +718,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) {
@@ -697,6 +767,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     onListEvents,
     onSelect,
     onRowClick,
+    onCellClick,
     onChange,
     pagconfig,
     formEvent,