@fangzhongya/fang-ui 0.1.31 → 0.1.33

package/dist/components/common/list.cjs

@@ -53,17 +53,6 @@ const props = {
   }
 };
 const emits = ["update:modelValue", "change", "load"];
-function isValue(v) {
-  if (v) {
-    return true;
-  } else {
-    const t = typeof v;
-    if (["boolean", "number"].includes(t)) {
-      return true;
-    }
-  }
-  return false;
-}
 function comHandle(props2, emit, config) {
   const selectMultiple = vue.ref(false);
   let getMultipleValue = (v) => {
@@ -92,7 +81,7 @@ function comHandle(props2, emit, config) {
   });
   function getValueObjs(v) {
     var _a, _b;
-    if (isValue(v)) {
+    if (v !== void 0 && v !== null) {
       if (selectMultiple.value && v instanceof Array) {
         return (_a = props2.options) == null ? void 0 : _a.filter((o) => {
           return v.includes(use.useVueValue(o, props2.prop));
@@ -102,15 +91,13 @@ function comHandle(props2, emit, config) {
           return use.useVueValue(o, props2.prop) === v;
         });
       }
-    } else {
-      return v;
     }
   }
   function setValue(type) {
     let v = props2.modelValue;
     if (type == 2) {
       if (!(v instanceof Array)) {
-        if (isValue(v)) {
+        if (v !== void 0 && v !== null && v !== "") {
           v = [v];
         }
       }

package/dist/components/common/list.js

@@ -51,17 +51,6 @@ const props = {
   }
 };
 const emits = ["update:modelValue", "change", "load"];
-function isValue(v) {
-  if (v) {
-    return true;
-  } else {
-    const t = typeof v;
-    if (["boolean", "number"].includes(t)) {
-      return true;
-    }
-  }
-  return false;
-}
 function comHandle(props2, emit, config) {
   const selectMultiple = ref(false);
   let getMultipleValue = (v) => {
@@ -90,7 +79,7 @@ function comHandle(props2, emit, config) {
   });
   function getValueObjs(v) {
     var _a, _b;
-    if (isValue(v)) {
+    if (v !== void 0 && v !== null) {
       if (selectMultiple.value && v instanceof Array) {
         return (_a = props2.options) == null ? void 0 : _a.filter((o) => {
           return v.includes(useVueValue(o, props2.prop));
@@ -100,15 +89,13 @@ function comHandle(props2, emit, config) {
           return useVueValue(o, props2.prop) === v;
         });
       }
-    } else {
-      return v;
     }
   }
   function setValue(type) {
     let v = props2.modelValue;
     if (type == 2) {
       if (!(v instanceof Array)) {
-        if (isValue(v)) {
+        if (v !== void 0 && v !== null && v !== "") {
           v = [v];
         }
       }

package/dist/components/forms/src/util.cjs

@@ -19,6 +19,12 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const judge__namespace = /* @__PURE__ */ _interopNamespaceDefault(judge);
+function isValue(value) {
+  if (value || value === 0 || value === false) {
+    return false;
+  }
+  return true;
+}
 function getRule(name, trigger, obj, data, refForm, getLocale) {
   var _a;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
@@ -77,7 +83,7 @@ function getRule(name, trigger, obj, data, refForm, getLocale) {
       validator = function(rule2, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
-        } else if (!value && value !== 0) {
+        } else if (isValue(value)) {
           callback(new Error(inputPrompt + name));
         } else if (multiple && value.length == 0) {
           callback(new Error(inputPrompt + name));
@@ -97,7 +103,7 @@ function getRule(name, trigger, obj, data, refForm, getLocale) {
       validator = function(rule2, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
-        } else if (value && value !== 0 && isJudgeFailed(value)) {
+        } else if (isJudgeFailed(value)) {
           callback(new Error(name + verif));
         } else {
           processCallback(
@@ -115,7 +121,7 @@ function getRule(name, trigger, obj, data, refForm, getLocale) {
       validator = function(rule2, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
-        } else if (!value && value !== 0) {
+        } else if (isValue(value)) {
           callback(new Error(inputPrompt + name));
         } else if (multiple && value.length == 0) {
           callback(new Error(inputPrompt + name));

package/dist/components/forms/src/util.js

@@ -1,5 +1,11 @@
 import { useHide } from "../../common/use.js";
 import * as judge from "@fangzhongya/utils/judge/judge";
+function isValue(value) {
+  if (value || value === 0 || value === false) {
+    return false;
+  }
+  return true;
+}
 function getRule(name, trigger, obj, data, refForm, getLocale) {
   var _a;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
@@ -58,7 +64,7 @@ function getRule(name, trigger, obj, data, refForm, getLocale) {
       validator = function(rule2, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
-        } else if (!value && value !== 0) {
+        } else if (isValue(value)) {
           callback(new Error(inputPrompt + name));
         } else if (multiple && value.length == 0) {
           callback(new Error(inputPrompt + name));
@@ -78,7 +84,7 @@ function getRule(name, trigger, obj, data, refForm, getLocale) {
       validator = function(rule2, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
-        } else if (value && value !== 0 && isJudgeFailed(value)) {
+        } else if (isJudgeFailed(value)) {
           callback(new Error(name + verif));
         } else {
           processCallback(
@@ -96,7 +102,7 @@ function getRule(name, trigger, obj, data, refForm, getLocale) {
       validator = function(rule2, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
-        } else if (!value && value !== 0) {
+        } else if (isValue(value)) {
           callback(new Error(inputPrompt + name));
         } else if (multiple && value.length == 0) {
           callback(new Error(inputPrompt + name));

package/dist/components/index.scss

@@ -110,6 +110,7 @@
 @use './sliders/index.scss' as *;
 @use './switchs/index.scss' as *;
 @use './texts/index.scss' as *;
+@use './uploads/index.scss' as *;
 @use './list/index.scss' as *;
 @use './lists/index.scss' as *;
 @use './listsp/index.scss' as *;
@@ -118,7 +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 *;

package/dist/components/labels/src/data.cjs

@@ -5,10 +5,15 @@ const data = require("../../checks/src/data.cjs");
 const name = "labels";
 const dataProps = {
   ...data.dataProps,
-  nowhole: {
-    type: Boolean
+  isWhole: {
+    type: Boolean,
+    default: true
   },
   whole: {
+    type: null,
+    default: ""
+  },
+  wholeName: {
     type: String,
     default: "全部"
   },

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

@@ -5,10 +5,15 @@ import { comHandle } from '../../common/list';
  */
 export declare const name = "labels";
 export declare const dataProps: {
-    nowhole: {
+    isWhole: {
         type: BooleanConstructor;
+        default: boolean;
     };
     whole: {
+        type: null;
+        default: string;
+    };
+    wholeName: {
         type: StringConstructor;
         default: string;
     };

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

@@ -3,10 +3,15 @@ import { dataProps as dataProps$1, dataEmits as dataEmits$1 } from "../../checks
 const name = "labels";
 const dataProps = {
   ...dataProps$1,
-  nowhole: {
-    type: Boolean
+  isWhole: {
+    type: Boolean,
+    default: true
   },
   whole: {
+    type: null,
+    default: ""
+  },
+  wholeName: {
     type: String,
     default: "全部"
   },

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

@@ -38,19 +38,19 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         obj[d] = value2;
       }
     }
-    const wholeValue = "__Symbol('whole')__" + (/* @__PURE__ */ new Date()).valueOf();
+    const wholeValue = props.whole;
     const options = vue.computed(() => {
       const opts = [...props.options];
-      if (!props.nowhole) {
+      if (props.isWhole) {
         const obj = {
           class: wholeClass
         };
         if (multiple.value) {
           setPropsValue(obj, props.prop, wholeValue, "value");
         } else {
-          setPropsValue(obj, props.prop, "", "value");
+          setPropsValue(obj, props.prop, props.whole, "value");
         }
-        setPropsValue(obj, props.label, props.whole, "label");
+        setPropsValue(obj, props.label, props.wholeName, "label");
         opts.unshift(obj);
       }
       return opts;
@@ -78,7 +78,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     });
     function onClickWholes(item, is) {
-      if (item.class === wholeClass) {
+      if ((item == null ? void 0 : item.class) === wholeClass) {
         if (valueMultiple.value.includes(wholeValue)) {
           valueMultiple.value = [];
         } else {

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

@@ -36,19 +36,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         obj[d] = value2;
       }
     }
-    const wholeValue = "__Symbol('whole')__" + (/* @__PURE__ */ new Date()).valueOf();
+    const wholeValue = props.whole;
     const options = computed(() => {
       const opts = [...props.options];
-      if (!props.nowhole) {
+      if (props.isWhole) {
         const obj = {
           class: wholeClass
         };
         if (multiple.value) {
           setPropsValue(obj, props.prop, wholeValue, "value");
         } else {
-          setPropsValue(obj, props.prop, "", "value");
+          setPropsValue(obj, props.prop, props.whole, "value");
         }
-        setPropsValue(obj, props.label, props.whole, "label");
+        setPropsValue(obj, props.label, props.wholeName, "label");
         opts.unshift(obj);
       }
       return opts;
@@ -76,7 +76,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     function onClickWholes(item, is) {
-      if (item.class === wholeClass) {
+      if ((item == null ? void 0 : item.class) === wholeClass) {
         if (valueMultiple.value.includes(wholeValue)) {
           valueMultiple.value = [];
         } else {

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

@@ -10,6 +10,10 @@ const dataProps = {
    */
   placeholder: {
     type: String
+  },
+  isEmpty: {
+    type: Boolean,
+    default: true
   }
 };
 const dataHandle = list.comHandle;

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

@@ -12,6 +12,10 @@ export declare const dataProps: {
     placeholder: {
         type: StringConstructor;
     };
+    isEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     options: {
         type: {
             (arrayLength: number): ObjAny[];

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

@@ -8,6 +8,10 @@ const dataProps = {
    */
   placeholder: {
     type: String
+  },
+  isEmpty: {
+    type: Boolean,
+    default: true
   }
 };
 const dataHandle = comHandle;

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

@@ -34,11 +34,83 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     });
     const emit = __emit;
     const listFuObj = data.dataHandle(props, emit);
-    const value = listFuObj.value;
+    let value = listFuObj.value;
     const multiple = listFuObj.multiple;
-    const onClickMultiple = (value2, is) => {
-      emit("click-multiple", listFuObj.getValueObjs(value2)[0], is);
+    let setValue = (item) => {
+      return use.useVueValue(item, props.prop);
     };
+    let onClickMultiple = (v, is) => {
+      emit("click-multiple", listFuObj.getValueObjs(v)[0], is);
+    };
+    if (props.isEmpty) {
+      const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
+      onClickMultiple = (v, is) => {
+        if (v === emptyValue) {
+          v = "";
+        }
+        emit("click-multiple", listFuObj.getValueObjs(v)[0], is);
+      };
+      const isOptionsEmpty = vue.computed(() => {
+        const arr = props.options.filter((o) => {
+          return use.useVueValue(o, props.prop) === "";
+        });
+        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;
+                }
+              }
+            },
+            get() {
+              const v = listFuObj.value.value;
+              if (multiple.value) {
+                return (v ?? []).map((o) => {
+                  if (o === "") {
+                    return emptyValue;
+                  }
+                  return o;
+                });
+              } else {
+                if (v === "") {
+                  return emptyValue;
+                }
+                return v;
+              }
+            }
+          });
+        }
+      };
+      vue.watch(
+        () => isOptionsEmpty.value,
+        () => {
+          setEmptyFun();
+        },
+        {
+          immediate: true
+        }
+      );
+    }
     const onChange = (v) => {
       if (multiple.value) {
         const obj = compareArray.compareArray(value.value || [], v || []);
@@ -46,8 +118,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         onClickMultiple(obj.value[0], is);
       }
     };
-    const onRemoveTag = (value2) => {
-      onClickMultiple(value2, true);
+    const onRemoveTag = (v) => {
+      onClickMultiple(v, true);
     };
     __expose(
       index$4.useExpose(
@@ -69,7 +141,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ref_key: "elRef",
           ref: elRef,
           modelValue: vue.unref(value),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(value) ? value.value = $event : null)
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(value) ? value.value = $event : value = $event)
         }, vue.unref(attrs).assem, {
           multiple: vue.unref(multiple),
           placeholder: placeholder.value,
@@ -80,7 +152,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(props).options, (item) => {
               return vue.openBlock(), vue.createBlock(vue.unref(index$6.Option), {
                 label: vue.unref(use.useVueValue)(item, vue.unref(props).label),
-                value: vue.unref(use.useVueValue)(item, vue.unref(props).prop),
+                value: vue.unref(setValue)(item),
                 disabled: item == null ? void 0 : item.disabled
               }, null, 8, ["label", "value", "disabled"]);
             }), 256))

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, useAttrs, computed, createElementBlock, openBlock, mergeProps, unref, createVNode, isRef, withCtx, Fragment, renderList, createBlock } from "vue";
+import { defineComponent, ref, useAttrs, computed, watch, 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";
@@ -32,11 +32,83 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const emit = __emit;
     const listFuObj = dataHandle(props, emit);
-    const value = listFuObj.value;
+    let value = listFuObj.value;
     const multiple = listFuObj.multiple;
-    const onClickMultiple = (value2, is) => {
-      emit("click-multiple", listFuObj.getValueObjs(value2)[0], is);
+    let setValue = (item) => {
+      return useVueValue(item, props.prop);
     };
+    let onClickMultiple = (v, is) => {
+      emit("click-multiple", listFuObj.getValueObjs(v)[0], is);
+    };
+    if (props.isEmpty) {
+      const emptyValue = "__Symbol('empty')__" + (/* @__PURE__ */ new Date()).valueOf();
+      onClickMultiple = (v, is) => {
+        if (v === emptyValue) {
+          v = "";
+        }
+        emit("click-multiple", listFuObj.getValueObjs(v)[0], is);
+      };
+      const isOptionsEmpty = computed(() => {
+        const arr = props.options.filter((o) => {
+          return useVueValue(o, props.prop) === "";
+        });
+        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;
+                }
+              }
+            },
+            get() {
+              const v = listFuObj.value.value;
+              if (multiple.value) {
+                return (v ?? []).map((o) => {
+                  if (o === "") {
+                    return emptyValue;
+                  }
+                  return o;
+                });
+              } else {
+                if (v === "") {
+                  return emptyValue;
+                }
+                return v;
+              }
+            }
+          });
+        }
+      };
+      watch(
+        () => isOptionsEmpty.value,
+        () => {
+          setEmptyFun();
+        },
+        {
+          immediate: true
+        }
+      );
+    }
     const onChange = (v) => {
       if (multiple.value) {
         const obj = compareArray(value.value || [], v || []);
@@ -44,8 +116,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onClickMultiple(obj.value[0], is);
       }
     };
-    const onRemoveTag = (value2) => {
-      onClickMultiple(value2, true);
+    const onRemoveTag = (v) => {
+      onClickMultiple(v, true);
     };
     __expose(
       useExpose(
@@ -67,7 +139,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "elRef",
           ref: elRef,
           modelValue: unref(value),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(value) ? value.value = $event : null)
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(value) ? value.value = $event : value = $event)
         }, unref(attrs).assem, {
           multiple: unref(multiple),
           placeholder: placeholder.value,
@@ -78,7 +150,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             (openBlock(true), createElementBlock(Fragment, null, renderList(unref(props).options, (item) => {
               return openBlock(), createBlock(unref(Option), {
                 label: unref(useVueValue)(item, unref(props).label),
-                value: unref(useVueValue)(item, unref(props).prop),
+                value: unref(setValue)(item),
                 disabled: item == null ? void 0 : item.disabled
               }, null, 8, ["label", "value", "disabled"]);
             }), 256))

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

@@ -160,6 +160,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           value.value = "";
         }
       }
+      if (value.value.length == 0) {
+        showIndex.value = -1;
+      }
     };
     const errorPrompt = (ts, num) => {
       if (props.errorPrompt) {

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

@@ -158,6 +158,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           value.value = "";
         }
       }
+      if (value.value.length == 0) {
+        showIndex.value = -1;
+      }
     };
     const errorPrompt = (ts, num) => {
       if (props.errorPrompt) {

package/dist/css/index.css

@@ -1751,28 +1751,6 @@
   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;

package/dist/icons/index.json

@@ -1,7 +1,7 @@
 {
     "prefix": "fang-ui",
     "info": {},
-    "lastModified": 1763543321663,
+    "lastModified": 1763557620058,
     "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,28 +1751,6 @@
   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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/fang-ui",
   "private": false,
-  "version": "0.1.31",
+  "version": "0.1.33",
   "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",