autoUpdataFile

color.less

@@ -727,16 +727,25 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .ant-form-item-has-success.ant-form-item-has-feedback .ant-form-item-children-icon {color: @success-color;}
 .ant-form-item-has-warning .ant-form-item-explain, .ant-form-item-has-warning .ant-form-item-split {color: @warning-color;}
 .ant-form-item-has-warning .ant-input, .ant-form-item-has-warning .ant-input-affix-wrapper, .ant-form-item-has-warning .ant-input:hover, .ant-form-item-has-warning .ant-input-affix-wrapper:hover {border-color: @warning-color;}
+<<<<<<< HEAD
 .ant-form-item-has-warning .ant-input:focus, .ant-form-item-has-warning .ant-input-affix-wrapper:focus, .ant-form-item-has-warning .ant-input-focused, .ant-form-item-has-warning .ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(17, 95, 186, 0.2);}
 .ant-form-item-has-warning .ant-input:not(.ant-form-item-has-warning .ant-input-disabled) {background-color: #fff;}
 .ant-form-item-has-warning .ant-input-affix-wrapper:not(.ant-form-item-has-warning .ant-input-affix-wrapper-disabled) {background-color: #fff;}
 .ant-form-item-has-warning .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
 .ant-form-item-has-warning .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(17, 95, 186, 0.2);}
+=======
+.ant-form-item-has-warning .ant-input:focus, .ant-form-item-has-warning .ant-input-affix-wrapper:focus, .ant-form-item-has-warning .ant-input-focused, .ant-form-item-has-warning .ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(130, 205, 11, 0.2);}
+.ant-form-item-has-warning .ant-input:not(.ant-form-item-has-warning .ant-input-disabled) {background-color: #fff;}
+.ant-form-item-has-warning .ant-input-affix-wrapper:not(.ant-form-item-has-warning .ant-input-affix-wrapper-disabled) {background-color: #fff;}
+.ant-form-item-has-warning .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
+.ant-form-item-has-warning .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(130, 205, 11, 0.2);}
+>>>>>>> b68557e2795daf674b2fa6440b6c071f9ab42de7
 .ant-form-item-has-warning .ant-input-prefix {color: @warning-color;}
 .ant-form-item-has-warning .ant-input-group-addon {color: @warning-color;border-color: @warning-color;}
 .ant-form-item-has-warning .has-feedback {color: @warning-color;}
 .ant-form-item-has-warning.ant-form-item-has-feedback .ant-form-item-children-icon {color: @warning-color;}
 .ant-form-item-has-warning .ant-select:not(.ant-select-borderless) .ant-select-selector {border-color: @warning-color !important;}
+<<<<<<< HEAD
 .ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(17, 95, 186, 0.2);}
 .ant-form-item-has-warning .ant-input-number, .ant-form-item-has-warning .ant-picker {border-color: @warning-color;}
 .ant-form-item-has-warning .ant-input-number-focused, .ant-form-item-has-warning .ant-picker-focused, .ant-form-item-has-warning .ant-input-number:focus, .ant-form-item-has-warning .ant-picker:focus {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(17, 95, 186, 0.2);}
@@ -749,11 +758,26 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .ant-form-item-has-error .ant-input-affix-wrapper:not(.ant-form-item-has-error .ant-input-affix-wrapper-disabled) {background-color: #fff;}
 .ant-form-item-has-error .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
 .ant-form-item-has-error .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(120, 106, 196, 0.2);}
+=======
+.ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-warning .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(130, 205, 11, 0.2);}
+.ant-form-item-has-warning .ant-input-number, .ant-form-item-has-warning .ant-picker {border-color: @warning-color;}
+.ant-form-item-has-warning .ant-input-number-focused, .ant-form-item-has-warning .ant-picker-focused, .ant-form-item-has-warning .ant-input-number:focus, .ant-form-item-has-warning .ant-picker:focus {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(130, 205, 11, 0.2);}
+.ant-form-item-has-warning .ant-input-number:not([disabled]):hover, .ant-form-item-has-warning .ant-picker:not([disabled]):hover {border-color: @warning-color;}
+.ant-form-item-has-warning .ant-cascader-picker:focus .ant-cascader-input {border-color: color(~`colorPalette("@{warning-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(130, 205, 11, 0.2);}
+.ant-form-item-has-error .ant-form-item-explain, .ant-form-item-has-error .ant-form-item-split {color: @error-color;}
+.ant-form-item-has-error .ant-input, .ant-form-item-has-error .ant-input-affix-wrapper, .ant-form-item-has-error .ant-input:hover, .ant-form-item-has-error .ant-input-affix-wrapper:hover {border-color: @error-color;}
+.ant-form-item-has-error .ant-input:focus, .ant-form-item-has-error .ant-input-affix-wrapper:focus, .ant-form-item-has-error .ant-input-focused, .ant-form-item-has-error .ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(49, 160, 165, 0.2);}
+.ant-form-item-has-error .ant-input:not(.ant-form-item-has-error .ant-input-disabled) {background-color: #fff;}
+.ant-form-item-has-error .ant-input-affix-wrapper:not(.ant-form-item-has-error .ant-input-affix-wrapper-disabled) {background-color: #fff;}
+.ant-form-item-has-error .ant-input-affix-wrapper input:focus {box-shadow: none !important;}
+.ant-form-item-has-error .ant-calendar-picker-open .ant-calendar-picker-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(49, 160, 165, 0.2);}
+>>>>>>> b68557e2795daf674b2fa6440b6c071f9ab42de7
 .ant-form-item-has-error .ant-input-prefix {color: @error-color;}
 .ant-form-item-has-error .ant-input-group-addon {color: @error-color;border-color: @error-color;}
 .ant-form-item-has-error .has-feedback {color: @error-color;}
 .ant-form-item-has-error.ant-form-item-has-feedback .ant-form-item-children-icon {color: @error-color;}
 .ant-form-item-has-error .ant-select:not(.ant-select-borderless) .ant-select-selector {border-color: @error-color !important;}
+<<<<<<< HEAD
 .ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(120, 106, 196, 0.2);}
 .ant-form-item-has-error .ant-input-group-addon .ant-select.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {border: 0;}
 .ant-form-item-has-error .ant-select.ant-select-auto-complete .ant-input:focus {border-color: @error-color;}
@@ -763,6 +787,17 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):hover {border-color: @error-color;}
 .ant-form-item-has-error .ant-mention-wrapper.ant-mention-active:not([disabled]) .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):focus {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(120, 106, 196, 0.2);}
 .ant-form-item-has-error .ant-cascader-picker:focus .ant-cascader-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(120, 106, 196, 0.2);}
+=======
+.ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-open .ant-select-selector, .ant-form-item-has-error .ant-select:not(.ant-select-borderless).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(49, 160, 165, 0.2);}
+.ant-form-item-has-error .ant-input-group-addon .ant-select.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {border: 0;}
+.ant-form-item-has-error .ant-select.ant-select-auto-complete .ant-input:focus {border-color: @error-color;}
+.ant-form-item-has-error .ant-input-number, .ant-form-item-has-error .ant-picker {border-color: @error-color;}
+.ant-form-item-has-error .ant-input-number-focused, .ant-form-item-has-error .ant-picker-focused, .ant-form-item-has-error .ant-input-number:focus, .ant-form-item-has-error .ant-picker:focus {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(49, 160, 165, 0.2);}
+.ant-form-item-has-error .ant-input-number:not([disabled]):hover, .ant-form-item-has-error .ant-picker:not([disabled]):hover {border-color: @error-color;}
+.ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):hover {border-color: @error-color;}
+.ant-form-item-has-error .ant-mention-wrapper.ant-mention-active:not([disabled]) .ant-mention-editor, .ant-form-item-has-error .ant-mention-wrapper .ant-mention-editor:not([disabled]):focus {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(49, 160, 165, 0.2);}
+.ant-form-item-has-error .ant-cascader-picker:focus .ant-cascader-input {border-color: color(~`colorPalette("@{error-color}", 5)`);border-right-width: 1px !important;box-shadow: 0 0 0 2px rgba(49, 160, 165, 0.2);}
+>>>>>>> b68557e2795daf674b2fa6440b6c071f9ab42de7
 .ant-form-item-has-error .ant-transfer-list {border-color: @error-color;}
 .ant-form-item-has-error .ant-transfer-list-search:not([disabled]) {border-color: @border-color-base;}
 .ant-form-item-has-error .ant-transfer-list-search:not([disabled]):hover {border-color: color(~`colorPalette("@{primary-color}", 5)`);border-right-width: 1px !important;}

index.html

@@ -127,6 +127,10 @@
 
     <script src="/react/build/antdesign.10cb1592.async.js"></script>
     <script src="/react/build/vendors.697ba2ec.async.js"></script>
+<<<<<<< HEAD
     <script src="/react/build/umi.dfe0144d.js"></script>
+=======
+    <script src="/react/build/umi.bc2157ed.js"></script>
+>>>>>>> b68557e2795daf674b2fa6440b6c071f9ab42de7
   </body>
 </html>

p__User__OtherLogin.p__User__Register.p__User__ResetPassword.a98fe60a.async.js

@@ -1,4 +1,4 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[12],{BU3w:function(ee,A,a){"use strict";a.d(A,"a",function(){return o});var y=a("MNnm"),R="rc-util-key";function O(d){if(d.attachTo)return d.attachTo;var N=document.querySelector("head");return N||document.body}function C(d){var N,w=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{};if(!Object(y.a)())return null;var M=document.createElement("style");if((N=w.csp)===null||N===void 0?void 0:N.nonce){var t;M.nonce=(t=w.csp)===null||t===void 0?void 0:t.nonce}M.innerHTML=d;var s=O(w),h=s.firstChild;return w.prepend&&s.prepend?s.prepend(M):w.prepend&&h?s.insertBefore(M,h):s.appendChild(M),M}var x=new Map;function o(d,N){var w=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},M=O(w);if(!x.has(M)){var t=C("",w),s=t.parentNode;x.set(M,s),s.removeChild(t)}var h=Array.from(x.get(M).children).find(function(D){return D.tagName==="STYLE"&&D[R]===N});if(h){var p,c;if(((p=w.csp)===null||p===void 0?void 0:p.nonce)&&h.nonce!==((c=w.csp)===null||c===void 0?void 0:c.nonce)){var v;h.nonce=(v=w.csp)===null||v===void 0?void 0:v.nonce}return h.innerHTML!==d&&(h.innerHTML=d),h}var b=C(d,w);return b[R]=N,b}},Gytx:function(ee,A){ee.exports=function(y,R,O,C){var x=O?O.call(C,y,R):void 0;if(x!==void 0)return!!x;if(y===R)return!0;if(typeof y!="object"||!y||typeof R!="object"||!R)return!1;var o=Object.keys(y),d=Object.keys(R);if(o.length!==d.length)return!1;for(var N=Object.prototype.hasOwnProperty.bind(R),w=0;w<o.length;w++){var M=o[w];if(!N(M))return!1;var t=y[M],s=R[M];if(x=O?O.call(C,t,s,M):void 0,x===!1||x===void 0&&t!==s)return!1}return!0}},Y1PL:function(ee,A,a){"use strict";a.r(A),a.d(A,"ResizableTextArea",function(){return Q});var y=a("wx14"),R=a("1OyB"),O=a("vuIU"),C=a("Ji7U"),x=a("LK+K"),o=a("q1tI"),d=a("VTBJ"),N=a("rePB"),w=a("Zm9Q"),M=a("Kwbf"),t=a("c+Xe"),s=a("m+aA"),h=a("bdgK"),p=new Map;function c(n){n.forEach(function(u){var i,r=u.target;(i=p.get(r))===null||i===void 0||i.forEach(function(e){return e(r)})})}var v=new h.default(c),b=null,D=null;function ie(n,u){p.has(n)||(p.set(n,new Set),v.observe(n)),p.get(n).add(u)}function ae(n,u){p.has(n)&&(p.get(n).delete(u),p.get(n).size||(v.unobserve(n),p.delete(n)))}var te=function(n){Object(C.a)(i,n);var u=Object(x.a)(i);function i(){return Object(R.a)(this,i),u.apply(this,arguments)}return Object(O.a)(i,[{key:"render",value:function(){return this.props.children}}]),i}(o.Component),z=o.createContext(null);function G(n){var u=n.children,i=n.onBatchResize,r=o.useRef(0),e=o.useRef([]),l=o.useContext(z),f=o.useCallback(function(m,E,_){r.current+=1;var T=r.current;e.current.push({size:m,element:E,data:_}),Promise.resolve().then(function(){T===r.current&&(i==null||i(e.current),e.current=[])}),l==null||l(m,E,_)},[i,l]);return o.createElement(z.Provider,{value:f},u)}function V(n){var u=n.children,i=n.disabled,r=o.useRef(null),e=o.useRef(null),l=o.useContext(z),f=o.useRef({width:-1,height:-1,offsetWidth:-1,offsetHeight:-1}),m=o.isValidElement(u)&&Object(t.c)(u),E=m?u.ref:null,_=o.useMemo(function(){return Object(t.a)(E,r)},[E,r]),T=o.useRef(n);T.current=n;var U=o.useCallback(function(P){var q=T.current,le=q.onResize,oe=q.data,ue=P.getBoundingClientRect(),se=ue.width,fe=ue.height,de=P.offsetWidth,ce=P.offsetHeight,me=Math.floor(se),he=Math.floor(fe);if(f.current.width!==me||f.current.height!==he||f.current.offsetWidth!==de||f.current.offsetHeight!==ce){var ve={width:me,height:he,offsetWidth:de,offsetHeight:ce};f.current=ve;var be=de===Math.round(se)?se:de,Ee=ce===Math.round(fe)?fe:ce,pe=Object(d.a)(Object(d.a)({},ve),{},{offsetWidth:be,offsetHeight:Ee});l==null||l(pe,P,oe),le&&Promise.resolve().then(function(){le(pe,P)})}},[]);return o.useEffect(function(){var P=Object(s.a)(r.current)||Object(s.a)(e.current);return P&&!i&&ie(P,U),function(){return ae(P,U)}},[r.current,i]),o.createElement(te,{ref:e},m?o.cloneElement(u,{ref:_}):u)}var Z="rc-observer-key";function I(n){var u=n.children,i=Object(w.a)(u);return i.map(function(r,e){var l=(r==null?void 0:r.key)||"".concat(Z,"-").concat(e);return o.createElement(V,Object(y.a)({},n,{key:l}),r)})}I.Collection=G;var H=I,K=a("bT9E"),B=a("TSYQ"),Y=a.n(B),W=`
+(window.webpackJsonp=window.webpackJsonp||[]).push([[13],{BU3w:function(ee,A,a){"use strict";a.d(A,"a",function(){return o});var y=a("MNnm"),R="rc-util-key";function O(d){if(d.attachTo)return d.attachTo;var N=document.querySelector("head");return N||document.body}function C(d){var N,w=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{};if(!Object(y.a)())return null;var M=document.createElement("style");if((N=w.csp)===null||N===void 0?void 0:N.nonce){var t;M.nonce=(t=w.csp)===null||t===void 0?void 0:t.nonce}M.innerHTML=d;var s=O(w),h=s.firstChild;return w.prepend&&s.prepend?s.prepend(M):w.prepend&&h?s.insertBefore(M,h):s.appendChild(M),M}var x=new Map;function o(d,N){var w=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},M=O(w);if(!x.has(M)){var t=C("",w),s=t.parentNode;x.set(M,s),s.removeChild(t)}var h=Array.from(x.get(M).children).find(function(D){return D.tagName==="STYLE"&&D[R]===N});if(h){var p,c;if(((p=w.csp)===null||p===void 0?void 0:p.nonce)&&h.nonce!==((c=w.csp)===null||c===void 0?void 0:c.nonce)){var v;h.nonce=(v=w.csp)===null||v===void 0?void 0:v.nonce}return h.innerHTML!==d&&(h.innerHTML=d),h}var b=C(d,w);return b[R]=N,b}},Gytx:function(ee,A){ee.exports=function(y,R,O,C){var x=O?O.call(C,y,R):void 0;if(x!==void 0)return!!x;if(y===R)return!0;if(typeof y!="object"||!y||typeof R!="object"||!R)return!1;var o=Object.keys(y),d=Object.keys(R);if(o.length!==d.length)return!1;for(var N=Object.prototype.hasOwnProperty.bind(R),w=0;w<o.length;w++){var M=o[w];if(!N(M))return!1;var t=y[M],s=R[M];if(x=O?O.call(C,t,s,M):void 0,x===!1||x===void 0&&t!==s)return!1}return!0}},Y1PL:function(ee,A,a){"use strict";a.r(A),a.d(A,"ResizableTextArea",function(){return Q});var y=a("wx14"),R=a("1OyB"),O=a("vuIU"),C=a("Ji7U"),x=a("LK+K"),o=a("q1tI"),d=a("VTBJ"),N=a("rePB"),w=a("Zm9Q"),M=a("Kwbf"),t=a("c+Xe"),s=a("m+aA"),h=a("bdgK"),p=new Map;function c(n){n.forEach(function(u){var i,r=u.target;(i=p.get(r))===null||i===void 0||i.forEach(function(e){return e(r)})})}var v=new h.default(c),b=null,D=null;function ie(n,u){p.has(n)||(p.set(n,new Set),v.observe(n)),p.get(n).add(u)}function ae(n,u){p.has(n)&&(p.get(n).delete(u),p.get(n).size||(v.unobserve(n),p.delete(n)))}var te=function(n){Object(C.a)(i,n);var u=Object(x.a)(i);function i(){return Object(R.a)(this,i),u.apply(this,arguments)}return Object(O.a)(i,[{key:"render",value:function(){return this.props.children}}]),i}(o.Component),z=o.createContext(null);function G(n){var u=n.children,i=n.onBatchResize,r=o.useRef(0),e=o.useRef([]),l=o.useContext(z),f=o.useCallback(function(m,E,_){r.current+=1;var T=r.current;e.current.push({size:m,element:E,data:_}),Promise.resolve().then(function(){T===r.current&&(i==null||i(e.current),e.current=[])}),l==null||l(m,E,_)},[i,l]);return o.createElement(z.Provider,{value:f},u)}function V(n){var u=n.children,i=n.disabled,r=o.useRef(null),e=o.useRef(null),l=o.useContext(z),f=o.useRef({width:-1,height:-1,offsetWidth:-1,offsetHeight:-1}),m=o.isValidElement(u)&&Object(t.c)(u),E=m?u.ref:null,_=o.useMemo(function(){return Object(t.a)(E,r)},[E,r]),T=o.useRef(n);T.current=n;var U=o.useCallback(function(P){var q=T.current,le=q.onResize,oe=q.data,ue=P.getBoundingClientRect(),se=ue.width,fe=ue.height,de=P.offsetWidth,ce=P.offsetHeight,me=Math.floor(se),he=Math.floor(fe);if(f.current.width!==me||f.current.height!==he||f.current.offsetWidth!==de||f.current.offsetHeight!==ce){var ve={width:me,height:he,offsetWidth:de,offsetHeight:ce};f.current=ve;var be=de===Math.round(se)?se:de,Ee=ce===Math.round(fe)?fe:ce,pe=Object(d.a)(Object(d.a)({},ve),{},{offsetWidth:be,offsetHeight:Ee});l==null||l(pe,P,oe),le&&Promise.resolve().then(function(){le(pe,P)})}},[]);return o.useEffect(function(){var P=Object(s.a)(r.current)||Object(s.a)(e.current);return P&&!i&&ie(P,U),function(){return ae(P,U)}},[r.current,i]),o.createElement(te,{ref:e},m?o.cloneElement(u,{ref:_}):u)}var Z="rc-observer-key";function I(n){var u=n.children,i=Object(w.a)(u);return i.map(function(r,e){var l=(r==null?void 0:r.key)||"".concat(Z,"-").concat(e);return o.createElement(V,Object(y.a)({},n,{key:l}),r)})}I.Collection=G;var H=I,K=a("bT9E"),B=a("TSYQ"),Y=a.n(B),W=`
   min-height:0 !important;
   max-height:none !important;
   height:0 !important;