@fangzhongya/fang-ui 0.1.33 → 0.1.34

package/dist/components/common/urls.cjs

@@ -98,7 +98,7 @@ function comHandle(props2, obj) {
     } else {
       let list = props2.value;
       if (props2.onRequestAfter) {
-        list = props2.onRequestAfter(list, obj, true) || {};
+        list = props2.onRequestAfter(list, obj, true);
       }
       resolve(list);
     }

package/dist/components/common/urls.js

@@ -96,7 +96,7 @@ function comHandle(props2, obj) {
     } else {
       let list = props2.value;
       if (props2.onRequestAfter) {
-        list = props2.onRequestAfter(list, obj, true) || {};
+        list = props2.onRequestAfter(list, obj, true);
       }
       resolve(list);
     }

package/dist/components/index.scss

@@ -119,6 +119,6 @@
 @use './tables/index.scss' as *;
 @use './tablesp/index.scss' as *;
 @use './tablespd/index.scss' as *;
+@use './tabless/index.scss' as *;
 @use './tablesv/index.scss' as *;
-@use './tablesvp/index.scss' as *;
-@use './tablesvpd/index.scss' as *;
+@use './tablesvp/index.scss' as *;

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

@@ -44,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       onCurrentChange,
       paginat,
       data: data$1
-    } = pagin.useInit(props, emit, refTable, getLocale, true);
+    } = pagin.useInit(props, emit, refTable, getLocale, { type: 2 });
     __expose({
       getSelection,
       getRef,

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

@@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       onCurrentChange,
       paginat,
       data
-    } = useInit(props, emit, refTable, getLocale, true);
+    } = useInit(props, emit, refTable, getLocale, { type: 2 });
     __expose({
       getSelection,
       getRef,

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

@@ -47,7 +47,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       onCurrentChange,
       paginat,
       data: data$2
-    } = pagin.useInit(props, emit, refTable, getLocale, true);
+    } = pagin.useInit(props, emit, refTable, getLocale, {
+      type: 2,
+      config: {
+        isdrag: true
+      }
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -45,7 +45,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       onCurrentChange,
       paginat,
       data
-    } = useInit(props, emit, refTable, getLocale, true);
+    } = useInit(props, emit, refTable, getLocale, {
+      type: 2,
+      config: {
+        isdrag: true
+      }
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -57,59 +57,49 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return arr.length > 0;
       });
       const setEmptyFun = () => {
-        if (isOptionsEmpty.value) {
-          setValue = (item) => {
-            const v = use.useVueValue(item, props.prop);
-            if (v === "") {
-              return emptyValue;
-            }
-            return v;
-          };
-          value = vue.computed({
-            set(v) {
-              if (multiple.value) {
-                listFuObj.value.value = (v ?? []).map((o) => {
-                  if (o === emptyValue) {
-                    return "";
-                  }
-                  return o;
-                });
-              } else {
-                if (v === emptyValue) {
-                  listFuObj.value.value = "";
-                } else {
-                  listFuObj.value.value = v;
+        setValue = (item) => {
+          const v = use.useVueValue(item, props.prop);
+          if (v === "") {
+            return emptyValue;
+          }
+          return v;
+        };
+        value = vue.computed({
+          set(v) {
+            if (multiple.value) {
+              listFuObj.value.value = (v ?? []).map((o) => {
+                if (o === emptyValue) {
+                  return "";
                 }
-              }
-            },
-            get() {
-              const v = listFuObj.value.value;
-              if (multiple.value) {
-                return (v ?? []).map((o) => {
-                  if (o === "") {
-                    return emptyValue;
-                  }
-                  return o;
-                });
+                return o;
+              });
+            } else {
+              if (v === emptyValue) {
+                listFuObj.value.value = "";
               } else {
-                if (v === "") {
+                listFuObj.value.value = v;
+              }
+            }
+          },
+          get() {
+            const v = listFuObj.value.value;
+            if (multiple.value) {
+              return (v ?? []).map((o) => {
+                if (o === "") {
                   return emptyValue;
                 }
-                return v;
+                return o;
+              });
+            } else {
+              if (isOptionsEmpty.value && v === "") {
+                return emptyValue;
               }
+              return v;
             }
-          });
-        }
+          }
+        });
       };
-      vue.watch(
-        () => isOptionsEmpty.value,
-        () => {
-          setEmptyFun();
-        },
-        {
-          immediate: true
-        }
-      );
+      setEmptyFun();
     }
     const onChange = (v) => {
       if (multiple.value) {

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, useAttrs, computed, watch, createElementBlock, openBlock, mergeProps, unref, createVNode, isRef, withCtx, Fragment, renderList, createBlock } from "vue";
+import { defineComponent, ref, useAttrs, computed, createElementBlock, openBlock, mergeProps, unref, createVNode, isRef, withCtx, Fragment, renderList, createBlock } from "vue";
 import { Select } from "../../select/index.js";
 import { Option } from "../../option/index.js";
 import { compareArray } from "@fangzhongya/utils/basic/array/compareArray";
@@ -55,59 +55,49 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return arr.length > 0;
       });
       const setEmptyFun = () => {
-        if (isOptionsEmpty.value) {
-          setValue = (item) => {
-            const v = useVueValue(item, props.prop);
-            if (v === "") {
-              return emptyValue;
-            }
-            return v;
-          };
-          value = computed({
-            set(v) {
-              if (multiple.value) {
-                listFuObj.value.value = (v ?? []).map((o) => {
-                  if (o === emptyValue) {
-                    return "";
-                  }
-                  return o;
-                });
-              } else {
-                if (v === emptyValue) {
-                  listFuObj.value.value = "";
-                } else {
-                  listFuObj.value.value = v;
+        setValue = (item) => {
+          const v = useVueValue(item, props.prop);
+          if (v === "") {
+            return emptyValue;
+          }
+          return v;
+        };
+        value = computed({
+          set(v) {
+            if (multiple.value) {
+              listFuObj.value.value = (v ?? []).map((o) => {
+                if (o === emptyValue) {
+                  return "";
                 }
-              }
-            },
-            get() {
-              const v = listFuObj.value.value;
-              if (multiple.value) {
-                return (v ?? []).map((o) => {
-                  if (o === "") {
-                    return emptyValue;
-                  }
-                  return o;
-                });
+                return o;
+              });
+            } else {
+              if (v === emptyValue) {
+                listFuObj.value.value = "";
               } else {
-                if (v === "") {
+                listFuObj.value.value = v;
+              }
+            }
+          },
+          get() {
+            const v = listFuObj.value.value;
+            if (multiple.value) {
+              return (v ?? []).map((o) => {
+                if (o === "") {
                   return emptyValue;
                 }
-                return v;
+                return o;
+              });
+            } else {
+              if (isOptionsEmpty.value && v === "") {
+                return emptyValue;
               }
+              return v;
             }
-          });
-        }
+          }
+        });
       };
-      watch(
-        () => isOptionsEmpty.value,
-        () => {
-          setEmptyFun();
-        },
-        {
-          immediate: true
-        }
-      );
+      setEmptyFun();
     }
     const onChange = (v) => {
       if (multiple.value) {

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
+const unmergeObject = require("@fangzhongya/utils/basic/object/unmergeObject");
 require("../../../utils/index.cjs");
 const urls = require("../../common/urls.cjs");
 const firstLower = require("@fangzhongya/utils/basic/string/firstLower");
@@ -73,7 +74,7 @@ const dataProps = {
   }
 };
 const dataEmit = ["list-events", "selection", "drag", "update:value"];
-const useInit = (props2, emit, refTable, getLocale, isEl) => {
+const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
   var _a, _b;
   const loading = vue.ref(false);
   const mpagconfig = {
@@ -207,7 +208,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     paginat.cross = pagin.cross || false;
     paginat.pageSize = pagin.size || mpagconfig.pageSize;
     pagconfig.value = Object.assign({}, mpagconfig, pagin.config || {});
-    tableConfig.value = config;
+    tableConfig.value = unmergeObject.unmergeObject(defaultConfig, config, 2);
   };
   vue.watch(
     [() => props2.configs, () => props2.config, () => props2.list],
@@ -232,13 +233,6 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     });
     return obj;
   });
-  const istype = vue.computed(() => {
-    if (isEl) {
-      return true;
-    } else {
-      return tableConfig.value.type == 1;
-    }
-  });
   function setCrossPage() {
     const v = data.current;
     console.log("v", v);
@@ -428,7 +422,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
   }
   function empty() {
     var _a2, _b2, _c, _d;
-    if (istype.value && ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio)) {
+    if (tableConfig.value.type == 1 && ((_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();

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

@@ -93,7 +93,7 @@ export declare const dataProps: {
     };
 };
 export declare const dataEmit: string[];
-export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit: Function, refTable: Ref, getLocale: Translator, isEl?: boolean) => {
+export declare const useInit: (props: ExtractPropTypes<typeof dataProps>, emit: Function, refTable: Ref, getLocale: Translator, defaultConfig?: TableConfig) => {
     height: ComputedRef<any>;
     tableConfig: Ref<{
         [x: string]: any;

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

@@ -1,4 +1,5 @@
 import { ref, reactive, watch, computed, nextTick } from "vue";
+import { unmergeObject } from "@fangzhongya/utils/basic/object/unmergeObject";
 import "../../../utils/index.js";
 import { props, comHandle } from "../../common/urls.js";
 import { firstLower } from "@fangzhongya/utils/basic/string/firstLower";
@@ -71,7 +72,7 @@ const dataProps = {
   }
 };
 const dataEmit = ["list-events", "selection", "drag", "update:value"];
-const useInit = (props2, emit, refTable, getLocale, isEl) => {
+const useInit = (props2, emit, refTable, getLocale, defaultConfig = {}) => {
   var _a, _b;
   const loading = ref(false);
   const mpagconfig = {
@@ -205,7 +206,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     paginat.cross = pagin.cross || false;
     paginat.pageSize = pagin.size || mpagconfig.pageSize;
     pagconfig.value = Object.assign({}, mpagconfig, pagin.config || {});
-    tableConfig.value = config;
+    tableConfig.value = unmergeObject(defaultConfig, config, 2);
   };
   watch(
     [() => props2.configs, () => props2.config, () => props2.list],
@@ -230,13 +231,6 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
     });
     return obj;
   });
-  const istype = computed(() => {
-    if (isEl) {
-      return true;
-    } else {
-      return tableConfig.value.type == 1;
-    }
-  });
   function setCrossPage() {
     const v = data.current;
     console.log("v", v);
@@ -426,7 +420,7 @@ const useInit = (props2, emit, refTable, getLocale, isEl) => {
   }
   function empty() {
     var _a2, _b2, _c, _d;
-    if (istype.value && ((_a2 = tableConfig.value.config) == null ? void 0 : _a2.isradio)) {
+    if (tableConfig.value.type == 1 && ((_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();

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

@@ -44,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       onCurrentChange,
       paginat,
       data: data$1
-    } = pagin.useInit(props, emit, refTable, getLocale, true);
+    } = pagin.useInit(props, emit, refTable, getLocale);
     __expose({
       getRef,
       getSelection,

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

@@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       onCurrentChange,
       paginat,
       data
-    } = useInit(props, emit, refTable, getLocale, true);
+    } = useInit(props, emit, refTable, getLocale);
     __expose({
       getRef,
       getSelection,

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

@@ -46,7 +46,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       onCurrentChange,
       paginat,
       data: data$1
-    } = pagin.useInit(props, emit, refTable, getLocale, true);
+    } = pagin.useInit(props, emit, refTable, getLocale, {
+      config: {
+        isdrag: true
+      }
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -44,7 +44,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       onCurrentChange,
       paginat,
       data
-    } = useInit(props, emit, refTable, getLocale, true);
+    } = useInit(props, emit, refTable, getLocale, {
+      config: {
+        isdrag: true
+      }
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -44,7 +44,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       paginat,
       scroll,
       data: data$1
-    } = pagin.useInit(props, emit, refTable, getLocale);
+    } = pagin.useInit(props, emit, refTable, getLocale, {
+      type: 1
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -42,7 +42,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       paginat,
       scroll,
       data
-    } = useInit(props, emit, refTable, getLocale);
+    } = useInit(props, emit, refTable, getLocale, {
+      type: 1
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -46,7 +46,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       scroll,
       sortable,
       data: data$1
-    } = pagin.useInit(props, emit, refTable, getLocale);
+    } = pagin.useInit(props, emit, refTable, getLocale, {
+      type: 1,
+      config: {
+        isdrag: true
+      }
+    });
     __expose({
       getSelection,
       getRef,

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

@@ -44,7 +44,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       scroll,
       sortable,
       data
-    } = useInit(props, emit, refTable, getLocale);
+    } = useInit(props, emit, refTable, getLocale, {
+      type: 1,
+      config: {
+        isdrag: true
+      }
+    });
     __expose({
       getSelection,
       getRef,

package/dist/css/index.css

@@ -1751,6 +1751,28 @@
   justify-content: flex-end;
 }
 
+.tabless {
+  width: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.tabless-main {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  width: 100%;
+}
+.tabless-main.is-radio .el-table__header .el-table-column--selection .el-checkbox {
+  display: none;
+}
+.tabless-paginat {
+  overflow: hidden;
+}
+.tabless-paginat .el-pagination {
+  justify-content: flex-end;
+}
+
 .tablesv {
   width: 100%;
   min-height: 100px;
@@ -1860,32 +1882,4 @@
 }
 .tablesvp-paginat .el-pagination {
   justify-content: flex-end;
-}
-
-.tablesvpd {
-  width: 100%;
-  height: var(--tablesvpd-height);
-  display: flex;
-  flex-direction: column;
-}
-.tablesvpd-main {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  width: 100%;
-}
-.tablesvpd-main.is-radio .el-table__header .el-table-column--selection .el-checkbox {
-  display: none;
-}
-.tablesvpd-main.is-scroll .v-scroll-add {
-  text-align: center;
-  padding: 10px;
-  color: #999;
-  background-color: #eee;
-}
-.tablesvpd-paginat {
-  overflow: hidden;
-}
-.tablesvpd-paginat .el-pagination {
-  justify-content: flex-end;
 }

package/dist/icons/index.json

@@ -1,7 +1,7 @@
 {
     "prefix": "fang-ui",
     "info": {},
-    "lastModified": 1763557620058,
+    "lastModified": 1763605251473,
     "icons": {
         "bar": {
             "body": " <path fill=\"currentColor\" d=\"M128 544h768a32 32 0 1 0 0-64H128a32 32 0 0 0 0 64z\" ></path> "

package/dist/index.css

@@ -1751,6 +1751,28 @@
   justify-content: flex-end;
 }
 
+.tabless {
+  width: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.tabless-main {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  width: 100%;
+}
+.tabless-main.is-radio .el-table__header .el-table-column--selection .el-checkbox {
+  display: none;
+}
+.tabless-paginat {
+  overflow: hidden;
+}
+.tabless-paginat .el-pagination {
+  justify-content: flex-end;
+}
+
 .tablesv {
   width: 100%;
   min-height: 100px;
@@ -1860,32 +1882,4 @@
 }
 .tablesvp-paginat .el-pagination {
   justify-content: flex-end;
-}
-
-.tablesvpd {
-  width: 100%;
-  height: var(--tablesvpd-height);
-  display: flex;
-  flex-direction: column;
-}
-.tablesvpd-main {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  width: 100%;
-}
-.tablesvpd-main.is-radio .el-table__header .el-table-column--selection .el-checkbox {
-  display: none;
-}
-.tablesvpd-main.is-scroll .v-scroll-add {
-  text-align: center;
-  padding: 10px;
-  color: #999;
-  background-color: #eee;
-}
-.tablesvpd-paginat {
-  overflow: hidden;
-}
-.tablesvpd-paginat .el-pagination {
-  justify-content: flex-end;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.33",
+  "version": "0.1.34",
   "type": "module",
   "description ": "fang-ui",
   "keywords": [
@@ -51,9 +51,9 @@
     "vue-tsc": "^3.1.4",
     "vxe-table": "4.6.20",
     "@fang-ui/components": "0.0.1-0",
+    "@fang-ui/icons": "0.0.1-0",
     "@fang-ui/directives": "0.0.1-0",
     "@fang-ui/hooks": "0.0.1-0",
-    "@fang-ui/icons": "0.0.1-0",
     "@fang-ui/locale": "0.0.1-0",
     "@fang-ui/theme": "0.0.1-0",
     "@fang-ui/types": "0.0.1-0",