@fangzhongya/fang-ui 0.1.43 → 0.1.45

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

@@ -28,6 +28,12 @@ const dataProps = {
    */
   modelValue: {
     type: [String, Number, Date, Array]
+  },
+  disabledDate: {
+    type: Function
+  },
+  disabledNot: {
+    type: Boolean
   }
 };
 const dataEmits = [...list.emits];

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

@@ -78,6 +78,12 @@ export declare const dataProps: {
             readonly [Symbol.species]: ArrayConstructor;
         })[];
     };
+    disabledDate: {
+        type: FunctionConstructor;
+    };
+    disabledNot: {
+        type: BooleanConstructor;
+    };
     options: {
         type: {
             (arrayLength: number): ObjAny[];

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

@@ -26,6 +26,12 @@ const dataProps = {
    */
   modelValue: {
     type: [String, Number, Date, Array]
+  },
+  disabledDate: {
+    type: Function
+  },
+  disabledNot: {
+    type: Boolean
   }
 };
 const dataEmits = [...emits];

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

@@ -10,6 +10,7 @@ const index$4 = require("../../selects/index.cjs");
 const index$6 = require("../../date-picker/index.cjs");
 const index$3 = require("../../../hooks/props-default/index.cjs");
 const index = require("../../../hooks/locale/index.cjs");
+const getEndOfDay = require("@fangzhongya/utils/date/getEndOfDay");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: index$3.getProps(data.dataProps),
@@ -50,6 +51,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const format = attrs.assem["value-format"] || props.format || ((_a = types.value) == null ? void 0 : _a.format);
       return util.formatType(value2, format, types.value, props.repair);
     }
+    const disabledDate = function(data2) {
+      if (props.disabledDate) {
+        return props.disabledDate(data2);
+      } else if (props.disabledNot) {
+        const d = getEndOfDay.getEndOfDay();
+        return data2 > d;
+      }
+      return false;
+    };
     __expose({
       ...data.dataExpose,
       getValue
@@ -77,6 +87,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             type: ((_a = types.value) == null ? void 0 : _a.type) || vue.unref(props).type,
             format: vue.unref(props).format || ((_b = types.value) == null ? void 0 : _b.format),
             "default-time": defaultTime,
+            "disabled-date": disabledDate,
             modelValue: vue.unref(value),
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(value) ? value.value = $event : null)
           }), null, 16, ["type", "format", "modelValue"])
@@ -85,6 +96,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           format: vue.unref(props).format || ((_c = types.value) == null ? void 0 : _c.format),
           "default-time": vue.unref(multiple) ? defaultTime : void 0,
           shortcuts: vue.unref(props).shortcuts,
+          "disabled-date": disabledDate,
           modelValue: vue.unref(value),
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.isRef(value) ? value.value = $event : null)
         }), vue.createSlots({ _: 2 }, [

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

@@ -8,6 +8,7 @@ import { Selects } from "../../selects/index.js";
 import { DatePicker } from "../../date-picker/index.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { useLocale } from "../../../hooks/locale/index.js";
+import { getEndOfDay } from "@fangzhongya/utils/date/getEndOfDay";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: getProps(dataProps),
@@ -48,6 +49,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const format = attrs.assem["value-format"] || props.format || ((_a = types.value) == null ? void 0 : _a.format);
       return formatType(value2, format, types.value, props.repair);
     }
+    const disabledDate = function(data) {
+      if (props.disabledDate) {
+        return props.disabledDate(data);
+      } else if (props.disabledNot) {
+        const d = getEndOfDay();
+        return data > d;
+      }
+      return false;
+    };
     __expose({
       ...dataExpose,
       getValue
@@ -75,6 +85,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             type: ((_a = types.value) == null ? void 0 : _a.type) || unref(props).type,
             format: unref(props).format || ((_b = types.value) == null ? void 0 : _b.format),
             "default-time": defaultTime,
+            "disabled-date": disabledDate,
             modelValue: unref(value),
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(value) ? value.value = $event : null)
           }), null, 16, ["type", "format", "modelValue"])
@@ -83,6 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           format: unref(props).format || ((_c = types.value) == null ? void 0 : _c.format),
           "default-time": unref(multiple) ? defaultTime : void 0,
           shortcuts: unref(props).shortcuts,
+          "disabled-date": disabledDate,
           modelValue: unref(value),
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(value) ? value.value = $event : null)
         }), createSlots({ _: 2 }, [

package/dist/components/forms-div/src/index2.cjs

@@ -31,17 +31,32 @@ const _sfc_main = vue.defineComponent({
       }
       return o;
     });
-    const record = vue.ref();
+    const record = vue.ref(props.default);
     const setPropComputedValue = (prop, computed2, value2) => {
-      if (isEqual.isEqual(prop, computed2)) {
-        return;
-      }
-      if (prop !== record.value) {
-        handlePropNotEqualRecord(prop, value2);
+      if (props.prop) {
+        if (isEqual.isEqual(prop, computed2)) {
+          return;
+        }
+        if (prop !== record.value) {
+          handlePropNotEqualRecord(prop, value2);
+        } else {
+          if (props.pars) {
+            objValue.setObjValue(value2, props.prop, computed2);
+          } else {
+            value2[props.prop] = computed2;
+          }
+        }
+        record.value = prop;
       } else {
-        handlePropEqualRecord(computed2, value2);
+        prop = record.value;
+        if (isEqual.isEqual(prop, computed2)) {
+          return;
+        }
+        if (prop !== computed2) {
+          handlePropNotEqualRecord(computed2, value2);
+        }
+        record.value = computed2;
       }
-      record.value = prop;
     };
     const handlePropNotEqualRecord = (prop, value2) => {
       if (Array.isArray(props.computed)) {
@@ -60,13 +75,6 @@ const _sfc_main = vue.defineComponent({
         }
       }
     };
-    const handlePropEqualRecord = (computed2, value2) => {
-      if (props.pars) {
-        objValue.setObjValue(value2, props.prop, computed2);
-      } else {
-        value2[props.prop] = computed2;
-      }
-    };
     const binds = vue.computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
@@ -122,7 +130,7 @@ const _sfc_main = vue.defineComponent({
           props
         );
       }
-      if (props.prop && computedValue !== void 0) {
+      if (computedValue !== void 0) {
         setPropComputedValue(currentValue, computedValue, source);
       }
       return computedValue;
@@ -136,10 +144,10 @@ const _sfc_main = vue.defineComponent({
       if (props.computed) {
         handleComputedSet(newValue, v);
       }
-      if (!props.orig && !prop) {
+      if (!props.orig && !(prop || props.computed)) {
         emit("update:modelValue", newValue);
       }
-      if (prop) {
+      if (prop || props.computed) {
         emit("upform", newValue, props, v);
       }
     }
@@ -184,7 +192,7 @@ const _sfc_main = vue.defineComponent({
           [componValueName]: value.value,
           ["onUpdate:" + componValueName]: (v) => value.value = v,
           ["onUpform"]: (...arr) => {
-            if (props.prop) {
+            if (props.prop || props.computed) {
               emit("upform", ...arr);
             }
           }

package/dist/components/forms-div/src/index2.js

@@ -29,17 +29,32 @@ const _sfc_main = defineComponent({
       }
       return o;
     });
-    const record = ref();
+    const record = ref(props.default);
     const setPropComputedValue = (prop, computed2, value2) => {
-      if (isEqual(prop, computed2)) {
-        return;
-      }
-      if (prop !== record.value) {
-        handlePropNotEqualRecord(prop, value2);
+      if (props.prop) {
+        if (isEqual(prop, computed2)) {
+          return;
+        }
+        if (prop !== record.value) {
+          handlePropNotEqualRecord(prop, value2);
+        } else {
+          if (props.pars) {
+            setObjValue(value2, props.prop, computed2);
+          } else {
+            value2[props.prop] = computed2;
+          }
+        }
+        record.value = prop;
       } else {
-        handlePropEqualRecord(computed2, value2);
+        prop = record.value;
+        if (isEqual(prop, computed2)) {
+          return;
+        }
+        if (prop !== computed2) {
+          handlePropNotEqualRecord(computed2, value2);
+        }
+        record.value = computed2;
       }
-      record.value = prop;
     };
     const handlePropNotEqualRecord = (prop, value2) => {
       if (Array.isArray(props.computed)) {
@@ -58,13 +73,6 @@ const _sfc_main = defineComponent({
         }
       }
     };
-    const handlePropEqualRecord = (computed2, value2) => {
-      if (props.pars) {
-        setObjValue(value2, props.prop, computed2);
-      } else {
-        value2[props.prop] = computed2;
-      }
-    };
     const binds = computed(() => {
       const obj = { ...props.config, ...formvalue.value };
       const binds2 = {};
@@ -120,7 +128,7 @@ const _sfc_main = defineComponent({
           props
         );
       }
-      if (props.prop && computedValue !== void 0) {
+      if (computedValue !== void 0) {
         setPropComputedValue(currentValue, computedValue, source);
       }
       return computedValue;
@@ -134,10 +142,10 @@ const _sfc_main = defineComponent({
       if (props.computed) {
         handleComputedSet(newValue, v);
       }
-      if (!props.orig && !prop) {
+      if (!props.orig && !(prop || props.computed)) {
         emit("update:modelValue", newValue);
       }
-      if (prop) {
+      if (prop || props.computed) {
         emit("upform", newValue, props, v);
       }
     }
@@ -182,7 +190,7 @@ const _sfc_main = defineComponent({
           [componValueName]: value.value,
           ["onUpdate:" + componValueName]: (v) => value.value = v,
           ["onUpform"]: (...arr) => {
-            if (props.prop) {
+            if (props.prop || props.computed) {
               emit("upform", ...arr);
             }
           }

package/dist/components/forms-item/src/data.cjs

@@ -56,13 +56,10 @@ const dataProps = {
   hideLabel: Boolean,
   /**
    * 传入值
-   * @props { Object } modelValue={} ( )
+   * @props { Object } modelValue ( )
    */
   modelValue: {
-    type: Object,
-    default() {
-      return {};
-    }
+    type: null
   }
 };
 const dataEmits = ["update:modelValue", "upform"];

package/dist/components/forms-item/src/data.d.ts

@@ -67,11 +67,10 @@ export declare const dataProps: {
     hideLabel: BooleanConstructor;
     /**
      * 传入值
-     * @props { Object } modelValue={} ( )
+     * @props { Object } modelValue ( )
      */
     modelValue: {
-        type: ObjectConstructor;
-        default(): {};
+        type: null;
     };
 };
 export type DataProps = ExtractPropTypes<typeof dataProps>;

package/dist/components/forms-item/src/data.js

@@ -54,13 +54,10 @@ const dataProps = {
   hideLabel: Boolean,
   /**
    * 传入值
-   * @props { Object } modelValue={} ( )
+   * @props { Object } modelValue ( )
    */
   modelValue: {
-    type: Object,
-    default() {
-      return {};
-    }
+    type: null
   }
 };
 const dataEmits = ["update:modelValue", "upform"];

package/dist/components/forms-item/src/indexts.d.ts

@@ -38,8 +38,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
     hideLabel: BooleanConstructor;
     modelValue: {
-        type: ObjectConstructor;
-        default(): {};
+        type: null;
     };
 }>, () => VNode<RendererNode, RendererElement, {
     [key: string]: any;
@@ -82,13 +81,11 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
     hideLabel: BooleanConstructor;
     modelValue: {
-        type: ObjectConstructor;
-        default(): {};
+        type: null;
     };
 }>> & Readonly<{
     [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
 }>, {
-    modelValue: Record<string, any>;
     index: number[];
     optionss: ObjAny;
     listobj: ListObj;

package/dist/components/tables/common/com-but2.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const index$1 = require("../../button/index.cjs");
+const index$2 = require("../../button/index.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
-const util = require("./util.cjs");
+const index$1 = require("../../../hooks/event-aliass/index.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "com-but",
   props: {
@@ -78,21 +78,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     function onClick(obj, index2, $event) {
       var _a;
-      util.eventAliass(
+      const is = index$1.eventAliass(
         (callback) => {
-          callback(
-            "but",
-            obj,
-            props.valueobj,
-            props.listobj,
-            props.comscope
-          );
+          callback(obj, props.valueobj, props.listobj, props.comscope);
         },
         "click",
-        ((_a = props.listobj) == null ? void 0 : _a.events) || {},
+        ((_a = props.listobj) == null ? void 0 : _a.events) || obj,
         $event
       );
-      emit("but", obj);
+      if (!is) {
+        emit("but", obj);
+      }
     }
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("span", {
@@ -100,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }, [
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(props.list, (item, index2) => {
           return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: index2 }, [
-            getHide(item) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.Button), vue.mergeProps({
+            getHide(item) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.Button), vue.mergeProps({
               key: 0,
               ref_for: true
             }, item, {

package/dist/components/tables/common/com-but2.js

@@ -1,7 +1,7 @@
 import { defineComponent, createElementBlock, openBlock, normalizeClass, unref, Fragment, renderList, createBlock, createCommentVNode, mergeProps, withCtx, createTextVNode, toDisplayString } from "vue";
 import { Button } from "../../button/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
-import { eventAliass } from "./util.js";
+import { eventAliass } from "../../../hooks/event-aliass/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "com-but",
   props: {
@@ -76,21 +76,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function onClick(obj, index, $event) {
       var _a;
-      eventAliass(
+      const is = eventAliass(
         (callback) => {
-          callback(
-            "but",
-            obj,
-            props.valueobj,
-            props.listobj,
-            props.comscope
-          );
+          callback(obj, props.valueobj, props.listobj, props.comscope);
         },
         "click",
-        ((_a = props.listobj) == null ? void 0 : _a.events) || {},
+        ((_a = props.listobj) == null ? void 0 : _a.events) || obj,
         $event
       );
-      emit("but", obj);
+      if (!is) {
+        emit("but", obj);
+      }
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("span", {

package/dist/components/tables/common/com-color2.cjs

@@ -2,6 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const util = require("./util.cjs");
+const index$1 = require("../../../hooks/event-aliass/index.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "com-color",
@@ -100,22 +101,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     function onClick($event) {
       var _a;
-      const obj = {};
-      util.eventAliass(
+      const is = index$1.eventAliass(
         (callback) => {
-          callback(
-            "color",
-            obj,
-            props.valueobj,
-            props.listobj,
-            props.comscope
-          );
+          callback(props, props.valueobj, props.listobj, props.comscope);
         },
         "click",
-        ((_a = props.listobj) == null ? void 0 : _a.events) || {},
+        ((_a = props.listobj) == null ? void 0 : _a.events) || props,
         $event
       );
-      emit("color", obj);
+      if (!is) {
+        emit("color", props);
+      }
     }
     return (_ctx, _cache) => {
       return emptyDisplay.value ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [

package/dist/components/tables/common/com-color2.js

@@ -1,5 +1,6 @@
 import { defineComponent, computed, createElementBlock, openBlock, Fragment, createTextVNode, toDisplayString, normalizeStyle, normalizeClass, unref, createElementVNode } from "vue";
-import { setEmptyDisplay, eventAliass } from "./util.js";
+import { setEmptyDisplay } from "./util.js";
+import { eventAliass } from "../../../hooks/event-aliass/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "com-color",
@@ -98,22 +99,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function onClick($event) {
       var _a;
-      const obj = {};
-      eventAliass(
+      const is = eventAliass(
         (callback) => {
-          callback(
-            "color",
-            obj,
-            props.valueobj,
-            props.listobj,
-            props.comscope
-          );
+          callback(props, props.valueobj, props.listobj, props.comscope);
         },
         "click",
-        ((_a = props.listobj) == null ? void 0 : _a.events) || {},
+        ((_a = props.listobj) == null ? void 0 : _a.events) || props,
         $event
       );
-      emit("color", obj);
+      if (!is) {
+        emit("color", props);
+      }
     }
     return (_ctx, _cache) => {
       return emptyDisplay.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [

package/dist/components/tables/common/com-lis2.cjs

@@ -2,6 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const util = require("./util.cjs");
+const index$1 = require("../../../hooks/event-aliass/index.cjs");
 const use = require("../../common/use.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
 const _hoisted_1 = ["onClick"];
@@ -112,21 +113,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     });
     function onClickList(obj, index2, $event) {
       var _a;
-      util.eventAliass(
+      const is = index$1.eventAliass(
         (callback) => {
-          callback(
-            "lis",
-            obj,
-            props.valueobj,
-            props.listobj,
-            props.comscope
-          );
+          callback(obj, props.valueobj, props.listobj, props.comscope);
         },
         "click",
-        ((_a = props.listobj) == null ? void 0 : _a.events) || {},
+        ((_a = props.listobj) == null ? void 0 : _a.events) || obj,
         $event
       );
-      emit("lis", obj, index2);
+      if (!is) {
+        emit("lis", obj, index2);
+      }
     }
     return (_ctx, _cache) => {
       return emptyDisplay.value ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [

package/dist/components/tables/common/com-lis2.js

@@ -1,5 +1,6 @@
 import { defineComponent, computed, createElementBlock, openBlock, Fragment, createTextVNode, toDisplayString, normalizeClass, unref, renderList, normalizeStyle } from "vue";
-import { setEmptyDisplay, eventAliass } from "./util.js";
+import { setEmptyDisplay } from "./util.js";
+import { eventAliass } from "../../../hooks/event-aliass/index.js";
 import { useGetDomValue } from "../../common/use.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 const _hoisted_1 = ["onClick"];
@@ -110,21 +111,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     function onClickList(obj, index, $event) {
       var _a;
-      eventAliass(
+      const is = eventAliass(
         (callback) => {
-          callback(
-            "lis",
-            obj,
-            props.valueobj,
-            props.listobj,
-            props.comscope
-          );
+          callback(obj, props.valueobj, props.listobj, props.comscope);
         },
         "click",
-        ((_a = props.listobj) == null ? void 0 : _a.events) || {},
+        ((_a = props.listobj) == null ? void 0 : _a.events) || obj,
         $event
       );
-      emit("lis", obj, index);
+      if (!is) {
+        emit("lis", obj, index);
+      }
     }
     return (_ctx, _cache) => {
       return emptyDisplay.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [