@fangzhongya/fang-ui 0.1.36 → 0.1.38

package/dist/components/box-adjust/src/data.cjs

@@ -20,7 +20,7 @@ const dataProps = buildProps.buildProps({
     type: Boolean
   },
   /**
-   * @props { Boolean } max= ( )
+   * @props { Boolean } isMax= ( )
    * 是否显示最大化
    */
   isMax: {
@@ -28,7 +28,7 @@ const dataProps = buildProps.buildProps({
   },
   /**
    * @props { Boolean } max= ( )
-   * 是否要最大化
+   * 是否最大化
    */
   max: {
     type: Boolean

package/dist/components/box-adjust/src/data.d.ts

@@ -20,7 +20,7 @@ export declare const dataProps: {
         type: BooleanConstructor;
     };
     /**
-     * @props { Boolean } max= ( )
+     * @props { Boolean } isMax= ( )
      * 是否显示最大化
      */
     isMax: {
@@ -28,7 +28,7 @@ export declare const dataProps: {
     };
     /**
      * @props { Boolean } max= ( )
-     * 是否要最大化
+     * 是否最大化
      */
     max: {
         type: BooleanConstructor;

package/dist/components/box-adjust/src/data.js

@@ -18,7 +18,7 @@ const dataProps = buildProps({
     type: Boolean
   },
   /**
-   * @props { Boolean } max= ( )
+   * @props { Boolean } isMax= ( )
    * 是否显示最大化
    */
   isMax: {
@@ -26,7 +26,7 @@ const dataProps = buildProps({
   },
   /**
    * @props { Boolean } max= ( )
-   * 是否要最大化
+   * 是否最大化
    */
   max: {
     type: Boolean

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

@@ -1,24 +1,28 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const list = require("../../common/list.cjs");
 const name = "buttons";
 const dataProps = {
-  options: {
-    type: [Array]
-  },
+  ...list.props,
   isFather: {
     type: Boolean
   },
+  isValue: {
+    type: Boolean
+  },
   disabled: {
     type: Boolean
   }
 };
-const dataEmits = ["clicks"];
+const dataHandle = list.comHandle;
+const dataEmits = [...list.emits, "clicks"];
 const dataSlot = {
   default: "default"
 };
 const dataExpose = {};
 exports.dataEmits = dataEmits;
 exports.dataExpose = dataExpose;
+exports.dataHandle = dataHandle;
 exports.dataProps = dataProps;
 exports.dataSlot = dataSlot;
 exports.name = name;

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

@@ -1,9 +1,19 @@
 import { ExtractPropTypes } from 'vue';
+import { comHandle } from '../../common/list';
 /**
  * @title {h3} buttons
  */
 export declare const name = "buttons";
 export declare const dataProps: {
+    isFather: {
+        type: BooleanConstructor;
+    };
+    isValue: {
+        type: BooleanConstructor;
+    };
+    disabled: {
+        type: BooleanConstructor;
+    };
     options: {
         type: {
             (arrayLength: number): ObjAny[];
@@ -20,13 +30,31 @@ export declare const dataProps: {
             fromAsync<T>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T | PromiseLike<T>> | ArrayLike<T | PromiseLike<T>>): Promise<T[]>;
             fromAsync<T, U>(iterableOrArrayLike: AsyncIterable<T> | Iterable<T> | ArrayLike<T>, mapFn: (value: Awaited<T>, index: number) => U, thisArg?: any): Promise<Awaited<U>[]>;
             readonly [Symbol.species]: ArrayConstructor;
-        }[];
+        };
+        default(): never[];
     };
-    isFather: {
+    clearAbsent: {
         type: BooleanConstructor;
     };
-    disabled: {
-        type: BooleanConstructor;
+    label: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
+    prop: {
+        type: (StringConstructor | FunctionConstructor)[];
+        default: string;
+    };
+    modelValue: {
+        type: null;
+    };
+    multiple: {
+        type: (BooleanConstructor | StringConstructor)[];
+    };
+    load: {
+        type: BooleanConstructor[];
+    };
+    optobj: {
+        type: BooleanConstructor[];
     };
 };
 export type DataProps = ExtractPropTypes<typeof dataProps>;
@@ -34,6 +62,7 @@ export type DataProps = ExtractPropTypes<typeof dataProps>;
  * @emits change (val:[String, Array])
  * 选择的时间
  */
+export declare const dataHandle: typeof comHandle;
 export declare const dataEmits: string[];
 export type DataEmits = typeof dataEmits;
 /**

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

@@ -1,16 +1,19 @@
+import { props, comHandle, emits } from "../../common/list.js";
 const name = "buttons";
 const dataProps = {
-  options: {
-    type: [Array]
-  },
+  ...props,
   isFather: {
     type: Boolean
   },
+  isValue: {
+    type: Boolean
+  },
   disabled: {
     type: Boolean
   }
 };
-const dataEmits = ["clicks"];
+const dataHandle = comHandle;
+const dataEmits = [...emits, "clicks"];
 const dataSlot = {
   default: "default"
 };
@@ -18,6 +21,7 @@ const dataExpose = {};
 export {
   dataEmits,
   dataExpose,
+  dataHandle,
   dataProps,
   dataSlot,
   name

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

@@ -14,6 +14,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const prs = __props;
     const props = index$1.usePropsDefault(data.name, prs, data.dataProps);
     const emit = __emit;
+    const listFuObj = data.dataHandle(props, emit);
+    const value = listFuObj.value;
+    const multiple = listFuObj.multiple;
+    const valueOptions = vue.computed(() => {
+      if (props.isValue) {
+        return listFuObj.getValueObjs(value.value);
+      } else {
+        return props.options;
+      }
+    });
     function onClick(obj, index2, $event) {
       if (obj.click) {
         obj.click(obj, index2, $event);
@@ -25,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ...data.dataExpose
     });
     return (_ctx, _cache) => {
-      return vue.unref(props).isFather ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(vue.unref(props).options, (item, index2) => {
+      return vue.unref(props).isFather ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(valueOptions.value, (item, index2) => {
         return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: index2 }, [
           !item.hide ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.Button), vue.mergeProps({
             key: 0,
@@ -44,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         key: 1,
         class: vue.normalizeClass(vue.unref(cs).z())
       }, [
-        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(props).options, (item, index2) => {
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(valueOptions.value, (item, index2) => {
           return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: index2 }, [
             !item.hide ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.Button), vue.mergeProps({
               key: 0,

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

@@ -1,6 +1,6 @@
-import { defineComponent, createElementBlock, unref, openBlock, Fragment, renderList, createBlock, createCommentVNode, mergeProps, withModifiers, withCtx, createTextVNode, toDisplayString, normalizeClass } from "vue";
+import { defineComponent, computed, createElementBlock, unref, openBlock, Fragment, renderList, createBlock, createCommentVNode, mergeProps, withModifiers, withCtx, createTextVNode, toDisplayString, normalizeClass } from "vue";
 import { Button } from "../../button/index.js";
-import { name, dataProps, dataExpose, dataEmits } from "./data.js";
+import { name, dataProps, dataHandle, dataExpose, dataEmits } from "./data.js";
 import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -12,6 +12,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
     const emit = __emit;
+    const listFuObj = dataHandle(props, emit);
+    const value = listFuObj.value;
+    const multiple = listFuObj.multiple;
+    const valueOptions = computed(() => {
+      if (props.isValue) {
+        return listFuObj.getValueObjs(value.value);
+      } else {
+        return props.options;
+      }
+    });
     function onClick(obj, index, $event) {
       if (obj.click) {
         obj.click(obj, index, $event);
@@ -23,7 +33,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ...dataExpose
     });
     return (_ctx, _cache) => {
-      return unref(props).isFather ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(unref(props).options, (item, index) => {
+      return unref(props).isFather ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(valueOptions.value, (item, index) => {
         return openBlock(), createElementBlock(Fragment, { key: index }, [
           !item.hide ? (openBlock(), createBlock(unref(Button), mergeProps({
             key: 0,
@@ -42,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         key: 1,
         class: normalizeClass(unref(cs).z())
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(unref(props).options, (item, index) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(valueOptions.value, (item, index) => {
           return openBlock(), createElementBlock(Fragment, { key: index }, [
             !item.hide ? (openBlock(), createBlock(unref(Button), mergeProps({
               key: 0,

package/dist/components/common/use.cjs

@@ -150,7 +150,7 @@ function getValueObjs(value, multiple, options, config) {
     return value;
   }
 }
-function setOptionsValue(value, obj, data, optionss) {
+function setOptionsValue(value, obj, data, optionss = {}) {
   let options = [];
   if (obj == null ? void 0 : obj.options) {
     const opt = obj.options;
@@ -226,7 +226,7 @@ function processOptions(obj, componObj, optionss, value, data) {
 }
 function renderComponent(tcom, compon, componObj, value, compons) {
   if (Object.keys(compons).includes(tcom)) {
-    return vue.h(compons[tcom], componObj, value);
+    return vue.h(compons[tcom], componObj);
   }
   if (shared.isHTMLTag(compon) || shared.isSVGTag(compon)) {
     return vue.h(compon, componObj, value);
@@ -284,13 +284,15 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
       ...attrs,
       ...obj.config,
       ...getOnObjs(obj, data, emit, scope),
-      multiple: obj.multiple,
       [componValueName]: value,
       ["onUpdate:" + componValueName]: (v) => setValue(v, obj, data),
       listobj: obj,
       valueobj: data,
       comscope: scope
     };
+    if (obj.multiple) {
+      componObj.multiple = obj.multiple;
+    }
     if (typeof obj.compon == "string") {
       return setComponString(
         value,

package/dist/components/common/use.js

@@ -148,7 +148,7 @@ function getValueObjs(value, multiple, options, config) {
     return value;
   }
 }
-function setOptionsValue(value, obj, data, optionss) {
+function setOptionsValue(value, obj, data, optionss = {}) {
   let options = [];
   if (obj == null ? void 0 : obj.options) {
     const opt = obj.options;
@@ -224,7 +224,7 @@ function processOptions(obj, componObj, optionss, value, data) {
 }
 function renderComponent(tcom, compon, componObj, value, compons) {
   if (Object.keys(compons).includes(tcom)) {
-    return h(compons[tcom], componObj, value);
+    return h(compons[tcom], componObj);
   }
   if (isHTMLTag(compon) || isSVGTag(compon)) {
     return h(compon, componObj, value);
@@ -282,13 +282,15 @@ function useSetCompon(obj, data, optionss, compons, emit, index, scope) {
       ...attrs,
       ...obj.config,
       ...getOnObjs(obj, data, emit, scope),
-      multiple: obj.multiple,
       [componValueName]: value,
       ["onUpdate:" + componValueName]: (v) => setValue(v, obj, data),
       listobj: obj,
       valueobj: data,
       comscope: scope
     };
+    if (obj.multiple) {
+      componObj.multiple = obj.multiple;
+    }
     if (typeof obj.compon == "string") {
       return setComponString(
         value,

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

@@ -24,7 +24,7 @@ const dataProps = {
     type: Array
   },
   /**
-   * @props {String, Number, Date, Array} modelValue/v-model 时间数据
+   * @props {String, Number, Date, Array} modelValue 时间数据
    */
   modelValue: {
     type: [String, Number, Date, Array]

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

@@ -58,7 +58,7 @@ export declare const dataProps: {
         };
     };
     /**
-     * @props {String, Number, Date, Array} modelValue/v-model 时间数据
+     * @props {String, Number, Date, Array} modelValue 时间数据
      */
     modelValue: {
         type: (DateConstructor | StringConstructor | NumberConstructor | {

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

@@ -22,7 +22,7 @@ const dataProps = {
     type: Array
   },
   /**
-   * @props {String, Number, Date, Array} modelValue/v-model 时间数据
+   * @props {String, Number, Date, Array} modelValue 时间数据
    */
   modelValue: {
     type: [String, Number, Date, Array]

package/dist/components/double/index.css

@@ -26,7 +26,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

package/dist/components/double/index.scss

@@ -5,7 +5,8 @@ $double: 'double';
 	width: 100%;
 	display: inline-flex;
 	align-items: center;
-	padding: 1px;
+	box-sizing: content-box;
+	padding: 1.2px 1px;
 	position: relative;
 	box-shadow: 0 0 0 1px
 		var(--#{e()}input-border-color, var(--#{e()}border-color)) inset;

package/dist/components/forms/index.css

@@ -53,7 +53,8 @@
   width: 100%;
   display: inline-flex;
   align-items: center;
-  padding: 1px;
+  box-sizing: content-box;
+  padding: 1.2px 1px;
   position: relative;
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));

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

@@ -5,7 +5,6 @@ const config = require("../common/config.cjs");
 const util = require("./util.cjs");
 require("../../../utils/css.cjs");
 const use = require("../../common/use.cjs");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const vue = require("vue");
 const index$1 = require("../../../hooks/compons/index.cjs");
 const index = require("../../forms-items/index.cjs");
@@ -99,15 +98,15 @@ function setUp(props, emit, cs, refForm, getLocale) {
     setListValue(props.list);
   }
   const triggerMap = {
-    "1": getLocale("form.import"),
-    "2": getLocale("form.select"),
+    blur: getLocale("form.import"),
+    change: getLocale("form.select"),
     verif: getLocale("form.verif")
   };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
       arr == null ? void 0 : arr.forEach((obj) => {
-        var _a, _b;
+        var _a;
         if (listobj) {
           obj.father = obj.father ?? listobj;
         }
@@ -115,34 +114,20 @@ function setUp(props, emit, cs, refForm, getLocale) {
           setListValue(obj.children, obj);
         }
         use.setFormDefaultValue(obj, dataForm.value);
-        let trigger = 1;
-        if (typeof obj.compon == "string") {
-          if (config.changes.includes(lineToLargeHump.lineToLargeHump(obj.compon))) {
-            trigger = 2;
-          }
-        }
         obj.config = obj.config ?? {};
-        const labeltext = obj.labelText ?? use.getLabelText(obj.label);
-        if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
-          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
-        }
-        if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
+        if (((_a = obj.config) == null ? void 0 : _a.clearable) === void 0) {
           obj.config.clearable = true;
         }
+        if (!obj.rule) {
+          util.setPlaceholder(obj, triggerMap);
+        }
         if (obj.prop) {
           const p = use.getFormRule(obj) ?? obj.prop;
           obj.__prop = p;
           if (obj.rules) {
             rules[p] = obj.rules;
           } else if (obj.rule) {
-            rules[p] = util.getRule(
-              labeltext,
-              trigger,
-              obj,
-              dataForm,
-              refForm,
-              triggerMap
-            );
+            rules[p] = util.getRule(obj, dataForm, refForm, triggerMap);
           } else {
             rules[p] = [];
           }

package/dist/components/forms/src/setup.d.ts

@@ -1,5 +1,5 @@
 import { DataProps } from './data';
-import { UseCssNameReturn } from '../../../hooks/cssname';
+import { UseCssNameReturn } from '../../../hooks/cssname/index';
 import { CSSProperties, Ref, WritableComputedRef, ComputedRef } from 'vue';
 type Emit = (...args: any[]) => void;
 export declare function setUp(props: DataProps, emit: Emit, cs: UseCssNameReturn, refForm: any, getLocale: Function): {

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

@@ -1,9 +1,8 @@
 import { dataHandle } from "./data.js";
-import { provides, changes } from "../common/config.js";
-import { getRule } from "./util.js";
+import { provides } from "../common/config.js";
+import { setPlaceholder, getRule } from "./util.js";
 import "../../../utils/css.js";
-import { setFormDefaultValue, getLabelText, getFormRule } from "../../common/use.js";
-import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
+import { setFormDefaultValue, getFormRule } from "../../common/use.js";
 import { computed, provide, isProxy, ref, watch } from "vue";
 import { useCompons } from "../../../hooks/compons/index.js";
 import { FormsItems } from "../../forms-items/index.js";
@@ -97,15 +96,15 @@ function setUp(props, emit, cs, refForm, getLocale) {
     setListValue(props.list);
   }
   const triggerMap = {
-    "1": getLocale("form.import"),
-    "2": getLocale("form.select"),
+    blur: getLocale("form.import"),
+    change: getLocale("form.select"),
     verif: getLocale("form.verif")
   };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
       arr == null ? void 0 : arr.forEach((obj) => {
-        var _a, _b;
+        var _a;
         if (listobj) {
           obj.father = obj.father ?? listobj;
         }
@@ -113,34 +112,20 @@ function setUp(props, emit, cs, refForm, getLocale) {
           setListValue(obj.children, obj);
         }
         setFormDefaultValue(obj, dataForm.value);
-        let trigger = 1;
-        if (typeof obj.compon == "string") {
-          if (changes.includes(lineToLargeHump(obj.compon))) {
-            trigger = 2;
-          }
-        }
         obj.config = obj.config ?? {};
-        const labeltext = obj.labelText ?? getLabelText(obj.label);
-        if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
-          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
-        }
-        if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
+        if (((_a = obj.config) == null ? void 0 : _a.clearable) === void 0) {
           obj.config.clearable = true;
         }
+        if (!obj.rule) {
+          setPlaceholder(obj, triggerMap);
+        }
         if (obj.prop) {
           const p = getFormRule(obj) ?? obj.prop;
           obj.__prop = p;
           if (obj.rules) {
             rules[p] = obj.rules;
           } else if (obj.rule) {
-            rules[p] = getRule(
-              labeltext,
-              trigger,
-              obj,
-              dataForm,
-              refForm,
-              triggerMap
-            );
+            rules[p] = getRule(obj, dataForm, refForm, triggerMap);
           } else {
             rules[p] = [];
           }