@fangzhongya/fang-ui 0.1.45 → 0.1.47

package/dist/components/forms/index.css

@@ -48,6 +48,9 @@
   min-height: var(--forms-item-row-height);
   display: grid;
 }
+.forms-item-el-item.is-error .double {
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+}
 
 .forms-items {
   width: 100%;
@@ -67,26 +70,63 @@
   --el-color-danger: var(--el-input-focus-border);
 }
 
+.icon {
+  --color: inherit;
+  height: 1em;
+  width: 1em;
+  line-height: 1em;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  fill: currentColor;
+  color: var(--color);
+  font-size: inherit;
+}
+.icon-cont {
+  border: 0;
+  display: inline-flex;
+  align-items: center;
+  object-fit: contain;
+  justify-content: center;
+  font-size: inherit !important;
+  width: inherit !important;
+  height: inherit !important;
+}
+
 .double {
   width: 100%;
   display: inline-flex;
   align-items: center;
-  box-sizing: content-box;
-  padding: 1.2px 1px;
+  box-sizing: border-box;
+  padding: 1px 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));
 }
 .double.is-focus {
-  box-shadow: 0 0 0 1px var(--color-primary) inset;
+  box-shadow: 0 0 0 1px var(--el-color-primary) inset;
+}
+.double.is-error {
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+}
+.double.is-disabled {
+  cursor: not-allowed;
+  background-color: var(--el-disabled-bg-color);
+}
+.double.is-disabled .double-range {
+  color: var(--el-disabled-text-color);
 }
 .double-error {
   position: absolute;
-  bottom: -23px;
-  color: #f00;
-  font-size: 0.8rem;
+  padding-top: 2px;
+  color: var(--el-color-danger);
+  bottom: -15px;
+  font-size: 12px;
+  line-height: 1;
   border-radius: 4px;
   left: 12px;
+  white-space: nowrap;
 }
 .double-error.type-1 {
   left: calc(50% + 24px);
@@ -102,6 +142,8 @@
 .double-value {
   flex: 1;
   height: 100%;
+  display: flex;
+  align-items: center;
 }
 .double-range {
   padding: 0 5px;
@@ -113,10 +155,6 @@
   justify-content: center;
   padding: 5px;
 }
-.double-clear svg {
-  width: 1rem;
-  height: 1rem;
-}
 .double .el-input .el-input__wrapper {
   border: none;
   box-shadow: none;
@@ -164,171 +202,34 @@
   height: 100%;
 }
 
-.buttons-li {
-  height: inherit;
-}
-
 .dates-divide {
   display: inline-flex;
   align-items: center;
+  width: 100%;
 }
 .dates-divide-range {
   padding: 0 10px;
 }
-
-.dates2 .dates2-date {
+.dates-divide .dates-divide-date {
   height: 100%;
   width: 100%;
   box-sizing: border-box;
 }
-.dates2 .dates2-separate {
-  display: flex;
-  align-items: center;
-}
-
-.edit-float-body {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-}
-.edit-float-value {
-  min-width: 3px;
-}
-.edit-float-icon {
-  margin-left: 4px;
-  cursor: pointer;
-}
-.edit-float-input {
-  padding: 10px 0;
-}
-.edit-float-but {
-  text-align: right;
-}
 
-.edit {
-  display: inline-flex;
-  align-items: center;
-}
-.edit-value {
-  display: inline-block;
-  min-width: 3px;
-}
-.edit-icon {
-  display: inline-flex;
-  align-items: center;
+.dates-picker .dates-picker-date {
   height: 100%;
-  min-width: 3px;
-  font-size: 16px;
-  margin: 0 4px;
-  cursor: pointer;
-}
-
-.history {
-  display: flex;
-}
-.history-icon {
-  cursor: pointer;
-}
-.history-icon.is-disabled {
-  opacity: 0.4;
-  cursor: not-allowed;
-}
-
-.images-img {
   width: 100%;
-  height: 100%;
+  box-sizing: border-box;
 }
-
-.input-array {
-  width: 100%;
-  display: inline-flex;
+.dates-picker .dates-picker-separate {
+  display: flex;
   align-items: center;
-  padding: 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));
-}
-.input-array.is-focus {
-  box-shadow: 0 0 0 1px var(--color-primary) inset;
-}
-.input-array-focus {
-  position: absolute;
-  z-index: -1;
-  opacity: 0;
-}
-.input-array-input {
-  height: 100%;
-  flex: 1;
-}
-.input-array-range {
-  padding: 0 5px;
-}
-.input-array-icon {
-  cursor: pointer;
-}
-.input-array-icon svg {
-  width: 1rem;
-  height: 1rem;
-}
-.input-array .el-input .el-input__wrapper {
-  border: none;
-  box-shadow: none;
-}
-.input-array .el-input .el-input__wrapper input {
-  text-align: center;
 }
 
-.input-history {
-  display: flex;
-}
-.input-history-popper {
-  padding: 6px 0 !important;
-}
-.input-history-select {
-  max-height: 274px;
+.input-select {
   height: 100%;
-  overflow-y: auto;
-}
-.input-history-select-ul {
-  list-style: none;
-  margin: 6px 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-.input-history-select-ul .input-history-select-li {
-  padding: 0 32px 0 20px;
-  position: relative;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: #606266;
-  height: 34px;
-  line-height: 34px;
-  box-sizing: border-box;
-  cursor: pointer;
-}
-.input-history-select-ul .input-history-select-li.hover, .input-history-select-ul .input-history-select-li:hover {
-  background-color: #f5f7fa;
-}
-.input-history-select-ul .input-history-select-li.hover .input-history-select-li-clean, .input-history-select-ul .input-history-select-li:hover .input-history-select-li-clean {
-  display: inline-flex;
-}
-.input-history-select-ul .input-history-select-li.selected {
-  color: var(--bv-color-primary);
-  font-weight: 700;
-}
-.input-history-select-ul .input-history-select-li.is-disabled {
-  background-color: #ffffff;
-  color: #a8abb2;
-  cursor: not-allowed;
-}
-.input-history-select-ul .input-history-select-li-clean {
-  align-items: center;
-  justify-content: center;
-  display: none;
-  margin-left: 5px;
+  width: 100%;
 }
-
 .input-select-select-icon {
   margin-left: 8px;
   display: inline-flex;
@@ -342,13 +243,13 @@
 .input-select-select-icon.is-reverse {
   transform: rotate(-180deg);
 }
-.input-select-select-icon svg {
-  width: 1rem;
-  height: 1rem;
-}
 .input-select.is-disabled .input-select-select-icon {
   cursor: not-allowed;
 }
+.input-select-input {
+  height: 100%;
+  width: 100%;
+}
 .input-select-popper {
   padding: 6px 0 !important;
 }
@@ -376,11 +277,11 @@
   cursor: pointer;
 }
 .input-select-popper .input-select-select .input-select-select-li.hover, .input-select-popper .input-select-select .input-select-select-li:hover {
-  background-color: #f5f7fa;
+  background-color: var(--el-fill-color-light);
 }
 .input-select-popper .input-select-select .input-select-select-li.selected {
-  color: var(--bv-color-primary);
-  font-weight: 700;
+  color: var(--el-color-primary);
+  font-weight: bold;
 }
 .input-select-popper .input-select-select .input-select-select-li.is-disabled {
   background-color: #ffffff;
@@ -443,6 +344,11 @@
 .selector-popper.el-popover.el-popper {
   padding: 0;
 }
+.selector-double {
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+}
 .selector-select {
   padding: 5px 10px;
   z-index: 1000;
@@ -474,10 +380,16 @@
   height: 100%;
   width: 100%;
 }
+.cascaders-cascader .el-input {
+  height: 100%;
+}
 .cascaders-tree {
   height: 100%;
   width: 100%;
 }
+.cascaders-tree .el-select__wrapper {
+  height: 100%;
+}
 
 .input-num-input {
   height: 100%;

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

@@ -3,12 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const data = require("./data.cjs");
 const config = require("../common/config.cjs");
 const util = require("./util.cjs");
-require("../../../utils/css.cjs");
+const setObjStyle = require("@fangzhongya/utils/css/setObjStyle");
 const use = require("../../common/use.cjs");
 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 Components = {
   Items: index.FormsItems
 };

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

@@ -1,12 +1,11 @@
 import { dataHandle } from "./data.js";
 import { provides } from "../common/config.js";
 import { setPlaceholder, getRule } from "./util.js";
-import "../../../utils/css.js";
+import { setObjStyle } from "@fangzhongya/utils/css/setObjStyle";
 import { setFormDefaultValue, getListObjValue, 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";
-import { setObjStyle } from "@fangzhongya/utils/css/setObjStyle";
 const Components = {
   Items: FormsItems
 };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const judge = require("@fangzhongya/utils/judge/judge");
+const check = require("@fangzhongya/utils/judge/judge");
 const config = require("../common/config.cjs");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
 const use = require("../../common/use.cjs");
@@ -20,8 +20,11 @@ function _interopNamespaceDefault(e) {
   n.default = e;
   return Object.freeze(n);
 }
-const judge__namespace = /* @__PURE__ */ _interopNamespaceDefault(judge);
+const check__namespace = /* @__PURE__ */ _interopNamespaceDefault(check);
 function isValue(value) {
+  if (Array.isArray(value) && value.length === 0) {
+    return true;
+  }
   if (value || value === 0 || value === false) {
     return false;
   }
@@ -53,15 +56,9 @@ function setPlaceholder(obj, triggerMap) {
   }
 }
 function getRule(obj, data, refForm, triggerMap) {
-  var _a;
-  let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
-  if (typeof multiple != "boolean") {
-    multiple = false;
-  }
   const name = use.getLabelText(obj);
   const param = {
     name,
-    multiple,
     obj,
     data,
     refForm,
@@ -84,17 +81,17 @@ function getRule(obj, data, refForm, triggerMap) {
           (v == null ? void 0 : v.trigger) ?? trigger,
           obj.required ?? (v == null ? void 0 : v.required),
           (v == null ? void 0 : v.error) || verif,
-          getLinkageJudge(v.judge, v.linkage)
+          getLinkagecheck(v.check, v.linkage)
         )
       );
     }
     return arr;
   }
-  let jyjudgev = "";
+  let jycheckv = "";
   let required = false;
   if (typeof rule === "string") {
     required = true;
-    jyjudgev = rule;
+    jycheckv = rule;
   } else if (typeof rule === "number") {
     required = true;
     trigger = getTrigger(rule) ?? trigger;
@@ -103,14 +100,14 @@ function getRule(obj, data, refForm, triggerMap) {
   } else if (rule && typeof rule === "object") {
     required = rule.required ?? false;
     trigger = getTrigger(rule.trigger) ?? trigger;
-    jyjudgev = getLinkageJudge(rule.judge, rule.linkage);
+    jycheckv = getLinkagecheck(rule.check, rule.linkage);
     verif = rule.error || verif;
   }
   required = obj.required ?? required;
-  arr.push(getRuleObj(param, trigger, required, verif, jyjudgev));
+  arr.push(getRuleObj(param, trigger, required, verif, jycheckv));
   return arr;
 }
-function getLinkageJudge(jyjudgev, linkage) {
+function getLinkagecheck(jycheckv, linkage) {
   if (linkage) {
     if (typeof linkage == "string") {
       return function(callback, _val, _data, refForm) {
@@ -120,9 +117,9 @@ function getLinkageJudge(jyjudgev, linkage) {
       };
     } else {
       const prop = linkage.prop;
-      const judge2 = linkage.judge;
+      const check2 = linkage.check;
       return function(callback, val, data, refForm) {
-        const v = judge2 == null ? void 0 : judge2(val, data);
+        const v = check2 == null ? void 0 : check2(val, data);
         if (v) {
           callback(new Error(v));
         } else if (prop) {
@@ -135,11 +132,11 @@ function getLinkageJudge(jyjudgev, linkage) {
       };
     }
   }
-  return jyjudgev;
+  return jycheckv;
 }
-function getRuleObj(param, trigger, required, verif, jyjudgev) {
+function getRuleObj(param, trigger, required, verif, jycheckv) {
   var _a;
-  const { triggerMap, name, multiple, obj, data, refForm } = param;
+  const { triggerMap, name, obj, data, refForm } = param;
   const inputPrompt = triggerMap[Array.isArray(trigger) ? trigger[0] : trigger] + name;
   if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
     obj.config.placeholder = inputPrompt;
@@ -147,26 +144,26 @@ function getRuleObj(param, trigger, required, verif, jyjudgev) {
   let validator = function(rule, value, callback) {
     callback();
   };
-  if (jyjudgev) {
-    let isJudgeFailed = function(value) {
+  if (jycheckv) {
+    let ischeckFailed = function(value) {
       return false;
     };
-    if (typeof jyjudgev == "string") {
-      const judgeFun = judge__namespace[jyjudgev] ?? (() => true);
-      isJudgeFailed = function(value) {
-        return !judgeFun(value);
+    if (typeof jycheckv == "string") {
+      const checkFun = check__namespace[jycheckv] ?? (() => true);
+      ischeckFailed = function(value) {
+        return !checkFun(value);
       };
     }
     if (required) {
       validator = function(_rule, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
-        } else if (isValue(value) || multiple && value.length == 0) {
+        } else if (isValue(value)) {
           callback(new Error(inputPrompt));
-        } else if (isJudgeFailed(value)) {
+        } else if (ischeckFailed(value)) {
           callback(new Error(verif));
-        } else if (typeof jyjudgev === "function") {
-          jyjudgev(callback, value, data.value, refForm.value, obj);
+        } else if (typeof jycheckv === "function") {
+          jycheckv(callback, value, data.value, refForm.value, obj);
         } else {
           callback();
         }
@@ -175,10 +172,10 @@ function getRuleObj(param, trigger, required, verif, jyjudgev) {
       validator = function(_rule, value, callback) {
         if (use.useHide(obj, data.value)) {
           callback();
-        } else if (isJudgeFailed(value)) {
+        } else if (ischeckFailed(value)) {
           callback(new Error(verif));
-        } else if (typeof jyjudgev === "function") {
-          jyjudgev(callback, value, data.value, refForm.value, obj);
+        } else if (typeof jycheckv === "function") {
+          jycheckv(callback, value, data.value, refForm.value, obj);
         } else {
           callback();
         }
@@ -188,7 +185,7 @@ function getRuleObj(param, trigger, required, verif, jyjudgev) {
     validator = function(_rule, value, callback) {
       if (use.useHide(obj, data.value)) {
         callback();
-      } else if (isValue(value) || multiple && value.length == 0) {
+      } else if (isValue(value)) {
         callback(new Error(inputPrompt));
       } else {
         callback();

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

@@ -1,8 +1,11 @@
-import * as judge from "@fangzhongya/utils/judge/judge";
+import * as check from "@fangzhongya/utils/judge/judge";
 import { changes } from "../common/config.js";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
 import { getLabelText, useHide } from "../../common/use.js";
 function isValue(value) {
+  if (Array.isArray(value) && value.length === 0) {
+    return true;
+  }
   if (value || value === 0 || value === false) {
     return false;
   }
@@ -34,15 +37,9 @@ function setPlaceholder(obj, triggerMap) {
   }
 }
 function getRule(obj, data, refForm, triggerMap) {
-  var _a;
-  let multiple = obj.multiple ?? ((_a = obj.config) == null ? void 0 : _a.multiple);
-  if (typeof multiple != "boolean") {
-    multiple = false;
-  }
   const name = getLabelText(obj);
   const param = {
     name,
-    multiple,
     obj,
     data,
     refForm,
@@ -65,17 +62,17 @@ function getRule(obj, data, refForm, triggerMap) {
           (v == null ? void 0 : v.trigger) ?? trigger,
           obj.required ?? (v == null ? void 0 : v.required),
           (v == null ? void 0 : v.error) || verif,
-          getLinkageJudge(v.judge, v.linkage)
+          getLinkagecheck(v.check, v.linkage)
         )
       );
     }
     return arr;
   }
-  let jyjudgev = "";
+  let jycheckv = "";
   let required = false;
   if (typeof rule === "string") {
     required = true;
-    jyjudgev = rule;
+    jycheckv = rule;
   } else if (typeof rule === "number") {
     required = true;
     trigger = getTrigger(rule) ?? trigger;
@@ -84,14 +81,14 @@ function getRule(obj, data, refForm, triggerMap) {
   } else if (rule && typeof rule === "object") {
     required = rule.required ?? false;
     trigger = getTrigger(rule.trigger) ?? trigger;
-    jyjudgev = getLinkageJudge(rule.judge, rule.linkage);
+    jycheckv = getLinkagecheck(rule.check, rule.linkage);
     verif = rule.error || verif;
   }
   required = obj.required ?? required;
-  arr.push(getRuleObj(param, trigger, required, verif, jyjudgev));
+  arr.push(getRuleObj(param, trigger, required, verif, jycheckv));
   return arr;
 }
-function getLinkageJudge(jyjudgev, linkage) {
+function getLinkagecheck(jycheckv, linkage) {
   if (linkage) {
     if (typeof linkage == "string") {
       return function(callback, _val, _data, refForm) {
@@ -101,9 +98,9 @@ function getLinkageJudge(jyjudgev, linkage) {
       };
     } else {
       const prop = linkage.prop;
-      const judge2 = linkage.judge;
+      const check2 = linkage.check;
       return function(callback, val, data, refForm) {
-        const v = judge2 == null ? void 0 : judge2(val, data);
+        const v = check2 == null ? void 0 : check2(val, data);
         if (v) {
           callback(new Error(v));
         } else if (prop) {
@@ -116,11 +113,11 @@ function getLinkageJudge(jyjudgev, linkage) {
       };
     }
   }
-  return jyjudgev;
+  return jycheckv;
 }
-function getRuleObj(param, trigger, required, verif, jyjudgev) {
+function getRuleObj(param, trigger, required, verif, jycheckv) {
   var _a;
-  const { triggerMap, name, multiple, obj, data, refForm } = param;
+  const { triggerMap, name, obj, data, refForm } = param;
   const inputPrompt = triggerMap[Array.isArray(trigger) ? trigger[0] : trigger] + name;
   if (((_a = obj.config) == null ? void 0 : _a.placeholder) === void 0) {
     obj.config.placeholder = inputPrompt;
@@ -128,26 +125,26 @@ function getRuleObj(param, trigger, required, verif, jyjudgev) {
   let validator = function(rule, value, callback) {
     callback();
   };
-  if (jyjudgev) {
-    let isJudgeFailed = function(value) {
+  if (jycheckv) {
+    let ischeckFailed = function(value) {
       return false;
     };
-    if (typeof jyjudgev == "string") {
-      const judgeFun = judge[jyjudgev] ?? (() => true);
-      isJudgeFailed = function(value) {
-        return !judgeFun(value);
+    if (typeof jycheckv == "string") {
+      const checkFun = check[jycheckv] ?? (() => true);
+      ischeckFailed = function(value) {
+        return !checkFun(value);
       };
     }
     if (required) {
       validator = function(_rule, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
-        } else if (isValue(value) || multiple && value.length == 0) {
+        } else if (isValue(value)) {
           callback(new Error(inputPrompt));
-        } else if (isJudgeFailed(value)) {
+        } else if (ischeckFailed(value)) {
           callback(new Error(verif));
-        } else if (typeof jyjudgev === "function") {
-          jyjudgev(callback, value, data.value, refForm.value, obj);
+        } else if (typeof jycheckv === "function") {
+          jycheckv(callback, value, data.value, refForm.value, obj);
         } else {
           callback();
         }
@@ -156,10 +153,10 @@ function getRuleObj(param, trigger, required, verif, jyjudgev) {
       validator = function(_rule, value, callback) {
         if (useHide(obj, data.value)) {
           callback();
-        } else if (isJudgeFailed(value)) {
+        } else if (ischeckFailed(value)) {
           callback(new Error(verif));
-        } else if (typeof jyjudgev === "function") {
-          jyjudgev(callback, value, data.value, refForm.value, obj);
+        } else if (typeof jycheckv === "function") {
+          jycheckv(callback, value, data.value, refForm.value, obj);
         } else {
           callback();
         }
@@ -169,7 +166,7 @@ function getRuleObj(param, trigger, required, verif, jyjudgev) {
     validator = function(_rule, value, callback) {
       if (useHide(obj, data.value)) {
         callback();
-      } else if (isValue(value) || multiple && value.length == 0) {
+      } else if (isValue(value)) {
         callback(new Error(inputPrompt));
       } else {
         callback();

package/dist/components/forms-item/index.css

@@ -46,4 +46,7 @@
 .forms-item-el-item.is-top .el-form-item__content {
   min-height: var(--forms-item-row-height);
   display: grid;
+}
+.forms-item-el-item.is-error .double {
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
 }

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

@@ -20,5 +20,10 @@ $forms-item: 'forms-item';
 				display: grid;
 			}
 		}
+		&.#{is('error ')} {
+			.#{z('double')} {
+				box-shadow: 0 0 0 1px var(ve('color-danger')) inset;
+			}
+		}
 	}
 }