@deppon/deppon-template 2.3.3 → 2.3.6

package/es/pro-field/components/TagInput/FieldTagInput.vue.css

@@ -12,38 +12,42 @@
   row-gap: 8px;
 }
 .field-tag-input .tag-input-input-row .tag-input-input-wrap {
-  display: inline-flex;
+  display: flex;
   align-items: stretch;
-  border-radius: var(--el-border-radius-base, 4px);
-  border: 1px solid var(--el-border-color, #dcdfe6);
-  background: var(--el-fill-color-blank, #fff);
-  transition: border-color 0.2s, box-shadow 0.2s;
-}
-.field-tag-input .tag-input-input-row .tag-input-input-wrap:focus-within {
-  border-color: var(--el-color-primary);
-  box-shadow: 0 0 0 2px var(--el-color-primary-light-7, rgba(64, 158, 255, 0.2));
+  flex: 1 1 360px;
+  width: 100%;
+  max-width: 100%;
+  min-width: 0;
 }
 .field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-input {
-  width: 200px;
-  border: none;
+  width: 100%;
+  min-width: 0;
 }
-.field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-input .el-input__wrapper {
+.field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-input .el-input,
+.field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-input .el-input-group,
+.field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-input .el-input-group--append {
+  width: 100%;
+  max-width: 100%;
+}
+.field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-input .el-input-group__append {
+  padding: 0;
   border: none;
-  box-shadow: none;
-  border-radius: var(--el-border-radius-base, 4px) 0 0 var(--el-border-radius-base, 4px);
+  background: transparent;
 }
 .field-tag-input .tag-input-input-row .tag-input-input-wrap .tag-input-add-btn {
-  border-radius: 0 var(--el-border-radius-base, 4px) var(--el-border-radius-base, 4px);
-  border-left: 1px solid var(--el-border-color-lighter, #e4e7ed);
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-color: var(--el-color-primary);
+  background-color: var(--el-color-primary);
+  color: #fff;
 }
 .field-tag-input .tag-input-input-row .tag-input-tip {
   color: var(--el-text-color-secondary);
   font-size: 12px;
   line-height: 32px;
 }
-.field-tag-input .tag-input-input-row.has-error .tag-input-input-wrap {
-  border-color: var(--el-color-danger);
-  box-shadow: 0 0 0 2px var(--el-color-danger-light-7, rgba(245, 108, 108, 0.2));
+.field-tag-input .tag-input-input-row.has-error .tag-input-input-wrap .el-input__wrapper {
+  box-shadow: 0 0 0 1px var(--el-color-danger) inset;
 }
 .field-tag-input .tag-input-add-error {
   font-size: 12px;

package/es/pro-field/components/TagInput/FieldTagInput.vue_vue_type_script_setup_true_lang.vue.js

@@ -2,7 +2,7 @@ import '../../../_virtual/_rollup-plugin-inject-process-env.js';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { ref, computed, onMounted, nextTick, onUnmounted, watch, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, toDisplayString, createCommentVNode, normalizeClass, withKeys, withModifiers, createTextVNode, TransitionGroup, Fragment, renderList, createBlock } from 'vue';
+import { ref, computed, onMounted, nextTick, onUnmounted, watch, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, toDisplayString, createCommentVNode, normalizeClass, withKeys, withModifiers, renderSlot, createBlock, createTextVNode, TransitionGroup, Fragment, renderList } from 'vue';
 import { ElTooltip, ElInput, ElButton, ElTag } from '@deppon/deppon-ui';
 
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -154,7 +154,9 @@ var script = {
       var trimmed = (value || '').trim();
       var rules = addRules.value;
       if (!rules.length) {
-        if (!trimmed) return '请输入';
+        // 未显式配置添加校验规则时，空输入仅拦截，不展示内部错误，
+        // 避免与外层 el-form-item 的必填提示重复显示。
+        if (!trimmed) return '';
         return '';
       }
       var _iterator = _createForOfIteratorHelper(rules),
@@ -210,31 +212,41 @@ var script = {
               raw = (_inputValue$value = inputValue.value) !== null && _inputValue$value !== void 0 ? _inputValue$value : '';
               name = raw.trim();
               list = _toConsumableArray(tagList.value);
+              if (name) {
+                _context.next = 2;
+                break;
+              }
+              // 空值不允许加入；未配置 addRules 时静默拦截，避免与外层必填提示重复。
+              if (addRules.value.length) {
+                addError.value = validateAddInput(raw, list);
+              }
+              return _context.abrupt("return");
+            case 2:
               err = validateAddInput(raw, list);
               if (!err) {
-                _context.next = 2;
+                _context.next = 3;
                 break;
               }
               addError.value = err;
               return _context.abrupt("return");
-            case 2:
+            case 3:
               if (!(list.length >= maxCount.value)) {
-                _context.next = 3;
+                _context.next = 4;
                 break;
               }
               addError.value = "\u6700\u591A\u6DFB\u52A0".concat(maxCount.value, "\u4E2A");
               return _context.abrupt("return");
-            case 3:
+            case 4:
               onAdd = (_props$fieldProps1 = props.fieldProps) === null || _props$fieldProps1 === void 0 ? void 0 : _props$fieldProps1.onAdd;
               if (!(typeof onAdd === 'function')) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               addLoading.value = true;
-              _context.prev = 4;
-              _context.next = 5;
+              _context.prev = 5;
+              _context.next = 6;
               return Promise.resolve(onAdd(name, list));
-            case 5:
+            case 6:
               result = _context.sent;
               if (Array.isArray(result)) {
                 emit('update:text', result);
@@ -254,18 +266,18 @@ var script = {
                   return (_inputRef$value2 = inputRef.value) === null || _inputRef$value2 === void 0 || (_inputRef$value2$focu = _inputRef$value2.focus) === null || _inputRef$value2$focu === void 0 ? void 0 : _inputRef$value2$focu.call(_inputRef$value2);
                 });
               }
-              _context.next = 7;
+              _context.next = 8;
               break;
-            case 6:
-              _context.prev = 6;
-              _context["catch"](4);
             case 7:
               _context.prev = 7;
-              addLoading.value = false;
-              return _context.finish(7);
+              _context["catch"](5);
             case 8:
-              return _context.abrupt("return");
+              _context.prev = 8;
+              addLoading.value = false;
+              return _context.finish(8);
             case 9:
+              return _context.abrupt("return");
+            case 10:
               list.push(name);
               emit('update:text', list);
               inputValue.value = '';
@@ -274,11 +286,11 @@ var script = {
                 var _inputRef$value3, _inputRef$value3$focu;
                 return (_inputRef$value3 = inputRef.value) === null || _inputRef$value3 === void 0 || (_inputRef$value3$focu = _inputRef$value3.focus) === null || _inputRef$value3$focu === void 0 ? void 0 : _inputRef$value3$focu.call(_inputRef$value3);
               });
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 6, 7, 8]]);
+        }, _callee, null, [[5, 7, 8, 9]]);
       }));
       return _addItem.apply(this, arguments);
     }
@@ -383,18 +395,30 @@ var script = {
         onKeydown: _cache[2] || (_cache[2] = withKeys(withModifiers(function ($event) {
           return !isDisabled.value && addItem();
         }, ["prevent"]), ["enter"]))
-      }, null, 8 /* PROPS */, ["modelValue", "placeholder", "disabled"]), createVNode(unref(ElButton), {
-        type: "primary",
-        "class": "tag-input-add-btn",
-        loading: addLoading.value,
-        disabled: addLoading.value || isDisabled.value,
-        onClick: addItem
       }, {
-        "default": withCtx(function () {
-          return [createTextVNode(toDisplayString(addButtonText.value), 1 /* TEXT */)];
+        append: withCtx(function () {
+          return [_ctx.$slots.append ? renderSlot(_ctx.$slots, "append", {
+            key: 0,
+            addItem: addItem,
+            inputValue: inputValue.value,
+            addLoading: addLoading.value,
+            disabled: addLoading.value || isDisabled.value
+          }) : (openBlock(), createBlock(unref(ElButton), {
+            key: 1,
+            type: "primary",
+            "class": "tag-input-add-btn",
+            loading: addLoading.value,
+            disabled: addLoading.value || isDisabled.value,
+            onClick: addItem
+          }, {
+            "default": withCtx(function () {
+              return [createTextVNode(toDisplayString(addButtonText.value), 1 /* TEXT */)];
+            }),
+            _: 1 /* STABLE */
+          }, 8 /* PROPS */, ["loading", "disabled"]))];
         }),
-        _: 1 /* STABLE */
-      }, 8 /* PROPS */, ["loading", "disabled"])]), tip.value ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(tip.value), 1 /* TEXT */)) : createCommentVNode("v-if", true)], 2 /* CLASS */), addError.value ? (openBlock(), createElementBlock("div", _hoisted_5, toDisplayString(addError.value), 1 /* TEXT */)) : createCommentVNode("v-if", true), createCommentVNode(" 标签列表：有数据时才显示 "), tagList.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_6, [listLabel.value ? (openBlock(), createElementBlock("div", _hoisted_7, toDisplayString(listLabel.value) + "(" + toDisplayString(tagList.value.length) + "/" + toDisplayString(maxCount.value) + ") ", 1 /* TEXT */)) : createCommentVNode("v-if", true), createElementVNode("div", {
+        _: 3 /* FORWARDED */
+      }, 8 /* PROPS */, ["modelValue", "placeholder", "disabled"])]), tip.value ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(tip.value), 1 /* TEXT */)) : createCommentVNode("v-if", true)], 2 /* CLASS */), addError.value ? (openBlock(), createElementBlock("div", _hoisted_5, toDisplayString(addError.value), 1 /* TEXT */)) : createCommentVNode("v-if", true), createCommentVNode(" 标签列表：有数据时才显示 "), tagList.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_6, [listLabel.value ? (openBlock(), createElementBlock("div", _hoisted_7, toDisplayString(listLabel.value) + "(" + toDisplayString(tagList.value.length) + "/" + toDisplayString(maxCount.value) + ") ", 1 /* TEXT */)) : createCommentVNode("v-if", true), createElementVNode("div", {
         "class": normalizeClass(["tag-input-list-content", {
           'is-removing': removingIndex.value >= 0
         }])

package/es/pro-form/ProForm.vue_vue_type_script_setup_true_lang.vue.js

@@ -608,16 +608,17 @@ var script = {
     // 获取 append 插槽组件
     var getAppendSlotComponent = function getAppendSlotComponent(item) {
       var _item$slots;
+      var slotProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var appendSlot = (_item$slots = item.slots) === null || _item$slots === void 0 ? void 0 : _item$slots.append;
       if (!appendSlot) return null;
 
       // 如果是函数，调用它并返回结果（应该是组件或 VNode）
       if (typeof appendSlot === 'function') {
-        return appendSlot({
+        return appendSlot(_objectSpread({
           item: item,
           value: formModel[item.name],
           formModel: formModel
-        });
+        }, slotProps));
       }
 
       // 否则直接返回（字符串组件名或组件对象）
@@ -1285,8 +1286,8 @@ var script = {
                           };
                         }), (_item$slots2 = item.slots) !== null && _item$slots2 !== void 0 && _item$slots2.append ? {
                           name: "append",
-                          fn: withCtx(function () {
-                            return [(openBlock(), createBlock(resolveDynamicComponent(getAppendSlotComponent(item))))];
+                          fn: withCtx(function (slotProps) {
+                            return [(openBlock(), createBlock(resolveDynamicComponent(getAppendSlotComponent(item, slotProps))))];
                           }),
                           key: "0"
                         } : undefined]), 1032 /* PROPS, DYNAMIC_SLOTS */, ["text", "value-type", "mode", "plain", "light", "value-enum", "label", "field-props", "form-item-props", "empty-text", "onUpdate:text"])) : (_item$slots3 = item.slots) !== null && _item$slots3 !== void 0 && _item$slots3["default"] ? renderSlot(_ctx.$slots, item.name, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@deppon/deppon-template",
-    "version": "2.3.3",
+    "version": "2.3.6",
     "main": "es/index.js",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
@@ -43,11 +43,11 @@
         "less": "^4.2.0"
     },
     "dependencies": {
-        "@deppon/deppon-assets": "2.3.3",
-        "@deppon/deppon-request": "2.3.3",
-        "@deppon/deppon-router": "2.3.3",
-        "@deppon/deppon-ui": "2.3.3",
-        "@deppon/deppon-utils": "2.3.3",
+        "@deppon/deppon-assets": "2.3.6",
+        "@deppon/deppon-request": "2.3.6",
+        "@deppon/deppon-router": "2.3.6",
+        "@deppon/deppon-ui": "2.3.6",
+        "@deppon/deppon-utils": "2.3.6",
         "dayjs": "^1.11.10",
         "lodash-es": "^4.17.21",
         "mitt": "^3.0.1"