@fangzhongya/fang-ui 0.1.33 → 0.1.35

package/dist/components/input-history/style/index2.scss

@@ -1 +1,4 @@
+@use '../../popover/style/index2.scss' as *;
+@use '../../button/style/index2.scss' as *;
+@use '../../inputs/style/index2.scss' as *;
 @use '../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,
@@ -74,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           paginat: vue.unref(paginat),
           value: vue.unref(data$1).list,
           list: vue.unref(tableList),
-          loading: ((_b = vue.unref(tableConfig).config) == null ? void 0 : _b.noloading) || vue.unref(paginat).scroll && vue.unref(paginat).current > 1 ? false : vue.unref(loading),
+          loading: ((_b = vue.unref(tableConfig).config) == null ? void 0 : _b.isloading) === false || 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),
@@ -87,7 +87,7 @@ 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 || {})))
               ])
             };
           })

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,
@@ -72,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           paginat: unref(paginat),
           value: unref(data).list,
           list: unref(tableList),
-          loading: ((_b = unref(tableConfig).config) == null ? void 0 : _b.noloading) || unref(paginat).scroll && unref(paginat).current > 1 ? false : unref(loading),
+          loading: ((_b = unref(tableConfig).config) == null ? void 0 : _b.isloading) === false || unref(paginat).scroll && unref(paginat).current > 1 ? false : unref(loading),
           options: unref(props).options,
           compons: unref(props).compons,
           onSortChange: unref(onSortChange),
@@ -85,7 +85,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             return {
               name: k,
               fn: withCtx((scope) => [
-                renderSlot(_ctx.$slots, k, normalizeProps(guardReactiveProps(scope)))
+                renderSlot(_ctx.$slots, k, normalizeProps(guardReactiveProps(scope || {})))
               ])
             };
           })

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,
@@ -78,7 +83,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           paginat: vue.unref(paginat),
           value: vue.unref(data$2).list,
           list: vue.unref(tableList),
-          loading: ((_b = vue.unref(tableConfig).config) == null ? void 0 : _b.noloading) || vue.unref(paginat).scroll && vue.unref(paginat).current > 1 ? false : vue.unref(loading),
+          loading: ((_b = vue.unref(tableConfig).config) == null ? void 0 : _b.isloading) === false || 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),
@@ -91,7 +96,7 @@ 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 || {})))
               ])
             };
           })

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,
@@ -76,7 +81,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           paginat: unref(paginat),
           value: unref(data).list,
           list: unref(tableList),
-          loading: ((_b = unref(tableConfig).config) == null ? void 0 : _b.noloading) || unref(paginat).scroll && unref(paginat).current > 1 ? false : unref(loading),
+          loading: ((_b = unref(tableConfig).config) == null ? void 0 : _b.isloading) === false || unref(paginat).scroll && unref(paginat).current > 1 ? false : unref(loading),
           options: unref(props).options,
           compons: unref(props).compons,
           onSortChange: unref(onSortChange),
@@ -89,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             return {
               name: k,
               fn: withCtx((scope) => [
-                renderSlot(_ctx.$slots, k, normalizeProps(guardReactiveProps(scope)))
+                renderSlot(_ctx.$slots, k, normalizeProps(guardReactiveProps(scope || {})))
               ])
             };
           })

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

@@ -81,7 +81,7 @@ 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 || {})))
                   ])
                 };
               })

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

@@ -79,7 +79,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 return {
                   name: k,
                   fn: withCtx((scope) => [
-                    renderSlot(_ctx.$slots, k, normalizeProps(guardReactiveProps(scope)))
+                    renderSlot(_ctx.$slots, k, normalizeProps(guardReactiveProps(scope || {})))
                   ])
                 };
               })

package/dist/components/page/index.css

@@ -620,6 +620,9 @@
   margin-bottom: 0;
   flex: 1;
 }
+.forms-div--query .forms-li .el-form-item .selects-select {
+  min-width: 120px;
+}
 .forms-li .el-form-item {
   margin-bottom: var(--forms-item-bottom);
   flex: 1;

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

@@ -488,7 +488,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           return getColumnList(v);
         } else {
           return getColumnList(props.list, (obj) => {
-            return obj.form && obj.noedit !== false;
+            return obj.form && obj.isedit === false;
           });
         }
       } else {
@@ -597,7 +597,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 return {
                   name: k,
                   fn: vue.withCtx((scope) => [
-                    vue.unref(slots)["form-" + k] ? vue.renderSlot(_ctx.$slots, "form-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope)))
+                    vue.unref(slots)["form-" + k] ? vue.renderSlot(_ctx.$slots, "form-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope || {}))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope || {})))
                   ])
                 };
               })
@@ -609,7 +609,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           title: vue.unref(props).config.name + vue.unref(getLocale)("page.details"),
           modelValue: details.visible,
           "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => details.visible = $event),
-          "no-footer": ""
+          isFooter: false
         }, {
           default: vue.withCtx(() => {
             var _a2;
@@ -624,7 +624,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   return {
                     name: k,
                     fn: vue.withCtx((scope) => [
-                      vue.unref(slots)["list-" + k] ? vue.renderSlot(_ctx.$slots, "list-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope)))
+                      vue.unref(slots)["list-" + k] ? vue.renderSlot(_ctx.$slots, "list-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope || {}))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope || {})))
                     ])
                   };
                 })
@@ -656,7 +656,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 return {
                   name: k,
                   fn: vue.withCtx((scope) => [
-                    vue.unref(slots)["query-" + k] ? vue.renderSlot(_ctx.$slots, "query-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope)))
+                    vue.unref(slots)["query-" + k] ? vue.renderSlot(_ctx.$slots, "query-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope || {}))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope || {})))
                   ])
                 };
               })
@@ -719,7 +719,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 return {
                   name: k,
                   fn: vue.withCtx((scope) => [
-                    vue.unref(slots)["table-" + k] ? vue.renderSlot(_ctx.$slots, "table-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope)))
+                    vue.unref(slots)["table-" + k] ? vue.renderSlot(_ctx.$slots, "table-" + k, vue.normalizeProps(vue.mergeProps({ key: 0 }, scope || {}))) : vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.mergeProps({ key: 1 }, scope || {})))
                   ])
                 };
               })

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

@@ -486,7 +486,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return getColumnList(v);
         } else {
           return getColumnList(props.list, (obj) => {
-            return obj.form && obj.noedit !== false;
+            return obj.form && obj.isedit === false;
           });
         }
       } else {
@@ -595,7 +595,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 return {
                   name: k,
                   fn: withCtx((scope) => [
-                    unref(slots)["form-" + k] ? renderSlot(_ctx.$slots, "form-" + k, normalizeProps(mergeProps({ key: 0 }, scope))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope)))
+                    unref(slots)["form-" + k] ? renderSlot(_ctx.$slots, "form-" + k, normalizeProps(mergeProps({ key: 0 }, scope || {}))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope || {})))
                   ])
                 };
               })
@@ -607,7 +607,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           title: unref(props).config.name + unref(getLocale)("page.details"),
           modelValue: details.visible,
           "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => details.visible = $event),
-          "no-footer": ""
+          isFooter: false
         }, {
           default: withCtx(() => {
             var _a2;
@@ -622,7 +622,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   return {
                     name: k,
                     fn: withCtx((scope) => [
-                      unref(slots)["list-" + k] ? renderSlot(_ctx.$slots, "list-" + k, normalizeProps(mergeProps({ key: 0 }, scope))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope)))
+                      unref(slots)["list-" + k] ? renderSlot(_ctx.$slots, "list-" + k, normalizeProps(mergeProps({ key: 0 }, scope || {}))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope || {})))
                     ])
                   };
                 })
@@ -654,7 +654,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 return {
                   name: k,
                   fn: withCtx((scope) => [
-                    unref(slots)["query-" + k] ? renderSlot(_ctx.$slots, "query-" + k, normalizeProps(mergeProps({ key: 0 }, scope))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope)))
+                    unref(slots)["query-" + k] ? renderSlot(_ctx.$slots, "query-" + k, normalizeProps(mergeProps({ key: 0 }, scope || {}))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope || {})))
                   ])
                 };
               })
@@ -717,7 +717,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 return {
                   name: k,
                   fn: withCtx((scope) => [
-                    unref(slots)["table-" + k] ? renderSlot(_ctx.$slots, "table-" + k, normalizeProps(mergeProps({ key: 0 }, scope))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope)))
+                    unref(slots)["table-" + k] ? renderSlot(_ctx.$slots, "table-" + k, normalizeProps(mergeProps({ key: 0 }, scope || {}))) : renderSlot(_ctx.$slots, k, normalizeProps(mergeProps({ key: 1 }, scope || {})))
                   ])
                 };
               })

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/switchs/src/data.cjs

@@ -3,7 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const list = require("../../common/list.cjs");
 const name = "switchs";
 const dataProps = {
-  ...list.props
+  ...list.props,
+  isEmpty: {
+    type: Boolean,
+    default: true
+  }
 };
 const dataEmits = [...list.emits];
 exports.dataEmits = dataEmits;

package/dist/components/switchs/src/data.d.ts

@@ -8,6 +8,10 @@ import { ExtractPropTypes } from 'vue';
  */
 export declare const name = "switchs";
 export declare const dataProps: {
+    isEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     options: {
         type: {
             (arrayLength: number): ObjAny[];

package/dist/components/switchs/src/data.js

@@ -1,7 +1,11 @@
 import { props, emits } from "../../common/list.js";
 const name = "switchs";
 const dataProps = {
-  ...props
+  ...props,
+  isEmpty: {
+    type: Boolean,
+    default: true
+  }
 };
 const dataEmits = [...emits];
 export {

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

@@ -31,18 +31,29 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const elRef = vue.ref();
     const active = vue.ref({});
     const inactive = vue.ref({});
+    const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
     vue.watch(
       () => props.options,
       () => {
         if (props.options && props.options.length > 1) {
           const i = props.options[0];
           inactive.value.text = use.useVueValue(i, props.label);
-          inactive.value.value = use.useVueValue(i, props.prop);
+          const v = use.useVueValue(i, props.prop);
+          if (props.isEmpty && v === "") {
+            inactive.value.value = emptyValue;
+          } else {
+            inactive.value.value = v;
+          }
           inactive.value.icon = i == null ? void 0 : i.icon;
           inactive.value.color = i == null ? void 0 : i.color;
           const a = props.options[1];
           active.value.text = use.useVueValue(a, props.label);
-          active.value.value = use.useVueValue(a, props.prop);
+          const va = use.useVueValue(a, props.prop);
+          if (props.isEmpty && va === "") {
+            active.value.value = emptyValue;
+          } else {
+            active.value.value = va;
+          }
           active.value.icon = a == null ? void 0 : a.icon;
           active.value.color = a == null ? void 0 : a.color;
         }
@@ -63,9 +74,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const value = vue.computed({
       get() {
         let v = props.modelValue;
+        if (props.isEmpty && v === "") {
+          return emptyValue;
+        }
         return v;
       },
       set(value2) {
+        if (props.isEmpty && value2 === emptyValue) {
+          value2 = "";
+        }
         emit("update:modelValue", value2);
         if (props.optobj) {
           const obj = props.options.filter((o) => {

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

@@ -29,18 +29,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const elRef = ref();
     const active = ref({});
     const inactive = ref({});
+    const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
     watch(
       () => props.options,
       () => {
         if (props.options && props.options.length > 1) {
           const i = props.options[0];
           inactive.value.text = useVueValue(i, props.label);
-          inactive.value.value = useVueValue(i, props.prop);
+          const v = useVueValue(i, props.prop);
+          if (props.isEmpty && v === "") {
+            inactive.value.value = emptyValue;
+          } else {
+            inactive.value.value = v;
+          }
           inactive.value.icon = i == null ? void 0 : i.icon;
           inactive.value.color = i == null ? void 0 : i.color;
           const a = props.options[1];
           active.value.text = useVueValue(a, props.label);
-          active.value.value = useVueValue(a, props.prop);
+          const va = useVueValue(a, props.prop);
+          if (props.isEmpty && va === "") {
+            active.value.value = emptyValue;
+          } else {
+            active.value.value = va;
+          }
           active.value.icon = a == null ? void 0 : a.icon;
           active.value.color = a == null ? void 0 : a.color;
         }
@@ -61,9 +72,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const value = computed({
       get() {
         let v = props.modelValue;
+        if (props.isEmpty && v === "") {
+          return emptyValue;
+        }
         return v;
       },
       set(value2) {
+        if (props.isEmpty && value2 === emptyValue) {
+          value2 = "";
+        }
         emit("update:modelValue", value2);
         if (props.optobj) {
           const obj = props.options.filter((o) => {

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;