@zat-design/sisyphus-react 3.3.2-beta.3 → 3.3.2-beta.5

package/dist/index.esm.css

@@ -2568,20 +2568,24 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker input {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
   background: var(--zaui-contract-bg, #fffaa1);
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-form-view-container {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span,
+.pro-form .ant-form-item.pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;

package/es/ProDownload/utils.js

@@ -4,6 +4,8 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+/* eslint-disable no-empty */
+/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 import locale from '../locale';
 var stringify = function stringify(data) {

package/es/ProForm/components/render/Render.js

@@ -175,7 +175,7 @@ var Render = function Render(props) {
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return _jsx(_Form.Item, {
-      name: _otherFormItemProps.name,
+      name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,

package/es/ProForm/style/index.less

@@ -126,11 +126,12 @@
       }
     }
 
-    // 比较原始值场景下  不同时候的样式
+    // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
       .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-picker {
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;
 
         input {
@@ -141,7 +142,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
+      // 查看模式 修改容器样式
+      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;
         border-radius: 4px;

package/es/ProForm/utils/useChanged.js

@@ -12,7 +12,7 @@ export var useChanged = function useChanged(_ref) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var notWatch = !originalValues || originalValue === undefined;
+  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
   if (notWatch) form = [];
   var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];

package/es/ProForm/utils/useListChanged.js

@@ -33,11 +33,22 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var originalValueRow = originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }) : get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    var originalValue;
+    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+      var originalNamesValue = originalNames.map(function (originalName) {
+        return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      });
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(function (valItem) {
+        return valItem === undefined;
+      });
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }
     return originalValue;
   }
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
     return get(originalValues, originalName);
   }) : get(originalValues, originalName);
@@ -54,23 +65,24 @@ export var useListChanged = function useListChanged(params) {
     form = params.form,
     equalWith = params.equalWith,
     rowKeyPath = params.rowKeyPath;
-  // let _form = form;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var originalValue = getOriginalValue({
+  var notWatch = !originalValues;
+  var originalValue = !notWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
     originalValues: originalValues,
     rowKeyPath: rowKeyPath,
     form: form
-  });
-  var notWatch = !originalValues || originalValue === undefined;
+  }) : undefined;
+  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var _form = form;
   // @ts-ignore
-  // if (notWatch) _form = [];
-  var value = _Form.useWatch(namePath, form);
-  if (notWatch) return [false];
+  if (notWatch) _form = [];
+  var value = _Form.useWatch(namePath, _form);
+  if (notWatch || noChange) return [false];
   var changed = contrastOriginal({
     value: value,
     originalValue: originalValue,

package/lib/ProEditTable/components/RenderField/index.js

@@ -30,6 +30,8 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
+/* eslint-disable prefer-destructuring */
+/* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
   var value = _ref.text,

package/lib/ProForm/components/base/RangePicker/index.js

@@ -14,7 +14,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"];
+var _excluded = ["format", "otherProps", "separator"]; // @ts-check
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,7 +13,6 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
-
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

package/lib/ProForm/components/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

package/lib/ProForm/components/render/Render.js

@@ -28,6 +28,7 @@ var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
+/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _ref2, _classNames, _otherProps$names2;
@@ -172,7 +173,7 @@ var Render = function Render(props) {
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-      name: _otherFormItemProps.name,
+      name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,

package/lib/ProForm/style/index.less

@@ -126,11 +126,12 @@
       }
     }
 
-    // 比较原始值场景下  不同时候的样式
+    // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
       .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-picker {
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;
 
         input {
@@ -141,7 +142,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
+      // 查看模式 修改容器样式
+      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;
         border-radius: 4px;

package/lib/ProForm/utils/useChanged.js

@@ -17,7 +17,7 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
-  var notWatch = !originalValues || originalValue === undefined;
+  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
   if (notWatch) form = [];
   var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];

package/lib/ProForm/utils/useListChanged.js

@@ -38,11 +38,22 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var originalValueRow = originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }) : (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    var originalValue;
+    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+      var originalNamesValue = originalNames.map(function (originalName) {
+        return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      });
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(function (valItem) {
+        return valItem === undefined;
+      });
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }
     return originalValue;
   }
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
     return (0, _lodash.get)(originalValues, originalName);
   }) : (0, _lodash.get)(originalValues, originalName);
@@ -59,23 +70,24 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     form = params.form,
     equalWith = params.equalWith,
     rowKeyPath = params.rowKeyPath;
-  // let _form = form;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var originalValue = getOriginalValue({
+  var notWatch = !originalValues;
+  var originalValue = !notWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
     originalValues: originalValues,
     rowKeyPath: rowKeyPath,
     form: form
-  });
-  var notWatch = !originalValues || originalValue === undefined;
+  }) : undefined;
+  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var _form = form;
   // @ts-ignore
-  // if (notWatch) _form = [];
-  var value = _antd.Form.useWatch(namePath, form);
-  if (notWatch) return [false];
+  if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namePath, _form);
+  if (notWatch || noChange) return [false];
   var changed = (0, _contrastOriginal.contrastOriginal)({
     value: value,
     originalValue: originalValue,

package/lib/ProTable/components/TableResizable/index.js

@@ -15,6 +15,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("../../index");
 var _utils = require("../../utils");
 var _excluded = ["onDrag", "width", "minwidth"];
+/*
+ * @Author: chongyang wanchongyang@zhongan.io
+ * @Date: 2023-02-23 17:47:46
+ * @LastEditors: chongyang wanchongyang@zhongan.io
+ * @LastEditTime: 2023-03-07 20:18:22
+ * @FilePath: /za-material-warehouse/src/ProTable/TableResizable.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
   var onDrag = props.onDrag,

package/lib/ProTabs/index.js

@@ -17,6 +17,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _components = require("./components");
 var _excluded = ["style", "className", "dataSource", "onChange", "transformResponse", "useRequest", "tabSearch", "mode"];
+/* eslint-disable @typescript-eslint/consistent-type-assertions */
 var ProTabs = function ProTabs(props, ref) {
   var style = props.style,
     className = props.className,

package/lib/ProThemeTools/index.js

@@ -18,6 +18,7 @@ var _index = require("./utils/index");
 var _component = require("./component");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
+/* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
   zauiBrand: '#006AFF',

package/lib/ProTree/components/Tree.js

@@ -18,6 +18,13 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
+/*
+ *@Date: 2023-07-25 13:49:35
+ *@LastEditTime: 2023-07-25 13:49:35
+ *@Author: liudongliang
+ *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
+*/
+/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props) {

package/lib/ProTree/index.js

@@ -16,7 +16,6 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
  *@Author: liudongliang
  *@Description: ProTree组件，集成了tree和treeSelect
 */
-
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTreeModal/components/Tree.js

@@ -16,6 +16,7 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
 var _utils = require("../utils");
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "handleFilterClose", "optionRender"];
+/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props, ref) {

package/lib/ProUpload/index.js

@@ -22,6 +22,13 @@ var _ImageRender = _interopRequireDefault(require("./components/ImageRender"));
 var _uitls = require("./uitls");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
+/*
+ * @Author: wangshengqiang
+ * @Date: 2023-02-03 14:18:59
+ * @LastEditTime: 2023-11-14 18:32:13
+ * @LastEditors: wangshengqiang
+ * @Description: 上传控件
+ */
 var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _locale$ProUpload;
   var _useState = (0, _react.useState)([]),

package/lib/ProViewer/index.js

@@ -16,6 +16,7 @@ var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _locale = _interopRequireDefault(require("../locale"));
 var _locale$ProViewer;
+/* eslint-disable jsx-a11y/iframe-has-title */
 // 用于解析word | excel
 var officeApp = 'https://view.officeapps.live.com/op/view.aspx?src=';
 // 文件MIME类型

package/lib/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.2-beta.3",
+  "version": "3.3.2-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",