@zat-design/sisyphus-react 3.2.2 → 3.3.0-beta.10

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

@@ -10,7 +10,7 @@ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { forwardRef, useMemo, useRef } from 'react';
 var RangePicker = _DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
@@ -50,37 +50,37 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         forever = _value2.forever;
       if (forever === 'Y') {
         return {
-          range: [moment('9999-01-01'), moment('9999-01-01')],
+          range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = moment(startTime).format(defaultFormatDate);
-        var tempEndDate = moment(endTime).format(defaultFormatDate);
+        var tempStartDate = dayjs(startTime).format(defaultFormatDate);
+        var tempEndDate = dayjs(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [moment(startTime), moment(endTime)],
+            range: [dayjs(startTime), dayjs(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [moment('9999-01-01'), moment('9999-01-01')],
+            range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = moment(value).format(defaultFormatDate);
+        var tempDate = dayjs(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: moment('9999-01-01'),
+            range: dayjs('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: moment(value),
+          range: dayjs(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         _forever = _value3.forever;
       if (_forever === 'Y') {
         return {
-          range: moment('9999-01-01'),
+          range: dayjs('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = moment(dateTime).format(defaultFormatDate);
+        var _tempDate = dayjs(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: moment(dateTime),
+            range: dayjs(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: moment('9999-01-01'),
+            range: dayjs('9999-01-01'),
             forever: true
           };
         }
@@ -113,8 +113,8 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [value, (_value4 = value) === null || _value4 === void 0 ? void 0 : _value4.dateTime]);
   var changeRangeTime = function changeRangeTime(values) {
     onChange({
-      startTime: values ? moment(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
-      endTime: values ? moment(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
+      startTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
+      endTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (rangeTime.forever) {
       _value = '长期';
     } else {
-      _value = rangeTime.range ? moment(rangeTime.range).format(defaultFormatDate) : null;
+      _value = rangeTime.range ? dayjs(rangeTime.range).format(defaultFormatDate) : null;
     }
     return _jsx(_Input, {
       value: _value,

package/es/ProForm/components/old/ProCertValidity/propsType.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
-import moment from 'moment';
+import dayjs from 'dayjs';
 interface ICertValidityValuePropsType {
-    dateTime?: moment.Moment | string;
+    dateTime?: dayjs.Dayjs | string;
     forever?: string;
 }
 interface ICertValidityRangeValuePropsType {
-    startTime?: moment.Moment | string;
-    endTime?: moment.Moment | string;
+    startTime?: dayjs.Dayjs | string;
+    endTime?: dayjs.Dayjs | string;
     forever?: string;
 }
 interface IProCertValidityExtraPropsType {

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

@@ -363,9 +363,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange',
-    // 'shouldUpdate',
-    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -389,31 +387,24 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    // if (_otherFormItemProps.shouldUpdate) {
-    //   return (
-    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
-    //       {() => {
-    //         return (
-    //           <Form.Item
-    //             {...omit(_otherFormItemProps, filterFormItemKey)}
-    //             // @ts-ignore
-    //             _internalItemRender={internalItemRender}
-    //             className={_className}
-    //           >
-    //             {child}
-    //           </Form.Item>
-    //         );
-    //       }}
-    //     </Form.Item>
-    //   );
-    // }
-    var formItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+
+    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    var formItem = orgFormItem;
+    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
+    if (_otherFormItemProps.shouldUpdate) {
+      formItem = _jsx(_Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return orgFormItem;
+        }
+      });
+    }
     // 不渲染tooltip
     if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;

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

@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
-import { isBoolean, isFunction, union } from 'lodash';
+import { isBoolean, isFunction, union, isString } from 'lodash';
 import Render from './Render';
 import * as componentMap from '../index';
 import { isSelect } from '../../utils';
@@ -66,8 +66,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -130,17 +129,21 @@ var RenderFields = function RenderFields(props) {
       dataSource: dataSource,
       type: _type
     });
-    var _placeholder = placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(label || formLabel || '');
+    var placeholderHandle = function placeholderHandle() {
+      var _label = isString(label) ? label : '';
+      var _formLabel = isString(formLabel) ? formLabel : '';
+      return placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
+    };
     // 表单组件Props 兼容2.0版本
     var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
     if (isBoolean(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = _objectSpread(_objectSpread({
-      disabledStrictly: true
+      disabledStrictly: true,
+      placeholder: placeholderHandle()
     }, _fieldProps), {}, {
-      disabled: _disabled,
-      placeholder: _placeholder
+      disabled: _disabled
     });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {

package/es/ProForm/style/index.less

@@ -1,3 +1,5 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
 @import '../components/base/SwitchCheckbox/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
@@ -11,8 +13,8 @@
 @import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
-  &.ant-form-vertical {
-    .ant-form-item .ant-form-item-label {
+  &.@{ant-prefix}-form-vertical {
+    .@{ant-prefix}-form-item .@{ant-prefix}-form-item-label {
       flex: none !important;
     }
 
@@ -23,66 +25,66 @@
       margin-bottom: 0;
       padding-top: 6px;
 
-      .ant-space-align-center {
+      .@{ant-prefix}-space-align-center {
         align-items: normal;
       }
     }
   }
 
-  &.ant-form {
+  &.@{ant-prefix}-form {
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
   }
 
   .pro-collapse-level2 {
-    .ant-collapse-item {
+    .@{ant-prefix}-collapse-item {
       margin-bottom: 0 !important;
     }
   }
 
-  .ant-form-item-control-input {
+  .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
   }
 
-  span.ant-input-clear-icon {
+  span.@{ant-prefix}-input-clear-icon {
     display: unset;
     visibility: hidden;
   }
 
-  .ant-input-affix-wrapper:hover span.ant-input-clear-icon {
+  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon {
     display: unset;
     visibility: unset;
   }
 
-  .ant-input-affix-wrapper:hover span.ant-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
+  .@{ant-prefix}-input-affix-wrapper:hover span.@{ant-prefix}-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
     display: unset;
     visibility: hidden;
   }
 
   &.pro-form-view {
-    .ant-form-item-label {
+    .@{ant-prefix}-form-item-label {
       label {
         color: var(--zaui-aide-text, #939599);
       }
     }
 
-    .ant-form-item {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
-    .ant-form-item {
-      .ant-tree-icon-hide input {
+    .@{ant-prefix}-form-item {
+      .@{ant-prefix}-tree-icon-hide input {
         display: none !important;
       }
     }
   }
 
-  .ant-picker-range {
+  .@{ant-prefix}-picker-range {
     width: 100%;
   }
 
   .pro-form-list-line {
-    .ant-row {
+    .@{ant-prefix}-row {
       width: 100%;
     }
   }
@@ -101,20 +103,20 @@
     }
   }
 
-  .ant-form-item {
+  .@{ant-prefix}-form-item {
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
-      .ant-form-item-control-input {
+      .@{ant-prefix}-form-item-control-input {
         flex-grow: inherit;
       }
 
-      .ant-form-item-control-input-content {
+      .@{ant-prefix}-form-item-control-input-content {
         flex: initial;
       }
     }
 
-    .ant-form-item-tooltip {
+    .@{ant-prefix}-form-item-tooltip {
       svg {
         width: 14px;
         height: 14px;
@@ -125,53 +127,53 @@
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
-      span.ant-input-affix-wrapper,
-      .ant-select-selector,
-      .ant-picker {
+      span.@{ant-prefix}-input-affix-wrapper,
+      .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-picker {
         background: @zaui-contract-bg !important;
 
         input {
           background: @zaui-contract-bg;
         }
-        .ant-select-selection-placeholder {
+        .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
         }
       }
 
-      .ant-form-item-control-input-content > span {
+      .@{ant-prefix}-form-item-control-input-content > span {
         background: @zaui-contract-bg;
         padding: 4px 8px;
         border-radius: 4px;
       }
     }
 
-    .ant-row {
+    .@{ant-prefix}-row {
       width: 100%;
     }
 
-    .ant-col.ant-col-0 {
+    .@{ant-prefix}-col.@{ant-prefix}-col-0 {
       display: none;
     }
 
-    .ant-form-item-explain {
+    .@{ant-prefix}-form-item-explain {
       height: auto;
 
-      .ant-form-item-explain-error {
+      .@{ant-prefix}-form-item-explain-error {
         font-size: var(--zaui-font-size, 14px);
       }
     }
 
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       width: 100%;
     }
 
     .pro-number-range {
-      .ant-input-number {
+      .@{ant-prefix}-input-number {
         width: calc(50% - 20px);
       }
 
       .range-right {
-        .ant-input-number {
+        .@{ant-prefix}-input-number {
           border-left: none;
         }
 
@@ -185,11 +187,11 @@
     }
   }
 
-  .ant-form-item-hidden {
+  .@{ant-prefix}-form-item-hidden {
     display: none;
   }
 
-  .ant-form-item-label {
+  .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
     }
@@ -199,7 +201,7 @@
     margin-left: @zaui-space-size-sm;
   }
 
-  .ant-form-item-has-error {
+  .@{ant-prefix}-form-item-has-error {
     .group-separator {
       color: var(--ant-error-color);
       border-color: var(--ant-error-color);
@@ -229,16 +231,16 @@
       border-left-width: 1px;
     }
 
-    & .ant-input-rtl.site-input-right {
+    & .@{ant-prefix}-input-rtl.site-input-right {
       border-right-width: 0;
     }
 
-    & .ant-input-rtl.site-input-right:hover,
-    & .ant-input-rtl.site-input-right:focus {
+    & .@{ant-prefix}-input-rtl.site-input-right:hover,
+    & .@{ant-prefix}-input-rtl.site-input-right:focus {
       border-right-width: 1px;
     }
 
-    .ant-form-item {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0;
     }
 
@@ -248,18 +250,18 @@
     }
 
     .site-input-left {
-      .ant-input-number {
+      .@{ant-prefix}-input-number {
         border-right: none;
       }
     }
 
     .site-input-right {
-      .ant-input-number {
+      .@{ant-prefix}-input-number {
         border-left: none;
       }
     }
 
-    &.ant-input-group.ant-input-group-compact > *:not(:last-child) {
+    &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
       margin-right: 0;
     }
 
@@ -267,7 +269,7 @@
       border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
 
-      > .ant-select-selector {
+      > .@{ant-prefix}-select-selector {
         border-top-right-radius: 0 !important;
         border-bottom-right-radius: 0 !important;
       }
@@ -277,14 +279,14 @@
       border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
 
-      > .ant-select-selector {
+      > .@{ant-prefix}-select-selector {
         border-top-left-radius: 0 !important;
         border-bottom-left-radius: 0 !important;
       }
     }
   }
 
-  .ant-input-group.ant-input-group-compact > * {
+  .@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > * {
     float: none;
     vertical-align: top;
   }

package/es/ProForm/utils/rulesCreator.js

@@ -1,10 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { validate, regExp } from '@zat-design/utils';
+import { isString } from 'lodash';
 import { isNullValue } from './index';
 import locale from '../../locale';
 export var rulesCreator = function rulesCreator(rules, label, isSelect) {
   var _result;
-  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(label || '');
+  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
   result = rules.map(function (ruleItem) {
     var rule = _objectSpread({}, ruleItem);

package/es/ProForm/utils/useRules.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { useEffect, useMemo } from 'react';
-import { isBoolean } from 'lodash';
+import { isBoolean, isString } from 'lodash';
 import { rulesCreator } from './rulesCreator';
 import { isNotFullArray, isNullArray } from './index';
 import locale from '../../locale';
@@ -12,6 +12,7 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
+  var _label = isString(label) ? label : '';
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = useMemo(function () {
     var result = {
@@ -22,7 +23,7 @@ var useRules = function useRules(props) {
         return 'required' in rule;
       }));
       if (!requiredRule) {
-        var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(label || '') : "".concat(locale.ProForm.inputPlaceholder).concat(label || '');
+        var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
         var rule = {
           required: required,
           message: message
@@ -31,7 +32,7 @@ var useRules = function useRules(props) {
         if (names === null || names === void 0 ? void 0 : names.length) {
           rule.validator = function (_, value) {
             if (!value || isNullArray(value)) {
-              return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(label)));
+              return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
             }
             return Promise.resolve();
           };
@@ -42,7 +43,7 @@ var useRules = function useRules(props) {
     return result;
   }, [rules, required]);
   // type转换为内置rules
-  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, label, isSelect);
+  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, _label, isSelect);
   useEffect(function () {
     // 添加完整性校验
     if (names && !isBoolean(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
@@ -50,7 +51,7 @@ var useRules = function useRules(props) {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length)) {
-            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(label || '')));
+            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }

package/es/ProIcon/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-icon {
   cursor: pointer;
 
@@ -17,7 +20,7 @@
     display: inline-block;
   }
 
-  &.ant-btn-icon-only {
+  &.@{ant-prefix}-btn-icon-only {
     width  : auto;
     height : auto;
     padding: 0;

package/es/ProLayout/components/Layout/Header/style/index.less

@@ -15,7 +15,7 @@
     box-shadow     : 0px 1px 2px 0px rgba(0, 55, 93, 0.1) !important;
 
     .pro-layout-header-actions {
-      .ant-avatar {
+      .@{ant-prefix}-avatar {
         background: var(--zaui-brand, #006aff);
       }
     }

package/es/ProLayout/components/Layout/Menu/FoldMenu/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-layout-menu-fold-list {
   padding-top: 4px;
   overflow-y : auto;
@@ -73,28 +76,28 @@
   top: 80px !important
 }
 
-.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.ant-popover-placement-rightBottom,
-.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.ant-popover-placement-rightTop {
+.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.@{ant-prefix}-popover-placement-rightBottom,
+.pro-layout-menu-tooltip.pro-layout-menu-tooltip-nav-open.@{ant-prefix}-popover-placement-rightTop {
   left: 220px !important
 }
 
-.pro-layout-menu-tooltip.ant-popover-placement-rightBottom,
-.pro-layout-menu-tooltip.ant-popover-placement-rightTop {
+.pro-layout-menu-tooltip.@{ant-prefix}-popover-placement-rightBottom,
+.pro-layout-menu-tooltip.@{ant-prefix}-popover-placement-rightTop {
   position    : fixed;
   z-index     : 1001;
   left        : 49px !important;
   padding-left: 0
 }
 
-.pro-layout-menu-tooltip .ant-popover-inner-content {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-inner-content {
   padding: 0
 }
 
-.pro-layout-menu-tooltip .ant-popover-content>.ant-popover-arrow {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-content>.@{ant-prefix}-popover-arrow {
   display: none
 }
 
-.pro-layout-menu-tooltip .ant-popover-content .ant-popover-inner {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-content .@{ant-prefix}-popover-inner {
   padding   : 0;
   box-shadow: 2px 0px 5px 0px rgba(0, 55, 93, 0.1);
 }