@fangzhongya/fang-ui 0.1.34 → 0.1.36

package/dist/components/edit-float/src/index2.cjs

@@ -19,7 +19,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const cs = index$1.useCssName(data.name);
     const prs = __props;
     const props = index$2.usePropsDefault(data.name, prs, data.dataProps);
-    index$2.viewProps(props, data.name);
     const emit = __emit;
     const isInput = vue.ref(false);
     const isIcon = vue.ref(false);
@@ -49,7 +48,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       isInput.value = false;
     }
     function onConfirm() {
-      if (props.noEmpty && !value.value) {
+      if (props.isEmpty && !value.value) {
         return false;
       }
       isIcon.value = false;
@@ -57,7 +56,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emit("update:modelValue", value.value);
     }
     function setIsIcon() {
-      if (!props.modelValue && props.noEmpty) {
+      if (!props.modelValue && props.isEmpty) {
         isIcon.value = true;
       } else {
         isIcon.value = false;

package/dist/components/edit-float/src/index2.js

@@ -7,7 +7,7 @@ import { Inputs } from "../../inputs/index.js";
 import { name, dataProps, dataExpose, dataEmits } from "./data.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useLocale } from "../../../hooks/locale/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: getProps(dataProps),
@@ -17,7 +17,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cs = useCssName(name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const isInput = ref(false);
     const isIcon = ref(false);
@@ -47,7 +46,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isInput.value = false;
     }
     function onConfirm() {
-      if (props.noEmpty && !value.value) {
+      if (props.isEmpty && !value.value) {
         return false;
       }
       isIcon.value = false;
@@ -55,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("update:modelValue", value.value);
     }
     function setIsIcon() {
-      if (!props.modelValue && props.noEmpty) {
+      if (!props.modelValue && props.isEmpty) {
         isIcon.value = true;
       } else {
         isIcon.value = false;

package/dist/components/edit-float/style/index2.scss

@@ -1 +1,5 @@
+@use '../../inputs/style/index2.scss' as *;
+@use '../../icon/style/index2.scss' as *;
+@use '../../popover/style/index2.scss' as *;
+@use '../../button/style/index2.scss' as *;
 @use '../index.scss' as *;

package/dist/components/form/index.d.ts

@@ -2,4 +2,5 @@ import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 export * from './src/export';
 declare const Form: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Form, Form as default };
+export { Form };
+export default Form;

package/dist/components/form/index.scss

@@ -2,4 +2,5 @@
 
 $form: 'form';
 @include b($form) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/form-item/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const FormItem: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { FormItem, FormItem as default };
+export { FormItem };
+export default FormItem;

package/dist/components/form-item/index.scss

@@ -2,4 +2,5 @@
 
 $form-item: 'form-item';
 @include b($form-item) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/forms/index.css

@@ -3,7 +3,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;
@@ -49,7 +49,7 @@
   display: grid;
 }
 
-.array {
+.double {
   width: 100%;
   display: inline-flex;
   align-items: center;
@@ -58,10 +58,10 @@
   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));
 }
-.array.is-focus {
+.double.is-focus {
   box-shadow: 0 0 0 1px var(--color-primary) inset;
 }
-.array-error {
+.double-error {
   position: absolute;
   bottom: -23px;
   color: #f00;
@@ -69,40 +69,40 @@
   border-radius: 4px;
   left: 12px;
 }
-.array-error.type-1 {
+.double-error.type-1 {
   left: calc(50% + 24px);
 }
-.array-error.type-1.is-clear {
+.double-error.type-1.is-clear {
   left: calc(50% + 11px);
 }
-.array-focus {
+.double-focus {
   position: absolute;
   z-index: -1;
   opacity: 0;
 }
-.array-value {
+.double-value {
   flex: 1;
   height: 100%;
 }
-.array-range {
+.double-range {
   padding: 0 5px;
 }
-.array-clear {
+.double-clear {
   cursor: pointer;
   align-items: center;
   display: inline-flex;
   justify-content: center;
   padding: 5px;
 }
-.array-clear svg {
+.double-clear svg {
   width: 1rem;
   height: 1rem;
 }
-.array .el-input .el-input__wrapper {
+.double .el-input .el-input__wrapper {
   border: none;
   box-shadow: none;
 }
-.array .el-input .el-input__wrapper input {
+.double .el-input .el-input__wrapper input {
   text-align: center;
 }
 
@@ -506,7 +506,7 @@
   display: none;
   align-items: center;
   justify-content: center;
-  color: #fff;
+  color: #ffffff;
 }
 .uploads-list-li-operation > span {
   font-size: 16px;
@@ -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/forms/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Forms: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Forms, Forms as default };
+export { Forms };
+export default Forms;

package/dist/components/forms/index.scss

@@ -72,6 +72,9 @@ $forms: 'forms';
 			.#{e()}form-item {
 				margin-bottom: 0;
 				flex: 1;
+				.#{z('selects', 'select')} {
+					min-width: 120px;
+				}
 			}
 		}
 	}

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

@@ -9,9 +9,9 @@ const index$7 = require("../../form-item/index.cjs");
 const index$8 = require("../../button/index.cjs");
 const index$3 = require("../../../hooks/cssname/index.cjs");
 const index$1 = require("../../../hooks/inherit/index.cjs");
+const index = require("../../../hooks/locale/index.cjs");
 const use = require("../../common/use.cjs");
 const setup = require("./setup.cjs");
-const index = require("../../../hooks/locale/index.cjs");
 const index$2 = require("../../../hooks/props-default/index.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ inheritAttrs: false },
@@ -24,7 +24,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const attrs = index$1.useInherit(vue.useAttrs(), data.name);
     const prs = __props;
     const props = index$2.usePropsDefault(data.name, prs, data.dataProps);
-    index$2.viewProps(props, data.name);
     const emit = __emit;
     const cs = index$3.useCssName(data.name);
     const refForm = vue.ref();
@@ -133,7 +132,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                       return {
                         name: k,
                         fn: vue.withCtx((scope) => [
-                          vue.renderSlot(_ctx.$slots, k, vue.mergeProps({ ref_for: true }, scope))
+                          vue.renderSlot(_ctx.$slots, k, vue.mergeProps({ ref_for: true }, scope || {}))
                         ])
                       };
                     })
@@ -150,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                       return {
                         name: k,
                         fn: vue.withCtx((scope) => [
-                          vue.renderSlot(_ctx.$slots, k, vue.mergeProps({ ref_for: true }, scope))
+                          vue.renderSlot(_ctx.$slots, k, vue.mergeProps({ ref_for: true }, scope || {}))
                         ])
                       };
                     })

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

@@ -7,10 +7,10 @@ import { FormItem } from "../../form-item/index.js";
 import { Button } from "../../button/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
+import { useLocale } from "../../../hooks/locale/index.js";
 import { useHide } from "../../common/use.js";
 import { setUp } from "./setup.js";
-import { useLocale } from "../../../hooks/locale/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ inheritAttrs: false },
   __name: "index",
@@ -22,7 +22,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const attrs = useInherit(useAttrs(), name);
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const emit = __emit;
     const cs = useCssName(name);
     const refForm = ref();
@@ -131,7 +130,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       return {
                         name: k,
                         fn: withCtx((scope) => [
-                          renderSlot(_ctx.$slots, k, mergeProps({ ref_for: true }, scope))
+                          renderSlot(_ctx.$slots, k, mergeProps({ ref_for: true }, scope || {}))
                         ])
                       };
                     })
@@ -148,7 +147,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       return {
                         name: k,
                         fn: withCtx((scope) => [
-                          renderSlot(_ctx.$slots, k, mergeProps({ ref_for: true }, scope))
+                          renderSlot(_ctx.$slots, k, mergeProps({ ref_for: true }, scope || {}))
                         ])
                       };
                     })

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

@@ -5,12 +5,11 @@ const config = require("../common/config.cjs");
 const util = require("./util.cjs");
 require("../../../utils/css.cjs");
 const use = require("../../common/use.cjs");
-require("../../../utils/index.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");
 const setObjStyle = require("@fangzhongya/utils/css/setObjStyle");
-const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const Components = {
   Items: index.FormsItems
 };
@@ -73,10 +72,8 @@ function setUp(props, emit, cs, refForm, getLocale) {
     const width = v.width ?? props.rowWidth;
     if (width) {
       obj.width = width;
-    } else {
-      if (props.column > 1) {
-        obj.width = Number((100 / props.column).toFixed(2)) + "%";
-      }
+    } else if (props.column > 1) {
+      obj.width = Number((100 / props.column).toFixed(2)) + "%";
     }
     if (minWidth) {
       obj.minWidth = minWidth;
@@ -101,6 +98,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
     };
     setListValue(props.list);
   }
+  const triggerMap = {
+    "1": getLocale("form.import"),
+    "2": getLocale("form.select"),
+    verif: getLocale("form.verif")
+  };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
@@ -122,7 +124,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
         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 = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + labeltext;
+          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
         }
         if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
           obj.config.clearable = true;
@@ -139,7 +141,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
               obj,
               dataForm,
               refForm,
-              getLocale
+              triggerMap
             );
           } else {
             rules[p] = [];
@@ -164,11 +166,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
           if (valid) {
             resolve(dataForm.value);
           } else {
-            reject();
+            reject(new Error(getLocale("form.verif")));
           }
         });
       } else {
-        reject();
+        reject(new Error(getLocale("form.verif")));
       }
     });
   }
@@ -213,12 +215,10 @@ function setUp(props, emit, cs, refForm, getLocale) {
       submitForm();
     } else if (obj._id == 2) {
       closeForm();
+    } else if (obj.click) {
+      obj.click(obj, dataForm.value, index2, event);
     } else {
-      if (obj.click) {
-        obj.click(obj, dataForm.value, index2, event);
-      } else {
-        emit("buts", obj, dataForm.value, index2, event);
-      }
+      emit("buts", obj, dataForm.value, index2, event);
     }
   }
   if (props.query) {

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

@@ -3,12 +3,11 @@ import { provides, changes } from "../common/config.js";
 import { getRule } from "./util.js";
 import "../../../utils/css.js";
 import { setFormDefaultValue, getLabelText, getFormRule } from "../../common/use.js";
-import "../../../utils/index.js";
+import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 import { computed, provide, isProxy, ref, watch } from "vue";
 import { useCompons } from "../../../hooks/compons/index.js";
 import { FormsItems } from "../../forms-items/index.js";
 import { setObjStyle } from "@fangzhongya/utils/css/setObjStyle";
-import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 const Components = {
   Items: FormsItems
 };
@@ -71,10 +70,8 @@ function setUp(props, emit, cs, refForm, getLocale) {
     const width = v.width ?? props.rowWidth;
     if (width) {
       obj.width = width;
-    } else {
-      if (props.column > 1) {
-        obj.width = Number((100 / props.column).toFixed(2)) + "%";
-      }
+    } else if (props.column > 1) {
+      obj.width = Number((100 / props.column).toFixed(2)) + "%";
     }
     if (minWidth) {
       obj.minWidth = minWidth;
@@ -99,6 +96,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
     };
     setListValue(props.list);
   }
+  const triggerMap = {
+    "1": getLocale("form.import"),
+    "2": getLocale("form.select"),
+    verif: getLocale("form.verif")
+  };
   function getRules() {
     const rules = {};
     const setListValue = (arr, listobj) => {
@@ -120,7 +122,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
         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 = (trigger == 1 ? getLocale("form.import") : getLocale("form.select")) + labeltext;
+          obj.config.placeholder = triggerMap[trigger + ""] + labeltext;
         }
         if (((_b = obj.config) == null ? void 0 : _b.clearable) === void 0) {
           obj.config.clearable = true;
@@ -137,7 +139,7 @@ function setUp(props, emit, cs, refForm, getLocale) {
               obj,
               dataForm,
               refForm,
-              getLocale
+              triggerMap
             );
           } else {
             rules[p] = [];
@@ -162,11 +164,11 @@ function setUp(props, emit, cs, refForm, getLocale) {
           if (valid) {
             resolve(dataForm.value);
           } else {
-            reject();
+            reject(new Error(getLocale("form.verif")));
           }
         });
       } else {
-        reject();
+        reject(new Error(getLocale("form.verif")));
       }
     });
   }
@@ -211,12 +213,10 @@ function setUp(props, emit, cs, refForm, getLocale) {
       submitForm();
     } else if (obj._id == 2) {
       closeForm();
+    } else if (obj.click) {
+      obj.click(obj, dataForm.value, index, event);
     } else {
-      if (obj.click) {
-        obj.click(obj, dataForm.value, index, event);
-      } else {
-        emit("buts", obj, dataForm.value, index, event);
-      }
+      emit("buts", obj, dataForm.value, index, event);
     }
   }
   if (props.query) {

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

@@ -25,116 +25,115 @@ function isValue(value) {
   }
   return true;
 }
-function getRule(name, trigger, obj, data, refForm, getLocale) {
+function getRule(name, trigger, obj, data, refForm, triggerMap) {
   var _a;
   let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
-  const rule = obj.rule;
   if (typeof multiple != "boolean") {
     multiple = false;
   }
-  let required = true;
+  const param = {
+    name,
+    multiple,
+    obj,
+    data,
+    refForm,
+    triggerMap
+  };
+  const rule = obj.rule;
+  let verif = triggerMap.verif + name;
+  const arr = [];
+  if (Array.isArray(rule)) {
+    for (const v of rule) {
+      arr.push(
+        getRuleObj(
+          (v == null ? void 0 : v.type) ?? trigger,
+          obj.required ?? (v == null ? void 0 : v.must),
+          (v == null ? void 0 : v.error) || verif,
+          v == null ? void 0 : v.judge,
+          param
+        )
+      );
+    }
+    return arr;
+  }
   let jyjudgev = "";
-  switch (typeof rule) {
-    case "string":
-      jyjudgev = rule;
-      required = false;
-      break;
-    case "number":
-      required = true;
-      trigger = rule;
-      break;
-    case "boolean":
-      required = true;
-      break;
-    case "object":
-      if (rule) {
-        trigger = rule.type ?? trigger;
-        required = rule.must ?? true;
-        jyjudgev = rule.judge;
-      }
-      break;
-    default:
-      break;
+  let finalTrigger = trigger;
+  let required = true;
+  if (typeof rule === "string") {
+    jyjudgev = rule;
+    required = false;
+  } else if (typeof rule === "number") {
+    finalTrigger = rule;
+  } else if (typeof rule === "boolean") {
+    required = rule;
+  } else if (rule && typeof rule === "object") {
+    finalTrigger = rule.type ?? finalTrigger;
+    required = rule.must;
+    jyjudgev = rule.judge;
+    verif = rule.error || verif;
   }
   required = obj.required ?? required;
-  let inputPrompt = trigger == 1 ? getLocale("form.import") : getLocale("form.select");
-  const verif = getLocale("form.verif");
-  let validator = function(rule2, value, callback) {
+  arr.push(getRuleObj(finalTrigger, required, verif, jyjudgev, param));
+  return arr;
+}
+function getRuleObj(finalTrigger, required, verif, jyjudgev, param) {
+  const { triggerMap, name, multiple, obj, data, refForm } = param;
+  const inputPrompt = triggerMap[finalTrigger + ""] + name;
+  let validator = function(rule, value, callback) {
     callback();
   };
   if (jyjudgev) {
     let isJudgeFailed = function(value) {
       return false;
     };
-    let processCallback = function(callback, value, data2, refForm2, obj2) {
-      callback();
-    };
     if (typeof jyjudgev == "string") {
-      let judgeFun = judge__namespace[jyjudgev] ?? function(value) {
-        return true;
-      };
+      const judgeFun = judge__namespace[jyjudgev] ?? (() => true);
       isJudgeFailed = function(value) {
         return !judgeFun(value);
       };
-    } else {
-      processCallback = jyjudgev;
     }
     if (required) {
-      validator = function(rule2, value, callback) {
+      validator = function(_rule, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
-        } else if (isValue(value)) {
-          callback(new Error(inputPrompt + name));
-        } else if (multiple && value.length == 0) {
-          callback(new Error(inputPrompt + name));
+        } else if (isValue(value) || multiple && value.length == 0) {
+          callback(new Error(inputPrompt));
         } else if (isJudgeFailed(value)) {
-          callback(new Error(name + verif));
+          callback(new Error(verif));
+        } else if (typeof jyjudgev === "function") {
+          jyjudgev(callback, value, data.value, refForm.value, obj);
         } else {
-          processCallback(
-            callback,
-            value,
-            data.value,
-            refForm.value,
-            obj
-          );
+          callback();
         }
       };
     } else {
-      validator = function(rule2, value, callback) {
+      validator = function(_rule, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
         } else if (isJudgeFailed(value)) {
-          callback(new Error(name + verif));
-        } else {
-          processCallback(
-            callback,
-            value,
-            data.value,
-            refForm.value,
-            obj
-          );
-        }
-      };
-    }
-  } else {
-    if (required) {
-      validator = function(rule2, value, callback) {
-        if (use.useHide(obj, data.value)) {
-          callback();
-        } else if (isValue(value)) {
-          callback(new Error(inputPrompt + name));
-        } else if (multiple && value.length == 0) {
-          callback(new Error(inputPrompt + name));
+          callback(new Error(verif));
+        } else if (typeof jyjudgev === "function") {
+          jyjudgev(callback, value, data.value, refForm.value, obj);
         } else {
           callback();
         }
       };
     }
+  } else if (required) {
+    validator = function(_rule, value, callback) {
+      if (use.useHide(obj, data.value)) {
+        callback();
+      } else if (isValue(value) || multiple && value.length == 0) {
+        callback(new Error(inputPrompt));
+      } else {
+        callback();
+      }
+    };
   }
   return {
     required,
     validator,
-    trigger: trigger == 1 ? "blur" : "change"
+    trigger: finalTrigger == 1 ? "blur" : "change"
   };
 }
 exports.getRule = getRule;

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

@@ -18,5 +18,5 @@ export type Rules = {
  * @param {any} refForm 表单引用
  * @returns {{ required: boolean, validator: Function, trigger: string }}
  */
-export declare function getRule(name: string, trigger: number, obj: ListObj, data: any, refForm: any, getLocale: Function): Rule;
+export declare function getRule(name: string, trigger: number, obj: ListObj, data: any, refForm: any, triggerMap: ObjStr): Rule[];
 export {};