@teamix/pro 1.3.9 → 1.3.12

package/dist/pro.js

@@ -57382,8 +57382,6 @@ var CascaderText = function CascaderText(props) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(94877);
-
 
 
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.baseClass)('teamix-pro-field-output-circle');
@@ -57393,7 +57391,7 @@ var Circle = function Circle(props) {
       color = props.color;
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", {
     style: {
-      backgroundColor: (0,_utils_color__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .ZP)(color)
+      backgroundColor: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getColor)(color)
     },
     className: cls({
       '': true,
@@ -57890,8 +57888,6 @@ var Edit = function Edit(props) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(94877);
-
 
 
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.baseClass)('teamix-pro-field-output-emphasize');
@@ -57907,7 +57903,7 @@ var Emphasize = function Emphasize(props) {
     // 强调数字需要重新实现Color颜色。否则不生效。
     // 这边的颜色只可能是string类型
     style: {
-      color: (_getColor = (0,_utils_color__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .ZP)(color)) !== null && _getColor !== void 0 ? _getColor : 'var(--color-text1-3, #333333)'
+      color: (_getColor = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getColor)(color)) !== null && _getColor !== void 0 ? _getColor : 'var(--color-text1-3, #333333)'
     }
   }, result);
 };
@@ -57968,8 +57964,6 @@ var Head = function Head(props) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(89227);
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80653);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(94877);
-
 
 
 
@@ -57994,11 +57988,11 @@ var Icon = function Icon(props) {
 
   var getIconColor = function getIconColor() {
     if (render.iconColor) {
-      return (0,_utils_color__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)(render === null || render === void 0 ? void 0 : render.iconColor);
+      return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getColor)(render === null || render === void 0 ? void 0 : render.iconColor);
     }
 
     if (render.color && typeof render.color === 'string') {
-      return (0,_utils_color__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)(render === null || render === void 0 ? void 0 : render.color);
+      return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getColor)(render === null || render === void 0 ? void 0 : render.color);
     }
 
     return '';
@@ -58050,13 +58044,12 @@ var Icon = function Icon(props) {
 /* harmony import */ var _Unit__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(9844);
 /* harmony import */ var _Emphasize__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(34141);
 /* harmony import */ var _Edit__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(15122);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(94877);
-/* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(33049);
-/* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(28266);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(80653);
-/* harmony import */ var _ValueWithStatus__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(97609);
+/* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(33049);
+/* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28266);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(80653);
+/* harmony import */ var _ValueWithStatus__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(97609);
 var _excluded = ["isList", "overlay"];
 
 function _objectWithoutProperties(source, excluded) {
@@ -58111,8 +58104,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
 
 
 
-
-var Tooltip = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_12__.Balloon.Tooltip;
+var Tooltip = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_11__.Balloon.Tooltip;
 /**
  * 处理个性化输出
  * @param dom 已经完成option映射的dom
@@ -58133,7 +58125,7 @@ function individualization(dom, render, value, fieldValue) {
     if (Array.isArray(dom)) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, dom.map(function (item, index) {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
-          className: classnames__WEBPACK_IMPORTED_MODULE_13___default()({
+          className: classnames__WEBPACK_IMPORTED_MODULE_12___default()({
             'teamix-pro-field-field-checkbox-tag': true,
             'teamix-pro-field-field-checkbox-tag-over-line': render === null || render === void 0 ? void 0 : render.wrap
           }),
@@ -58168,7 +58160,7 @@ function individualization(dom, render, value, fieldValue) {
 
 
   if ((render === null || render === void 0 ? void 0 : render.color) && !render.type) {
-    var color = typeof render.color === 'string' ? (0,_utils_color__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .ZP)(render.color) : 'var(--color-text1-3, #333333)';
+    var color = typeof render.color === 'string' ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_13__.getColor)(render.color) : 'var(--color-text1-3, #333333)';
     result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
       style: {
         color: color
@@ -58189,7 +58181,7 @@ function individualization(dom, render, value, fieldValue) {
     if ((render === null || render === void 0 ? void 0 : render.type) !== 'statusTag' && (render === null || render === void 0 ? void 0 : render.type) !== 'statusIconTag') {
       var _render$rows;
 
-      result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_14__.Ellipsis, {
+      result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_13__.Ellipsis, {
         className: "teamix-pro-field-output-tooltip",
         tooltip: tooltip,
         rows: (_render$rows = render === null || render === void 0 ? void 0 : render.rows) !== null && _render$rows !== void 0 ? _render$rows : 1
@@ -58268,7 +58260,7 @@ function individualization(dom, render, value, fieldValue) {
 
 
   if (render === null || render === void 0 ? void 0 : render.valueWithStatusConfig) {
-    result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ValueWithStatus__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z, {
+    result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ValueWithStatus__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z, {
       render: render,
       result: result,
       fieldValue: fieldValue
@@ -58434,7 +58426,7 @@ var Link = function Link(props) {
         e.preventDefault();
       }
 
-      render === null || render === void 0 ? void 0 : (_render$linkOnClick = render.linkOnClick) === null || _render$linkOnClick === void 0 ? void 0 : _render$linkOnClick.call(render, fieldVal, e);
+      render === null || render === void 0 ? void 0 : (_render$linkOnClick = render.linkOnClick) === null || _render$linkOnClick === void 0 ? void 0 : _render$linkOnClick.call(render, value, e);
     }
   }), result);
 };
@@ -58464,9 +58456,8 @@ var Link = function Link(props) {
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(80653);
 /* harmony import */ var _CascaderText__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(92206);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(94877);
-/* harmony import */ var _step__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(67491);
-/* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(89227);
+/* harmony import */ var _step__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67491);
+/* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(89227);
 var _excluded = ["isList", "overlay", "value"];
 
 function _objectWithoutProperties(source, excluded) {
@@ -58568,7 +58559,6 @@ function _typeof(obj) {
 
 
 
-
 /**
  * 获取 options 最终输出值
  * @param fieldVal 绑定值
@@ -58831,7 +58821,7 @@ function mappingOptions(fieldVal, render, options, beforeFormatter, customOption
 
 
   if (render && (render === null || render === void 0 ? void 0 : render.type) === 'step') {
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_step__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z, {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_step__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z, {
       render: render,
       value: value
     });
@@ -58998,7 +58988,7 @@ var renderStatusIconTag = function renderStatusIconTag(item, render) {
     }, color), item);
   }
 
-  var processColor = (0,_utils_color__WEBPACK_IMPORTED_MODULE_9__/* .getTagColor */ .vm)(color, 'statusIcon');
+  var processColor = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_7__.getTagColor)(color, 'statusIcon');
   var colorTypeIsPreset = rules.test(processColor !== null && processColor !== void 0 ? processColor : '');
 
   if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
@@ -59012,7 +59002,7 @@ var renderStatusIconTag = function renderStatusIconTag(item, render) {
   if (typeof processColor === 'string') {
     colorObject = _objectSpread({}, (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .hasProps */ .s_)({
       status: colorTypeIsPreset ? processColor : false,
-      color: colorTypeIsPreset ? false : (0,_utils_color__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .ZP)(processColor),
+      color: colorTypeIsPreset ? false : (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_7__.getColor)(processColor),
       ellipsis: render.ellipsis
     }));
   } else {
@@ -59091,8 +59081,8 @@ var renderProgress = function renderProgress(item, render) {
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Progress, _objectSpread(_objectSpread({
     percent: Number(item)
   }, (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .hasProps */ .s_)({
-    state: colorTypeIsPreset ? (0,_utils_color__WEBPACK_IMPORTED_MODULE_9__/* .getTagColor */ .vm)(color !== null && color !== void 0 ? color : 'normal', 'progress') : false,
-    color: !colorTypeIsPreset ? (0,_utils_color__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .ZP)((0,_utils_color__WEBPACK_IMPORTED_MODULE_9__/* .getTagColor */ .vm)(color !== null && color !== void 0 ? color : 'normal', 'progress')) : false
+    state: colorTypeIsPreset ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_7__.getTagColor)(color !== null && color !== void 0 ? color : 'normal', 'progress') : false,
+    color: !colorTypeIsPreset ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_7__.getColor)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_7__.getTagColor)(color !== null && color !== void 0 ? color : 'normal', 'progress')) : false
   })), render.progressProps));
 };
 /**
@@ -59188,7 +59178,7 @@ var processHidden = function processHidden(valueOptions, render, component, befo
         'teamix-pro-field-output-fold-tag': true
       })
     }, (render === null || render === void 0 ? void 0 : render.foldText) !== 'more' && (component === null || component === void 0 ? void 0 : component((_render$foldText = render === null || render === void 0 ? void 0 : render.foldText) !== null && _render$foldText !== void 0 ? _render$foldText : "+".concat(remainVals.length), render, beforeFormatter)), (render === null || render === void 0 ? void 0 : render.foldText) === 'more' && (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_7__.renderTags)({
-      children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z, {
         type: "more-line",
         size: "small"
       }),
@@ -59368,8 +59358,6 @@ var Overlay = function Overlay(props) {
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(94877);
-
 
 
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.baseClass)('teamix-pro-field-output-rank');
@@ -59379,12 +59367,12 @@ var Rank = function Rank(props) {
       color = props.color;
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", {
     style: {
-      backgroundColor: (0,_utils_color__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .ZP)(color)
+      backgroundColor: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getColor)(color)
     },
     className: cls({
       '': true,
       deep: result == 1 || result == 2 || result == 3,
-      hasColor: !!(0,_utils_color__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .ZP)(color)
+      hasColor: !!(0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getColor)(color)
     })
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", {
     className: cls({
@@ -59408,8 +59396,6 @@ var Rank = function Rank(props) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(89227);
 /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80653);
-/* harmony import */ var _utils_color__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(94877);
-
 
 
 
@@ -59435,7 +59421,7 @@ var SuffixIcon = function SuffixIcon(props) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, result, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z, {
       type: render.suffixIcon,
       style: {
-        color: (_getColor = (0,_utils_color__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)(render === null || render === void 0 ? void 0 : render.suffixIconColor)) !== null && _getColor !== void 0 ? _getColor : 'var(--color-fill1-6, #848484)'
+        color: (_getColor = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getColor)(render === null || render === void 0 ? void 0 : render.suffixIconColor)) !== null && _getColor !== void 0 ? _getColor : 'var(--color-fill1-6, #848484)'
       },
       // 如果是文字链需要修改间距
       className: cls({
@@ -59490,35 +59476,41 @@ var Unit = function Unit(props) {
 /* harmony export */ });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _teamix_pro__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42345);
-/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80653);
-
+/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
 
 
-var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.baseClass)('teamix-pro-field-output-value-with-status');
+var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.baseClass)('teamix-pro-field-output-value-with-status');
 
 var ValueWithStatus = function ValueWithStatus(props) {
-  var _render$valueWithStat, _render$valueWithStat2, _fieldValue$endValue, _render$valueWithStat3, _render$valueWithStat4;
+  var _ref2;
 
   var fieldValue = props.fieldValue,
       result = props.result,
       render = props.render;
+
+  var _ref = fieldValue || {},
+      endValue = _ref.endValue;
+
+  var _render$valueWithStat = render === null || render === void 0 ? void 0 : render.valueWithStatusConfig,
+      frontValueWidth = _render$valueWithStat.frontValueWidth,
+      fronValueWidth = _render$valueWithStat.fronValueWidth,
+      endValueColor = _render$valueWithStat.endValueColor;
+
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: cls('')
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: cls('result'),
     style: {
-      width: (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.endValue) !== undefined ? (_render$valueWithStat = render === null || render === void 0 ? void 0 : (_render$valueWithStat2 = render.valueWithStatusConfig) === null || _render$valueWithStat2 === void 0 ? void 0 : _render$valueWithStat2.fronValueWidth) !== null && _render$valueWithStat !== void 0 ? _render$valueWithStat : 50 : 'unset'
+      width: endValue !== undefined ? (_ref2 = frontValueWidth || fronValueWidth) !== null && _ref2 !== void 0 ? _ref2 : 50 : 'unset'
     }
-  }, result), (fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.endValue) !== undefined && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+  }, result), endValue ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: cls('divider')
-  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_pro__WEBPACK_IMPORTED_MODULE_1__.ProField, {
-    type: "text",
-    value: (_fieldValue$endValue = fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.endValue) !== null && _fieldValue$endValue !== void 0 ? _fieldValue$endValue : '',
-    render: {
-      color: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getColor)((_render$valueWithStat3 = render === null || render === void 0 ? void 0 : (_render$valueWithStat4 = render.valueWithStatusConfig) === null || _render$valueWithStat4 === void 0 ? void 0 : _render$valueWithStat4.endValueColor) !== null && _render$valueWithStat3 !== void 0 ? _render$valueWithStat3 : 'var(--color-text1-3, #333333)')
+  }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    className: cls('value-with-status'),
+    style: {
+      color: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getColor)(endValueColor !== null && endValueColor !== void 0 ? endValueColor : 'var(--color-text1-3, #333333)')
     }
-  }));
+  }, endValue)) : null);
 };
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ValueWithStatus);
@@ -61450,78 +61442,6 @@ function renderPreviewProps(val, mode, render, options, beforeFormatter, customO
 
 /***/ }),
 
-/***/ 94877:
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "ZP": () => (__WEBPACK_DEFAULT_EXPORT__),
-/* harmony export */   "vm": () => (/* binding */ getTagColor)
-/* harmony export */ });
-/* unused harmony export color */
-var brandColor = [['snow', 'var(--color-white, #fff)'], ['b0', 'var(--color-brand1-1, #f0f7ff)'], ['b10', 'var(--color-brand1-2, #cae3fd)'], ['b20', 'var(--color-brand1-3, #90c0ef)'], ['b30', 'var(--color-brand1-4, #589ad8)'], ['b40', 'var(--color-brand1-5, #2a7dd1)'], ['b50', 'var(--color-brand1-6, #0064c8)'], ['b60', 'var(--color-brand1-7, #0057ad)'], ['b70', 'var(--color-brand1-8, #003e7c)'], ['b80', '#003263'], ['b90', '#002953']];
-var grey = [['g0', 'var(--color-fill1-2, #f7f7f7)'], ['g10', 'var(--color-line1-1, #eaeaea)'], ['g20', 'var(--color-line1-2, #d9d9d9)'], ['g30', 'var(--color-line1-3, #ccc)'], ['g40', 'var(--color-line1-5, #ababab)'], ['g50', 'var(--color-fill1-6, #848484)'], ['g60', 'var(--color-text1-2, #5a5a5a)'], ['g70', 'var(--color-text1-3, #333333)'], ['g80', 'var(--color-text1-5, #292929)'], ['g90', 'var(--color-text1-4, #1a1a1a)'], ['black', 'var(--color-black, #000)']];
-var error = [['r0', 'var(--color-error-1, #fff1f0)'], ['r10', 'var(--color-error-2, #fcceca)'], ['r20', 'var(--color-error-3, #f7aaa3)'], ['r30', 'var(--color-error-7, #f2887e)'], ['r40', 'var(--color-error-4, #ed675a)'], ['r50', 'var(--color-error-5, #e84738)'], ['r60', 'var(--color-error-6, #c43123)'], ['r70', '#A11F13'], ['r80', '#7D1207'], ['r90', '#520700']];
-var success = [['gn0', 'var(--color-success-1, #f0fff7)'], ['gn10', 'var(--color-success-2, #cdf8e1)'], ['gn20', 'var(--color-success-3, #90deb5)'], ['gn30', 'var(--color-success-7, #67cf98)'], ['gn40', 'var(--color-success-4, #43bf7d)'], ['gn50', 'var(--color-success-5, #22b066)'], ['gn60', 'var(--color-success-6, #159953)'], ['gn70', '#098243'], ['gn80', '#026B34'], ['gn90', '#005420']];
-var warning = [['o0', 'var(--color-warning-1, #fff8f0)'], ['o10', 'var(--color-warning-2, #ffe0bf)'], ['o20', 'var(--color-warning-3, #ffcd96)'], ['o30', 'var(--color-warning-7, #ffb96e)'], ['o40', 'var(--color-warning-4, #ffa544)'], ['o50', 'var(--color-warning-5, #f98e1a)'], ['o60', 'var(--color-warning-6, #cf7412)'], ['o70', '#A35A0A'], ['o80', '#774106'], ['o90', '#522A00']];
-var help = [['y0', 'var(--color-help-1, #fffcf0)'], ['y10', 'var(--color-help-2, #fff5c2)'], ['y20', 'var(--color-help-3, #ffee96)'], ['y30', 'var(--color-help-7, #ffe66b)'], ['y40', 'var(--color-help-4, #ffdf40)'], ['y50', 'var(--color-help-5, #fad414)'], ['y60', 'var(--color-help-6, #d1b10d)'], ['y70', '#A88E07'], ['y80', '#796702'], ['y90', '#524400']];
-var mention = [['p0', 'var(--color-mention-1, #f0f0ff)'], ['p10', 'var(--color-mention-2, #c9cbf5)'], ['p20', 'var(--color-mention-3, #afb2f0)'], ['p30', 'var(--color-mention-4, #969aeb)'], ['p40', 'var(--color-mention-5, #7e83e6)'], ['p50', 'var(--color-mention-6, #666ce0)'], ['p60', 'var(--color-mention-7, #4046bd)'], ['p70', 'var(--color-mention-8, #232999)'], ['p80', 'var(--color-mention-9, #0e1375)'], ['p90', 'var(--color-mention-10, #000452)']];
-var tagMapper = {
-  fail: 'error',
-  process: 'prompt',
-  pause: 'pause',
-  'filter-tag': 'filter-tag'
-};
-var progressMapper = {
-  fail: 'error',
-  process: 'normal',
-  pause: 'pause',
-  help: 'Y50',
-  warning: 'O50',
-  mention: 'P50'
-};
-var statusIconMapper = {
-  'cloud-running': {
-    icon: 'success-fill',
-    color: 'var(--color-success-5, #22b066)'
-  },
-  'cloud-stopped': {
-    icon: 'pause-fill',
-    color: 'var(--color-warning-5, #f98e1a)'
-  },
-  'cloud-fail': {
-    icon: 'prompt-fill',
-    color: 'var(--color-error-5, #e84738)'
-  },
-  'cloud-useless': {
-    icon: 'minus-fill',
-    color: 'var(--color-line1-5, #ababab)'
-  },
-  'cloud-loading': 'loading'
-};
-var color = new Map([].concat(brandColor, grey, error, success, warning, help, mention));
-
-var getColor = function getColor(symbol) {
-  var value = color.get((symbol !== null && symbol !== void 0 ? symbol : '').toLocaleLowerCase());
-  return value !== null && value !== void 0 ? value : symbol;
-};
-
-var getTagColor = function getTagColor(color, type) {
-  var _mapper$type$color, _mapper$type;
-
-  var mapper = {
-    tag: tagMapper,
-    progress: progressMapper,
-    statusIcon: statusIconMapper
-  };
-  return (_mapper$type$color = mapper === null || mapper === void 0 ? void 0 : (_mapper$type = mapper[type]) === null || _mapper$type === void 0 ? void 0 : _mapper$type[color]) !== null && _mapper$type$color !== void 0 ? _mapper$type$color : color;
-};
-
-
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (getColor);
-
-/***/ }),
-
 /***/ 36463:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -63404,7 +63324,7 @@ function useDialogFormAction(action, context) {
 
       _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) == null ? void 0 : _innerFormRef$current2.values);
     }
-  }, others), context);
+  }, others), context, true);
 }
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (useDialogFormAction)));
 
@@ -63545,7 +63465,7 @@ function getFooterAlignClass(isDrawer, align) {
 } // 弹窗 -> 请求（点击确认，发送数据请求）
 
 
-function useDialogAction(action, actionContext) {
+function useDialogAction(action, actionContext, hasForm) {
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
       loading = _useState[0],
       setLoading = _useState[1];
@@ -63649,22 +63569,27 @@ function useDialogAction(action, actionContext) {
                 case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 16;
+                  _context.next = 18;
                   break;
 
                 case 10:
                   _context.prev = 10;
                   _context.t0 = _context["catch"](2);
-                  setLoading(false); // 如果 beforeRequest 中返回了 false，则直接关闭弹窗
+                  setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form，则直接关闭弹窗
 
-                  if (beforeRequest) {
-                    resolve(true);
+                  if (!(beforeRequest && !hasForm)) {
+                    _context.next = 16;
+                    break;
                   }
 
-                  resolve(false);
+                  resolve(true);
                   return _context.abrupt("return");
 
                 case 16:
+                  resolve(false);
+                  return _context.abrupt("return");
+
+                case 18:
                 case "end":
                   return _context.stop();
               }
@@ -66096,7 +66021,6 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var _useSpecialProps = (0,_useSpecialProps__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(props),
-      hasChangeDefault = _useSpecialProps.hasChangeDefault,
       hasRequired = _useSpecialProps.hasRequired;
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(!!expand),
@@ -66114,56 +66038,66 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
   var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   });
-  /**
-   * 处理onInit与onFilter事件的触发问题
-   */
+  var debounceFun = lodash_debounce__WEBPACK_IMPORTED_MODULE_2___default()(function (fun, props) {
+    return fun(props);
+  }, filterDebounce); // onInit
 
+  var initialRequestRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(!!(props != null && props.initialRequest));
   var filterEnable = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)('waiting');
 
-  var _onFormInit = function onFormInit(form, _ref) {
-    var initialRequest = _ref.initialRequest,
-        initialValues = _ref.initialValues;
+  var onFormInit = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(form) {
+      var loadingField;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              form.setState({
+                loading: initialRequestRef.current
+              }); // 借用 form.loading 触发 onFormReact
 
-    if (!form.mounted) {
-      // 借用form的loading属性来判断initialValues和initialRequest是否完成
-      form.setState({
-        loading: !!initialRequest || !!initialValues
-      });
-    }
+              loadingField = Object.values(form.fields).filter(function (field) {
+                return !!field.loading;
+              }); // 等待mounted + 字段loading结束 + initialRequest结束 => 表单默认值初始化完成
 
-    var loadingField = Object.values(form.fields).filter(function (field) {
-      return !!field.loading;
-    }); // 等待表单mounted + 字段loading结束 + form默认值初始化 => 表单初始化完成
+              if (!(form.mounted && !loadingField.length && !form.loading)) {
+                _context.next = 10;
+                break;
+              }
 
-    if (form.mounted && !loadingField.length && !form.loading) {
-      _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
+              onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
 
-      var values = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.getValidValues)(form.values);
+              filterEnable.current = 'filter';
 
-      if (!(0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isUsable)(values) || !hasChangeDefault) {
-        // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
-        filterEnable.current = 'filter';
-        setTimeout(function () {
-          onInit == null ? void 0 : onInit((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(form.values));
-        }, 0);
+              if (!onInit) {
+                _context.next = 10;
+                break;
+              }
 
-        if (mode === 'panel') {
-          // 移除lightForm的默认值
-          // 设置Tag
-          configFilterItem(advancedForm);
+              _context.next = 8;
+              return form.validate();
 
-          if (!panelVisible) {
-            setTimeout(function () {
-              configTag();
-            }, 0);
+            case 8:
+              onInit == null ? void 0 : onInit((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(form.values)); // 设置Tag
+
+              if (mode === 'panel') {
+                configFilterItem(advancedForm);
+                !panelVisible && configTag();
+              }
+
+            case 10:
+            case "end":
+              return _context.stop();
           }
         }
-      } else {
-        filterEnable.current = 'initialized';
-      }
-    }
-  }; // 配置当前激活的form实例
+      }, _callee);
+    }));
+
+    return function onFormInit(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(); // 配置当前激活的form实例
 
 
   var setCurrentForm = function setCurrentForm(formName) {
@@ -66189,7 +66123,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       effects: function effects() {
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
           if (mode === 'inline') {
-            _onFormInit(form, props);
+            onFormInit(form);
           }
         });
       }
@@ -66213,7 +66147,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       effects: function effects() {
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormReact)(function (form) {
           if (mode === 'panel') {
-            _onFormInit(form, props);
+            onFormInit(form);
           }
         });
         (0,_formily_core__WEBPACK_IMPORTED_MODULE_4__.onFormInputChange)(function (form) {
@@ -66292,93 +66226,62 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(currentForm.current === 'simple')) {
-                _context.next = 14;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context.next = 9;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-
-              if (!hasRequired) {
-                _context.next = 6;
-                break;
-              }
-
-              _context.next = 6;
+              _context2.next = 2;
               return simpleForm.validate();
 
-            case 6:
-              onInit == null ? void 0 : onInit(values);
-              _context.next = 14;
-              break;
-
-            case 9:
-              if (!(filterEnable.current === 'filter')) {
-                _context.next = 14;
-                break;
-              }
-
-              if (!hasRequired) {
-                _context.next = 13;
-                break;
-              }
-
-              _context.next = 13;
-              return simpleForm.validate();
-
-            case 13:
+            case 2:
               onFilter == null ? void 0 : onFilter(values);
 
-            case 14:
+            case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function (_x) {
+    return function (_x2) {
       return _ref3.apply(this, arguments);
     };
-  }(), [onFilter, hasRequired, onInit]); // 简单搜索Change
+  }(), [onFilter]); // 简单搜索Change
 
   var onSimpleChange = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'simple') {
       onChange == null ? void 0 : onChange(values, fieldValue, fieldName);
+
+      if (filterEnable.current === 'filter') {
+        debounceFun(onSimpleFilter, values);
+      }
     }
   }, [onChange]); // 轻量搜索Filter
 
   var onLightFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values) {
-    if (currentForm.current === 'light') {
-      if (filterEnable.current === 'filter') {
-        var _Object$keys;
+    var _Object$keys;
 
-        onFilter == null ? void 0 : onFilter(values); // 清空advancedForm的值，配置Tag
+    onFilter == null ? void 0 : onFilter(values); // 清空advancedForm的值
 
-        var clearKeys = {};
-        (_Object$keys = Object.keys(advancedForm.values)) == null ? void 0 : _Object$keys.forEach(function (key) {
-          clearKeys[key] = undefined;
-        });
-        advancedForm.setValues(clearKeys);
-        configFilterItem(advancedForm);
-        configTag();
-      }
-    }
+    var clearKeys = {};
+    (_Object$keys = Object.keys(advancedForm.values)) == null ? void 0 : _Object$keys.forEach(function (key) {
+      clearKeys[key] = undefined;
+    });
+    advancedForm.setValues(clearKeys); // 配置Tag
+
+    configFilterItem(advancedForm);
+    configTag();
   }, [onFilter]); // 轻量搜索Change
 
   var onLightChange = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'light') {
       onChange == null ? void 0 : onChange(values, fieldValue, fieldName);
+
+      if (filterEnable.current === 'filter') {
+        debounceFun(onLightFilter, values);
+      }
     }
   }, [onChange]); // 高级搜索Filter
 
@@ -66400,54 +66303,7 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Init
-
-  var onAdvancedInit = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(currentForm.current === 'advanced')) {
-                _context2.next = 9;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context2.next = 9;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-
-              if (!hasRequired) {
-                _context2.next = 6;
-                break;
-              }
-
-              _context2.next = 6;
-              return advancedForm.validate();
-
-            case 6:
-              onInit == null ? void 0 : onInit(values);
-              configFilterItem(advancedForm);
-
-              if (!panelVisible) {
-                configTag();
-              }
-
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-
-    return function (_x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }(), [hasRequired, onInit]); // 高级搜索Change
+  }, [onReset]); // 高级搜索Change
 
   var onAdvancedChange = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'advanced') {
@@ -66467,16 +66323,14 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
     configFilterItem(advancedForm);
     configTag();
     onFilter == null ? void 0 : onFilter((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_5__.toJS)(advancedForm.values));
-  }, [onFilter]); // initialValues和initialRequest的回调
+  }, [onFilter]); // initialRequest 的回调
 
   var onInitialComplete = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (form) {
+    initialRequestRef.current = false;
     form.setState({
-      loading: false
+      loading: initialRequestRef.current
     });
-  }, []);
-  var debounceFun = lodash_debounce__WEBPACK_IMPORTED_MODULE_2___default()(function (fun, props) {
-    return fun(props);
-  }, filterDebounce); // 组件挂载
+  }, []); // 组件挂载
 
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     setCurrentForm(currentForm.current);
@@ -66496,37 +66350,28 @@ var QueryFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onLightFilter, values);
-        onLightChange(values, fieldValue, fieldName);
-      }
+      onChange: onLightChange
     }))) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: prefixCls + "-inline"
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_SimpleFilter__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z, _extends({}, otherProps, {
       form: simpleForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onSimpleFilter, values);
-        onSimpleChange(values, fieldValue, fieldName);
-      },
+      onChange: onSimpleChange,
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_AdvancedFilter__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, _extends({}, otherProps, {
       form: advancedForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onAdvancedInit, values);
-        onAdvancedChange(values, fieldValue, fieldName);
-      },
+      onChange: onAdvancedChange,
       onSubmit: onAdvancedFilter,
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Group, null, tagDataSource.map(function (_ref5) {
-    var key = _ref5.key,
-        label = _ref5.label,
-        value = _ref5.value,
-        type = _ref5.type,
-        index = _ref5.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Group, null, tagDataSource.map(function (_ref4) {
+    var key = _ref4.key,
+        label = _ref4.label,
+        value = _ref4.value,
+        type = _ref4.type,
+        index = _ref4.index;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Tag.Closeable, {
       key: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {
@@ -66844,7 +66689,7 @@ var customComponent = function customComponent(component) {
 /* harmony import */ var _useAutoSubmit__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(86924);
 /* harmony import */ var _useInitialRequest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(8550);
 /* harmony import */ var _locales_validate__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(67315);
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -66885,6 +66730,7 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
       wrapperCol = _ref.wrapperCol,
       breakpoints = _ref.breakpoints,
       onChange = _ref.onChange,
+      onChangeType = _ref.onChangeType,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
@@ -66931,35 +66777,44 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
       labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .mergeArrayValue */ .UT)([24], labelCol),
       wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .mergeArrayValue */ .UT)([24], wrapperCol)
     };
-  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
-
-  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    form.removeEffects('onFieldValueChange');
-    form.addEffects('onFieldValueChange', function () {
-      (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.onFieldValueChange)('*', function (field, form) {
-        var _field$props;
-
-        onChange && onChange((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(form.values), (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(field.value), (_field$props = field.props) == null ? void 0 : _field$props.name);
-      });
-    });
-  }, [form, onChange]); // 配置表单默认值
-
-  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    // 配置表单默认值
     if (initialValues) {
       form.setInitialValues(initialValues);
-      onInitialComplete == null ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       (0,_useInitialRequest__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(initialRequest).then(function (values) {
         form.setInitialValues(values);
       })["finally"](function () {
         onInitialComplete == null ? void 0 : onInitialComplete(form);
       });
-    }
-  }, []); // 配置国际化
+    } // 配置国际化
+
 
-  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.setValidateLanguage)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getLanguage)() || 'zh-cn');
-  }, []);
+  }, []); // 添加 onChange 事件
+
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    if (onChangeType === 'form') {
+      // 使用 onFormValuesChange 无法监听具体变化字段
+      form.removeEffects('onChangeByFormValuesChange');
+      form.addEffects('onChangeByFormValuesChange', function () {
+        (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.onFormValuesChange)(function (form) {
+          onChange == null ? void 0 : onChange((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(form.values));
+        });
+      });
+    } else {
+      // 使用 onFieldValueChange 无法监听数组类型值的增删
+      form.removeEffects('onChangeByFieldValueChange');
+      form.addEffects('onChangeByFieldValueChange', function () {
+        (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.onFieldValueChange)('*', function (field, form) {
+          var _field$props;
+
+          onChange == null ? void 0 : onChange((0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(form.values), (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_3__.toJS)(field.value), (_field$props = field.props) == null ? void 0 : _field$props.name);
+        });
+      });
+    }
+  }, [onChange]);
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_formily__WEBPACK_IMPORTED_MODULE_4__.Form, _extends({
     className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(prefixCls, className)
   }, otherProps, getTeamixLayout, {
@@ -69288,7 +69143,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.3.9';
+var version = '1.3.12';
 
 
 /***/ }),
@@ -69869,33 +69724,23 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
     if (layout) {
-      var _layout$labelCol, _layout$wrapperCol, _layout$span;
+      var _layout$labelCol, _layout$wrapperCol;
 
       var labelCol = (_layout$labelCol = layout == null ? void 0 : layout.labelCol) != null ? _layout$labelCol : defaultLayout.formItemLayout.labelCol;
       var wrapperCol = (_layout$wrapperCol = layout == null ? void 0 : layout.wrapperCol) != null ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol;
-      var span = (_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : defaultLayout.span;
-
-      if (layout != null && layout.colNum && layout.colNum > 0 && layout.colNum <= 4) {
-        span = 24 / layout.colNum;
-      }
-
-      formItemLayout.span = span;
       formItemLayout.labelCol = labelCol;
       formItemLayout.wrapperCol = wrapperCol;
     }
 
-    var newSpan = formItemLayout.span;
     var newLabelSpan = formItemLayout.labelCol.span;
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
-      newSpan = newSpan * (colspan != null ? colspan : 1);
       newLabelSpan = newLabelSpan / colspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
-      span: newSpan,
       labelCol: {
         span: newLabelSpan
       },
@@ -69908,10 +69753,12 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _getFormItemLayout, _item$colSpan, _item$title, _item$valueType, _ref, _item$colSpan2;
+      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
 
+      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : span) * item.colSpan : (_layout$span2 = layout == null ? void 0 : layout.span) != null ? _layout$span2 : span;
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Col, {
-        span: (_getFormItemLayout = getFormItemLayout((_item$colSpan = item == null ? void 0 : item.colSpan) != null ? _item$colSpan : 0)) == null ? void 0 : _getFormItemLayout.span,
+        span: layoutSpan,
         key: index
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_ProInfoItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         label: (_item$title = item == null ? void 0 : item.title) != null ? _item$title : '',
@@ -69927,7 +69774,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           context: context,
           props: item.props
         }),
-        baseInfoLayout: getFormItemLayout((_item$colSpan2 = item == null ? void 0 : item.colSpan) != null ? _item$colSpan2 : 0),
+        baseInfoLayout: getFormItemLayout((_item$colSpan = item == null ? void 0 : item.colSpan) != null ? _item$colSpan : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));
@@ -79401,6 +79248,31 @@ function getCookie(name) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "M": () => (/* binding */ autoWidth)
 /* harmony export */ });
+/**
+ * 获取某个宽度在宽度集中的无效空间
+ * @param array 宽度集
+ * @param used 使用此宽度计算宽度集无效空间
+ * @returns 使用此宽度的闲置空间和溢出空间
+ */
+var getInvalidSpace = function getInvalidSpace(array, used) {
+  return array.reduce(function (prev, current) {
+    if (used > current) {
+      prev[0] += used - current; // 闲置值
+    }
+
+    if (used < current) {
+      prev[1] += current - used; // 溢出值
+    }
+
+    return prev;
+  }, [0, 0]);
+};
+
+/**
+ * 根据宽度集获取合适的宽度
+ * @param array
+ * @returns
+ */
 var autoWidth = function autoWidth(array) {
   var consoleArray = []; // 日志记录
 
@@ -79408,56 +79280,30 @@ var autoWidth = function autoWidth(array) {
 
   var expectedWidth = 0; // 期望宽度
 
-  var getInvalidSpace = function getInvalidSpace(value) {
-    var idleflowRate = 0.7; // 闲置宽度权重，越大则内容紧密性越好，反之信息呈现性越好。
-
-    var overflowRate = 2; // 溢出宽度权重，越大则信息呈现性越好，反之内容紧密性越好。
-
-    var idleSpace = 0; // 空间闲置总量
-
-    var overflowSpace = 0; // 空间溢出总量
-
-    array.forEach(function (width) {
-      if (value > width) {
-        idleSpace += (value - width) * idleflowRate; // 闲置值
-      }
-
-      if (value < width) {
-        overflowSpace += (width - value) * overflowRate; // 溢出值
-      }
-    });
-    return {
-      idleSpace: idleSpace,
-      // 闲置空间
-      overflowSpace: overflowSpace,
-      // 溢出空间
-      invalidSpace: idleSpace + overflowSpace // 无效空间
-
-    };
-  };
-
   array == null ? void 0 : array.forEach(function (width, index) {
-    var _getInvalidSpace = getInvalidSpace(width),
-        idleSpace = _getInvalidSpace.idleSpace,
-        overflowSpace = _getInvalidSpace.overflowSpace,
-        invalidSpace = _getInvalidSpace.invalidSpace;
+    var _getInvalidSpace = getInvalidSpace(array, width),
+        idleSpace = _getInvalidSpace[0],
+        overflowSpace = _getInvalidSpace[1];
 
-    consoleArray.push({
-      width: Math.ceil(width),
-      idleSpace: idleSpace,
-      overflowSpace: overflowSpace,
-      invalidSpace: invalidSpace
-    });
+    var invalidSpace = idleSpace + overflowSpace; // 使用第一个作为比对基准
 
     if (index === 0) {
       minInvalidSpace = invalidSpace;
       expectedWidth = width;
-    }
+    } // 如果新宽度的无效空间小于等于缓存基准，则使用新的。
+
 
     if (invalidSpace <= minInvalidSpace) {
       minInvalidSpace = invalidSpace;
       expectedWidth = width;
     }
+
+    consoleArray.push({
+      width: Math.ceil(width),
+      idleSpace: idleSpace,
+      overflowSpace: overflowSpace,
+      invalidSpace: invalidSpace
+    });
   });
   return {
     expectedWidth: Math.ceil(expectedWidth),