@fangzhongya/fang-ui 0.1.27 → 0.1.29

package/dist/components/paging/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .paging {
   width: 100%;
   padding: 10px;

package/dist/components/popup/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .box-mask {
   display: block;
   opacity: 0.5;

package/dist/components/retract/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .retract {
   position: relative;
 }

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

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .right-key-box {
   width: 140px;
   position: absolute;

package/dist/components/scss/common.scss

@@ -22,3 +22,7 @@
 	border-top: 1px solid var(--#{$cssname}border);
 	padding: 20px 20px;
 }
+
+.com-lable-array {
+	line-height: 18px;
+}

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

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .seamless-scroll {
   position: relative;
   overflow: hidden;

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

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .select-scroll {
   flex: 1;
   float: left;

package/dist/components/selector/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .select-scroll {
   flex: 1;
   float: left;

package/dist/components/selects/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .selects-select {
   height: 100%;
   min-width: 60px;

package/dist/components/sliders/index.css

@@ -17,6 +17,10 @@
   padding: 20px 20px;
 }
 
+.com-lable-array {
+  line-height: 18px;
+}
+
 .sliders {
   width: 100%;
   position: relative;

package/dist/components/switchs/index.css

@@ -17,6 +17,10 @@
   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

@@ -56,6 +56,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */
@@ -352,69 +358,104 @@ 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) {
@@ -498,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;
@@ -726,6 +767,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     onListEvents,
     onSelect,
     onRowClick,
+    onCellClick,
     onChange,
     pagconfig,
     formEvent,

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

@@ -57,6 +57,12 @@ export declare const dataProps: {
         type: ObjectConstructor;
         default(): {};
     };
+    /**
+     * @props { Boolean } isCompons 是否使用默认的配置
+     */
+    isCompons: {
+        type: BooleanConstructor;
+    };
     /**
      * @props { Object } compons 外部组件集合
      */
@@ -218,6 +224,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         default?: any;
         value?: any;
         label?: string | /*elided*/ any | undefined;
+        labelText?: string | undefined;
         hideLabel?: boolean | undefined;
         prop?: string | undefined;
         slot?: string | undefined;
@@ -250,6 +257,7 @@ export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit:
         default?: any;
         value?: any;
         label?: string | /*elided*/ any | undefined;
+        labelText?: string | undefined;
         hideLabel?: boolean | undefined;
         prop?: string | undefined;
         slot?: string | undefined;
@@ -276,7 +284,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;
@@ -301,6 +309,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

@@ -54,6 +54,12 @@ const dataProps = {
       return {};
     }
   },
+  /**
+   * @props { Boolean } isCompons 是否使用默认的配置
+   */
+  isCompons: {
+    type: Boolean
+  },
   /**
    * @props { Object } compons 外部组件集合
    */
@@ -350,69 +356,104 @@ 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) {
@@ -496,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;
@@ -724,6 +765,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     onListEvents,
     onSelect,
     onRowClick,
+    onCellClick,
     onChange,
     pagconfig,
     formEvent,

package/dist/components/tables/index.css

@@ -17,6 +17,10 @@
   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,12 +1,12 @@
 "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;
@@ -17,19 +17,20 @@ function setProps(obj, props) {
   Object.keys(obj).forEach((key) => {
     if (!noProps.includes(key)) {
       if (obj[key] !== "") {
-        robj[key] = obj[key];
         if (key == "sortable") {
           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;
   }
@@ -41,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) {
@@ -51,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;
@@ -85,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,
@@ -93,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,
@@ -112,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,5 @@
 import { VNode, RendererNode, RendererElement } from 'vue';
+export declare function setHeader(obj: ListObj, scope: ObjAny, slots: ObjAny, emit: Function, props: ObjAny, index: number): any;
 export declare function getTableColumn(obj: ListObj, emit: Function, props: ObjAny, slots: ObjAny, index: number, def?: Function): VNode<RendererNode, RendererElement, {
     [key: string]: any;
 }>;