@univerjs/sheets-numfmt 0.8.0-beta.0 → 0.8.0-nightly.202505271607

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var Z=Object.defineProperty;var J=(e,r,s)=>r in e?Z(e,r,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[r]=s;var T=(e,r,s)=>J(e,typeof r!="symbol"?r+"":r,s);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("@univerjs/core"),f=require("@univerjs/sheets"),A=require("@univerjs/engine-numfmt"),N=require("rxjs"),X=require("@univerjs/engine-formula"),x=["$","£","¥","¤","֏","؋","৳","฿","₡","₦","₩","₪","₫","€","₭","₮","₱","₲","₴","₸","₹","₺","₼","₽","₾","₿"],L={US:"$",CA:"C$",GB:"£",JP:"¥",IN:"₹",AU:"A$",CN:"¥",KR:"₩",RU:"₽",AT:"€",BE:"€",CY:"€",EE:"€",FI:"€",FR:"€",DE:"€",GR:"€",IE:"€",IT:"€",LV:"€",LT:"€",LU:"€",MT:"€",NL:"€",PT:"€",SK:"€",SI:"€",ES:"€"},G=[{label:"1930-08-05",suffix:"yyyy-MM-dd"},{label:"1930/08/05",suffix:"yyyy/MM/dd"},{label:"1930年08月05日",suffix:'yyyy"年"MM"月"dd"日"'},{label:"08-05",suffix:"MM-dd"},{label:"8月5日",suffix:'M"月"d"日"'},{label:"13:30:30",suffix:"h:mm:ss"},{label:"13:30",suffix:"h:mm"},{label:"下午01:30",suffix:"A/P hh:mm"},{label:"下午1:30",suffix:"A/P h:mm"},{label:"下午1:30:30",suffix:"A/P h:mm:ss"},{label:"08-05 下午 01:30",suffix:"MM-dd A/P hh:mm"}],B=[{label:"(1,235)",suffix:"#,##0_);(#,##0)"},{label:"(1,235) ",suffix:"#,##0_);[Red](#,##0)",color:"red"},{label:"1,234.56",suffix:"#,##0.00_);#,##0.00"},{label:"1,234.56",suffix:"#,##0.00_);[Red]#,##0.00",color:"red"},{label:"-1,234.56",suffix:"#,##0.00_);-#,##0.00"},{label:"-1,234.56",suffix:"#,##0.00_);[Red]-#,##0.00",color:"red"}],V=[{label:e=>`${e}1,235`,suffix:e=>`"${e}"#,##0.00_);"${e}"#,##0.00`},{label:e=>`${e}1,235`,suffix:e=>`"${e}"#,##0.00_);[Red]"${e}"#,##0.00`,color:"red"},{label:e=>`(${e}1,235)`,suffix:e=>`"${e}"#,##0.00_);("${e}"#,##0.00)`},{label:e=>`(${e}1,235)`,suffix:e=>`"${e}"#,##0.00_);[Red]("${e}"#,##0.00)`,color:"red"},{label:e=>`-${e}1,235`,suffix:e=>`"${e}"#,##0.00_);-"${e}"#,##0.00`},{label:e=>`-${e}1,235`,suffix:e=>`"${e}"#,##0.00_);[Red]-"${e}"#,##0.00`,color:"red"}],Q="SHEET_NUMFMT_PLUGIN",E=(e,r=0)=>{var n;return e&&(n=t.numfmt.getInfo(e).maxDecimals)!=null?n:r},ee=(e,r)=>{if(e&&!r||!e&&r)return!1;const s=i=>i.reduce((S,C)=>{if(S.isEnd)return S;const h=C.value||C.num;return C.type==="point"?(S.isEnd=!0,S):{...S,result:S.result+h}},{isEnd:!1,result:""}).result,n=t.numfmt.getInfo(e)._partitions,a=t.numfmt.getInfo(r)._partitions,o=s(n[0].tokens),l=s(a[0].tokens),g=s(n[1].tokens),m=s(a[1].tokens);return o===l&&g===m&&n[1].color===a[1].color},U=e=>new Array(Math.min(Math.max(0,Number(e)),30)).fill(0).join(""),P=(e,r)=>e.split(";").map(n=>/\.0?/.test(n)?n.replace(/\.0*/g,`${r>0?".":""}${U(Number(r||0))}`):/0([^0]?)|0$/.test(n)?n.replace(/0([^0]+)|0$/,`0${r>0?".":""}${U(Number(r||0))}$1`):n).join(";"),te=e=>/\.0?/.test(e)||/0([^0]?)|0$/.test(e),R={id:"sheet.command.numfmt.set.numfmt",type:t.CommandType.COMMAND,handler:(e,r)=>{if(!r)return!1;const s=e.get(t.ICommandService),n=e.get(t.IUniverInstanceService),a=e.get(t.IUndoRedoService),o=f.getSheetCommandTarget(n,r);if(!o)return!1;const{unitId:l,subUnitId:g,worksheet:m}=o,i=r.values.filter(c=>!!c.pattern),S=r.values.filter(c=>!c.pattern),C=f.transformCellsToRange(l,g,i),h={unitId:l,subUnitId:g,ranges:S.map(c=>({startColumn:c.col,startRow:c.row,endColumn:c.col,endRow:c.row}))},M=[],p=[];if(i.length){const c=i.reduce((d,u)=>{A.isTextFormat(u.pattern)&&d.setValue(u.row,u.col,{t:t.CellValueType.STRING});const b=m.getCellRaw(u.row,u.col);if(b){const $=f.checkCellValueType(b.v);$!==b.t&&d.setValue(u.row,u.col,{t:$})}return d},new t.ObjectMatrix).getMatrix(),y=new t.ObjectMatrix;new t.ObjectMatrix(c).forValue((d,u)=>{const b=m.getCellRaw(d,u);b?y.setValue(d,u,{t:b.t}):y.setValue(d,u,{t:void 0})}),Object.keys(C.values).forEach(d=>{const u=C.values[d];u.ranges=f.rangeMerge(u.ranges)}),M.push({id:f.SetNumfmtMutation.id,params:C});const _=f.factorySetNumfmtUndoMutation(e,C);p.push(..._)}if(S.length){h.ranges=f.rangeMerge(h.ranges);const c=S.reduce((d,u)=>{const b=m.getCellRaw(u.row,u.col);if(b){const $=f.checkCellValueType(b.v);$!==b.t&&d.setValue(u.row,u.col,{t:$})}return d},new t.ObjectMatrix).getMatrix(),y=new t.ObjectMatrix;new t.ObjectMatrix(c).forValue((d,u)=>{const b=m.getCellRaw(d,u);b?y.setValue(d,u,{t:b.t}):y.setValue(d,u,{t:void 0})}),M.push({id:f.RemoveNumfmtMutation.id,params:h},{id:f.SetRangeValuesMutation.id,params:{unitId:l,subUnitId:g,cellValue:c}});const _=f.factoryRemoveNumfmtUndoMutation(e,h);p.push({id:f.SetRangeValuesMutation.id,params:{unitId:l,subUnitId:g,cellValue:y.getMatrix()}},..._)}const v=t.sequenceExecute(M,s).result;return v&&a.pushUndoRedo({unitID:l,undoMutations:p,redoMutations:M}),v}},H={id:"sheet.command.numfmt.add.decimal.command",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),s=e.get(f.SheetsSelectionsService),n=e.get(f.INumfmtService),a=e.get(t.IUniverInstanceService),o=s.getCurrentSelections();if(!o||!o.length)return!1;const l=f.getSheetCommandTarget(a);if(!l)return!1;const{unitId:g,subUnitId:m}=l;let i=0;o.forEach(M=>{t.Range.foreach(M.range,(p,v)=>{const c=n.getValue(g,m,p,v);if(!c){const _=l.worksheet.getCellRaw(p,v);if(!i&&_&&_.t===t.CellValueType.NUMBER&&_.v){const d=/\.(\d*)$/.exec(String(_.v));if(d){const u=d[1].length;if(!u)return;i=Math.max(i,u)}}return}const y=E(c.pattern);i=y>i?y:i})});const S=i+1,C=P(`0${S>0?".0":""}`,S),h=[];return o.forEach(M=>{t.Range.foreach(M.range,(p,v)=>{const c=n.getValue(g,m,p,v);if(!c)h.push({row:p,col:v,pattern:C});else{const y=E(c.pattern),_=P(c.pattern,y+1);_!==c.pattern&&h.push({row:p,col:v,pattern:_})}})}),h.length?await r.executeCommand(R.id,{values:h}):!1}};class D{constructor(){T(this,"_currencySymbol$",new N.BehaviorSubject("US"));T(this,"currencySymbol$",this._currencySymbol$.asObservable())}setCurrencySymbolByCountryCode(r){this._currencySymbol$.next(r)}getCurrencySymbol(){return this._currencySymbol$.getValue()}}const W={id:"sheet.command.numfmt.set.currency",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),s=e.get(f.SheetsSelectionsService),n=e.get(D),a=L[n.getCurrencySymbol()]||"$",o=s.getCurrentSelections();if(!o||!o.length)return!1;const l=[],g=V[4].suffix(a);return o.forEach(i=>{t.Range.foreach(i.range,(S,C)=>{l.push({row:S,col:C,pattern:g,type:"currency"})})}),await r.executeCommand(R.id,{values:l})}},q={id:"sheet.command.numfmt.set.percent",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),n=e.get(f.SheetsSelectionsService).getCurrentSelections();if(!n||!n.length)return!1;const a=[],o="0%";return n.forEach(g=>{t.Range.foreach(g.range,(m,i)=>{a.push({row:m,col:i,pattern:o,type:"percent"})})}),await r.executeCommand(R.id,{values:a})}},k={id:"sheet.command.numfmt.subtract.decimal.command",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),s=e.get(f.SheetsSelectionsService),n=e.get(f.INumfmtService),a=e.get(t.IUniverInstanceService),o=s.getCurrentSelections();if(!o||!o.length)return!1;const l=f.getSheetCommandTarget(a);if(!l)return!1;const{unitId:g,subUnitId:m}=l;let i=0;o.forEach(p=>{t.Range.foreach(p.range,(v,c)=>{const y=n.getValue(g,m,v,c);if(!y){const d=l.worksheet.getCellRaw(v,c);if(!i&&d&&d.t===t.CellValueType.NUMBER&&d.v){const u=/\.(\d*)$/.exec(String(d.v));if(u){const b=u[1].length;if(!b)return;i=Math.max(i,b)}}return}const _=E(y.pattern);i=_>i?_:i})});const S=i-1,C=P(`0${S>0?".0":"."}`,S),h=[];return o.forEach(p=>{t.Range.foreach(p.range,(v,c)=>{const y=n.getValue(g,m,v,c);if(!y)h.push({row:v,col:c,pattern:C});else{const _=E(y.pattern);h.push({row:v,col:c,pattern:P(y.pattern,_-1)})}})}),await r.executeCommand(R.id,{values:h})}},w="sheets-numfmt.config",j={},ne=e=>t.numfmt.getInfo(e).type||"unknown",K=(e,r,s="en")=>{const a=t.numfmt.getInfo(e)._partitions[1],o=t.numfmt.format(e,r,{locale:s,throws:!1});return r<0?{result:o,color:a.color}:{result:o}},Y=(e,r,s)=>e==="General"?{result:String(X.stripErrorMargin(r))}:K(e,r,s);var re=Object.getOwnPropertyDescriptor,se=(e,r,s,n)=>{for(var a=n>1?void 0:n?re(r,s):r,o=e.length-1,l;o>=0;o--)(l=e[o])&&(a=l(a)||a);return a},I=(e,r)=>(s,n)=>r(s,n,e);const oe={tl:{size:6,color:"#409f11"}};exports.SheetsNumfmtCellContentController=class extends t.Disposable{constructor(s,n,a,o,l,g,m){super();T(this,"_local$",new N.BehaviorSubject("en"));T(this,"local$",this._local$.asObservable());this._instanceService=s,this._sheetInterceptorService=n,this._themeService=a,this._commandService=o,this._numfmtService=l,this._localeService=g,this._configService=m,this._initInterceptorCellContent()}get local(){const s=this._local$.getValue();if(s)return s;switch(this._localeService.getCurrentLocale()){case t.LocaleType.FR_FR:return"fr";case t.LocaleType.RU_RU:return"ru";case t.LocaleType.VI_VN:return"vi";case t.LocaleType.ZH_CN:return"zh-CN";case t.LocaleType.ZH_TW:return"zh-TW";case t.LocaleType.EN_US:case t.LocaleType.FA_IR:default:return"en"}}_initInterceptorCellContent(){const s=new t.ObjectMatrix;this.disposeWithMe(N.merge(this._local$,this._localeService.currentLocale$).subscribe(()=>{s.reset()})),this.disposeWithMe(this._sheetInterceptorService.intercept(f.INTERCEPTOR_POINT.CELL_CONTENT,{effect:t.InterceptorEffectEnum.Value|t.InterceptorEffectEnum.Style,handler:(n,a,o)=>{var v;const l=a.unitId,g=a.subUnitId;let m;const i=n;if(!i)return o(n);if(n!=null&&n.s){const c=a.workbook.getStyles().get(n.s);c!=null&&c.n&&(m=c.n)}if(m||(m=this._numfmtService.getValue(l,g,a.row,a.col)),!m||(n.t||f.checkCellValueType(i.v))!==t.CellValueType.NUMBER)return o(n);if(A.isTextFormat(m.pattern))return(v=this._configService.getConfig(w))!=null&&v.disableTextFormatMark?o({...n,t:t.CellValueType.STRING}):o({...n,t:t.CellValueType.STRING,markers:{...n==null?void 0:n.markers,...oe}});let C="";const h=s.getValue(a.row,a.col);if(h&&h.parameters===`${i.v}_${m.pattern}`)return o({...n,...h.result});if(i.v===void 0||i.v===null)return o(n);const M=Y(m.pattern,Number(i.v),this.local);if(C=M.result,!C)return o(n);const p={v:C,t:t.CellValueType.NUMBER};if(M.color){const c=this._themeService.getColorFromTheme(`${M.color}.500`);c&&(p.interceptorStyle={cl:{rgb:c}})}return s.setValue(a.row,a.col,{result:p,parameters:`${i.v}_${m.pattern}`}),o({...n,...p})},priority:f.InterceptCellContentPriority.NUMFMT})),this.disposeWithMe(this._commandService.onCommandExecuted(n=>{if(n.id===f.SetNumfmtMutation.id){const a=n.params;Object.keys(a.values).forEach(o=>{a.values[o].ranges.forEach(g=>{t.Range.foreach(g,(m,i)=>{s.realDeleteValue(m,i)})})})}else if(n.id===f.SetRangeValuesMutation.id){const a=n.params;new t.ObjectMatrix(a.cellValue).forValue((o,l)=>{s.realDeleteValue(o,l)})}})),this.disposeWithMe(this._instanceService.getCurrentTypeOfUnit$(t.UniverInstanceType.UNIVER_SHEET).pipe(N.switchMap(n=>{var a;return(a=n==null?void 0:n.activeSheet$)!=null?a:N.of(null)}),N.skip(1)).subscribe(()=>s.reset()))}setNumfmtLocal(s){this._local$.next(s)}};exports.SheetsNumfmtCellContentController=se([I(0,t.IUniverInstanceService),I(1,t.Inject(f.SheetInterceptorService)),I(2,t.Inject(t.ThemeService)),I(3,t.Inject(t.ICommandService)),I(4,t.Inject(f.INumfmtService)),I(5,t.Inject(t.LocaleService)),I(6,t.IConfigService)],exports.SheetsNumfmtCellContentController);class F extends t.Disposable{constructor(){super(...arguments);T(this,"_currencySymbol$",new N.BehaviorSubject("US"));T(this,"currencySymbol$",this._currencySymbol$.asObservable())}setCurrencySymbolByCountryCode(s){this._currencySymbol$.next(s)}getCurrencySymbol(){return this._currencySymbol$.getValue()}}var ae=Object.defineProperty,ce=Object.getOwnPropertyDescriptor,ie=(e,r,s)=>r in e?ae(e,r,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[r]=s,le=(e,r,s,n)=>{for(var a=n>1?void 0:n?ce(r,s):r,o=e.length-1,l;o>=0;o--)(l=e[o])&&(a=l(a)||a);return a},O=(e,r)=>(s,n)=>r(s,n,e),z=(e,r,s)=>ie(e,typeof r!="symbol"?r+"":r,s);exports.UniverSheetsNumfmtPlugin=class extends t.Plugin{constructor(r=j,s,n,a){super(),this._config=r,this._injector=s,this._configService=n,this._commandService=a;const{...o}=t.merge({},j,this._config);this._configService.setConfig(w,o)}onStarting(){t.registerDependencies(this._injector,[[exports.SheetsNumfmtCellContentController],[D],[F]]),t.touchDependencies(this._injector,[[exports.SheetsNumfmtCellContentController]])}onRendered(){t.touchDependencies(this._injector,[[F]]),[H,k,W,q,R].forEach(r=>{this.disposeWithMe(this._commandService.registerCommand(r))})}};z(exports.UniverSheetsNumfmtPlugin,"pluginName",Q);z(exports.UniverSheetsNumfmtPlugin,"type",t.UniverInstanceType.UNIVER_SHEET);exports.UniverSheetsNumfmtPlugin=le([t.DependentOn(f.UniverSheetsPlugin),O(1,t.Inject(t.Injector)),O(2,t.IConfigService),O(3,t.ICommandService)],exports.UniverSheetsNumfmtPlugin);const ue=e=>x.find(s=>e.includes(s)),me=()=>x.map(e=>({label:e,value:e})),fe=e=>V.map(r=>({label:r.label(e),value:r.suffix(e),color:r.color})),de=()=>G.map(e=>({label:e.label,value:e.suffix})),ge=()=>B.map(e=>({label:e.label,value:e.suffix,color:e.color}));exports.AddDecimalCommand=H;exports.CURRENCYFORMAT=V;exports.DATEFMTLISG=G;exports.MenuCurrencyService=D;exports.NUMBERFORMAT=B;exports.SHEETS_NUMFMT_PLUGIN_CONFIG_KEY=w;exports.SetCurrencyCommand=W;exports.SetNumfmtCommand=R;exports.SetPercentCommand=q;exports.SubtractDecimalCommand=k;exports.countryCurrencyMap=L;exports.currencySymbols=x;exports.getCurrencyFormatOptions=fe;exports.getCurrencyOptions=me;exports.getCurrencyType=ue;exports.getDateFormatOptions=de;exports.getDecimalFromPattern=E;exports.getDecimalString=U;exports.getNumberFormatOptions=ge;exports.getPatternPreview=K;exports.getPatternPreviewIgnoreGeneral=Y;exports.getPatternType=ne;exports.isPatternEqualWithoutDecimal=ee;exports.isPatternHasDecimal=te;exports.setPatternDecimal=P;
+"use strict";var Z=Object.defineProperty;var J=(e,r,s)=>r in e?Z(e,r,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[r]=s;var T=(e,r,s)=>J(e,typeof r!="symbol"?r+"":r,s);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("@univerjs/core"),f=require("@univerjs/sheets"),A=require("@univerjs/engine-numfmt"),N=require("rxjs"),X=require("@univerjs/engine-formula"),U=["$","£","¥","¤","֏","؋","৳","฿","₡","₦","₩","₪","₫","€","₭","₮","₱","₲","₴","₸","₹","₺","₼","₽","₾","₿"],L={US:"$",CA:"C$",GB:"£",JP:"¥",IN:"₹",AU:"A$",CN:"¥",KR:"₩",RU:"₽",AT:"€",BE:"€",CY:"€",EE:"€",FI:"€",FR:"€",DE:"€",GR:"€",IE:"€",IT:"€",LV:"€",LT:"€",LU:"€",MT:"€",NL:"€",PT:"€",SK:"€",SI:"€",ES:"€"},G=[{label:"1930-08-05",suffix:"yyyy-MM-dd"},{label:"1930/08/05",suffix:"yyyy/MM/dd"},{label:"1930年08月05日",suffix:'yyyy"年"MM"月"dd"日"'},{label:"08-05",suffix:"MM-dd"},{label:"8月5日",suffix:'M"月"d"日"'},{label:"13:30:30",suffix:"h:mm:ss"},{label:"13:30",suffix:"h:mm"},{label:"下午01:30",suffix:"A/P hh:mm"},{label:"下午1:30",suffix:"A/P h:mm"},{label:"下午1:30:30",suffix:"A/P h:mm:ss"},{label:"08-05 下午 01:30",suffix:"MM-dd A/P hh:mm"}],B=[{label:"(1,235)",suffix:"#,##0_);(#,##0)"},{label:"(1,235) ",suffix:"#,##0_);[Red](#,##0)",color:"red"},{label:"1,234.56",suffix:"#,##0.00_);#,##0.00"},{label:"1,234.56",suffix:"#,##0.00_);[Red]#,##0.00",color:"red"},{label:"-1,234.56",suffix:"#,##0.00_);-#,##0.00"},{label:"-1,234.56",suffix:"#,##0.00_);[Red]-#,##0.00",color:"red"}],V=[{label:e=>`${e}1,235`,suffix:e=>`"${e}"#,##0.00_);"${e}"#,##0.00`},{label:e=>`${e}1,235`,suffix:e=>`"${e}"#,##0.00_);[Red]"${e}"#,##0.00`,color:"red"},{label:e=>`(${e}1,235)`,suffix:e=>`"${e}"#,##0.00_);("${e}"#,##0.00)`},{label:e=>`(${e}1,235)`,suffix:e=>`"${e}"#,##0.00_);[Red]("${e}"#,##0.00)`,color:"red"},{label:e=>`-${e}1,235`,suffix:e=>`"${e}"#,##0.00_);-"${e}"#,##0.00`},{label:e=>`-${e}1,235`,suffix:e=>`"${e}"#,##0.00_);[Red]-"${e}"#,##0.00`,color:"red"}],Q="SHEET_NUMFMT_PLUGIN",E=(e,r=0)=>{var n;return e&&(n=t.numfmt.getInfo(e).maxDecimals)!=null?n:r},ee=(e,r)=>{if(e&&!r||!e&&r)return!1;const s=i=>i.reduce((S,C)=>{if(S.isEnd)return S;const h=C.value||C.num;return C.type==="point"?(S.isEnd=!0,S):{...S,result:S.result+h}},{isEnd:!1,result:""}).result,n=t.numfmt.getInfo(e)._partitions,o=t.numfmt.getInfo(r)._partitions,a=s(n[0].tokens),l=s(o[0].tokens),g=s(n[1].tokens),u=s(o[1].tokens);return a===l&&g===u&&n[1].color===o[1].color},x=e=>new Array(Math.min(Math.max(0,Number(e)),30)).fill(0).join(""),P=(e,r)=>e.split(";").map(n=>/\.0?/.test(n)?n.replace(/\.0*/g,`${r>0?".":""}${x(Number(r||0))}`):/0([^0]?)|0$/.test(n)?n.replace(/0([^0]+)|0$/,`0${r>0?".":""}${x(Number(r||0))}$1`):n).join(";"),te=e=>/\.0?/.test(e)||/0([^0]?)|0$/.test(e),R={id:"sheet.command.numfmt.set.numfmt",type:t.CommandType.COMMAND,handler:(e,r)=>{if(!r)return!1;const s=e.get(t.ICommandService),n=e.get(t.IUniverInstanceService),o=e.get(t.IUndoRedoService),a=f.getSheetCommandTarget(n,r);if(!a)return!1;const{unitId:l,subUnitId:g,worksheet:u}=a,i=r.values.filter(c=>!!c.pattern),S=r.values.filter(c=>!c.pattern),C=f.transformCellsToRange(l,g,i),h={unitId:l,subUnitId:g,ranges:S.map(c=>({startColumn:c.col,startRow:c.row,endColumn:c.col,endRow:c.row}))},M=[],p=[];if(i.length){const c=i.reduce((d,m)=>{A.isTextFormat(m.pattern)&&d.setValue(m.row,m.col,{t:t.CellValueType.STRING});const b=u.getCellRaw(m.row,m.col);if(b){const $=f.checkCellValueType(b.v);$!==b.t&&d.setValue(m.row,m.col,{t:$})}return d},new t.ObjectMatrix).getMatrix(),y=new t.ObjectMatrix;new t.ObjectMatrix(c).forValue((d,m)=>{const b=u.getCellRaw(d,m);b?y.setValue(d,m,{t:b.t}):y.setValue(d,m,{t:void 0})}),Object.keys(C.values).forEach(d=>{const m=C.values[d];m.ranges=f.rangeMerge(m.ranges)}),M.push({id:f.SetNumfmtMutation.id,params:C});const _=f.factorySetNumfmtUndoMutation(e,C);p.push(..._)}if(S.length){h.ranges=f.rangeMerge(h.ranges);const c=S.reduce((d,m)=>{const b=u.getCellRaw(m.row,m.col);if(b){const $=f.checkCellValueType(b.v);$!==b.t&&d.setValue(m.row,m.col,{t:$})}return d},new t.ObjectMatrix).getMatrix(),y=new t.ObjectMatrix;new t.ObjectMatrix(c).forValue((d,m)=>{const b=u.getCellRaw(d,m);b?y.setValue(d,m,{t:b.t}):y.setValue(d,m,{t:void 0})}),M.push({id:f.RemoveNumfmtMutation.id,params:h},{id:f.SetRangeValuesMutation.id,params:{unitId:l,subUnitId:g,cellValue:c}});const _=f.factoryRemoveNumfmtUndoMutation(e,h);p.push({id:f.SetRangeValuesMutation.id,params:{unitId:l,subUnitId:g,cellValue:y.getMatrix()}},..._)}const v=t.sequenceExecute(M,s).result;return v&&o.pushUndoRedo({unitID:l,undoMutations:p,redoMutations:M}),v}},H={id:"sheet.command.numfmt.add.decimal.command",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),s=e.get(f.SheetsSelectionsService),n=e.get(f.INumfmtService),o=e.get(t.IUniverInstanceService),a=s.getCurrentSelections();if(!a||!a.length)return!1;const l=f.getSheetCommandTarget(o);if(!l)return!1;const{unitId:g,subUnitId:u}=l;let i=0;a.forEach(M=>{t.Range.foreach(M.range,(p,v)=>{const c=n.getValue(g,u,p,v);if(!c){const _=l.worksheet.getCellRaw(p,v);if(!i&&_&&_.t===t.CellValueType.NUMBER&&_.v){const d=/\.(\d*)$/.exec(String(_.v));if(d){const m=d[1].length;if(!m)return;i=Math.max(i,m)}}return}const y=E(c.pattern);i=y>i?y:i})});const S=i+1,C=P(`0${S>0?".0":""}`,S),h=[];return a.forEach(M=>{t.Range.foreach(M.range,(p,v)=>{const c=n.getValue(g,u,p,v);if(!c)h.push({row:p,col:v,pattern:C});else{const y=E(c.pattern),_=P(c.pattern,y+1);_!==c.pattern&&h.push({row:p,col:v,pattern:_})}})}),h.length?await r.executeCommand(R.id,{values:h}):!1}};class D{constructor(){T(this,"_currencySymbol$",new N.BehaviorSubject("US"));T(this,"currencySymbol$",this._currencySymbol$.asObservable())}setCurrencySymbolByCountryCode(r){this._currencySymbol$.next(r)}getCurrencySymbol(){return this._currencySymbol$.getValue()}}const W={id:"sheet.command.numfmt.set.currency",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),s=e.get(f.SheetsSelectionsService),n=e.get(D),o=L[n.getCurrencySymbol()]||"$",a=s.getCurrentSelections();if(!a||!a.length)return!1;const l=[],g=V[4].suffix(o);return a.forEach(i=>{t.Range.foreach(i.range,(S,C)=>{l.push({row:S,col:C,pattern:g,type:"currency"})})}),await r.executeCommand(R.id,{values:l})}},q={id:"sheet.command.numfmt.set.percent",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),n=e.get(f.SheetsSelectionsService).getCurrentSelections();if(!n||!n.length)return!1;const o=[],a="0%";return n.forEach(g=>{t.Range.foreach(g.range,(u,i)=>{o.push({row:u,col:i,pattern:a,type:"percent"})})}),await r.executeCommand(R.id,{values:o})}},k={id:"sheet.command.numfmt.subtract.decimal.command",type:t.CommandType.COMMAND,handler:async e=>{const r=e.get(t.ICommandService),s=e.get(f.SheetsSelectionsService),n=e.get(f.INumfmtService),o=e.get(t.IUniverInstanceService),a=s.getCurrentSelections();if(!a||!a.length)return!1;const l=f.getSheetCommandTarget(o);if(!l)return!1;const{unitId:g,subUnitId:u}=l;let i=0;a.forEach(p=>{t.Range.foreach(p.range,(v,c)=>{const y=n.getValue(g,u,v,c);if(!y){const d=l.worksheet.getCellRaw(v,c);if(!i&&d&&d.t===t.CellValueType.NUMBER&&d.v){const m=/\.(\d*)$/.exec(String(d.v));if(m){const b=m[1].length;if(!b)return;i=Math.max(i,b)}}return}const _=E(y.pattern);i=_>i?_:i})});const S=i-1,C=P(`0${S>0?".0":"."}`,S),h=[];return a.forEach(p=>{t.Range.foreach(p.range,(v,c)=>{const y=n.getValue(g,u,v,c);if(!y)h.push({row:v,col:c,pattern:C});else{const _=E(y.pattern);h.push({row:v,col:c,pattern:P(y.pattern,_-1)})}})}),await r.executeCommand(R.id,{values:h})}},w="sheets-numfmt.config",j={},ne=e=>t.numfmt.getInfo(e).type||"unknown",K=(e,r,s="en")=>{const o=t.numfmt.getInfo(e)._partitions[1],a=t.numfmt.format(e,r,{locale:s,throws:!1});return r<0?{result:a,color:o.color}:{result:a}},Y=(e,r,s)=>e==="General"?{result:String(X.stripErrorMargin(r))}:K(e,r,s);var re=Object.getOwnPropertyDescriptor,se=(e,r,s,n)=>{for(var o=n>1?void 0:n?re(r,s):r,a=e.length-1,l;a>=0;a--)(l=e[a])&&(o=l(o)||o);return o},I=(e,r)=>(s,n)=>r(s,n,e);const oe={tl:{size:6,color:"#409f11"}};exports.SheetsNumfmtCellContentController=class extends t.Disposable{constructor(s,n,o,a,l,g,u){super();T(this,"_local$",new N.BehaviorSubject("en"));T(this,"local$",this._local$.asObservable());this._instanceService=s,this._sheetInterceptorService=n,this._themeService=o,this._commandService=a,this._numfmtService=l,this._localeService=g,this._configService=u,this._initInterceptorCellContent()}get local(){const s=this._local$.getValue();if(s)return s;switch(this._localeService.getCurrentLocale()){case t.LocaleType.FR_FR:return"fr";case t.LocaleType.RU_RU:return"ru";case t.LocaleType.VI_VN:return"vi";case t.LocaleType.ZH_CN:return"zh-CN";case t.LocaleType.ZH_TW:return"zh-TW";case t.LocaleType.EN_US:case t.LocaleType.FA_IR:default:return"en"}}_initInterceptorCellContent(){const s=new t.ObjectMatrix;this.disposeWithMe(N.merge(this._local$,this._localeService.currentLocale$).subscribe(()=>{s.reset()})),this.disposeWithMe(this._sheetInterceptorService.intercept(f.INTERCEPTOR_POINT.CELL_CONTENT,{effect:t.InterceptorEffectEnum.Value|t.InterceptorEffectEnum.Style,handler:(n,o,a)=>{var v;const l=o.unitId,g=o.subUnitId;let u;const i=n;if(!i||i.v===void 0||i.v===null)return a(n);if(n!=null&&n.s){const c=o.workbook.getStyles().get(n.s);c!=null&&c.n&&(u=c.n)}if(u||(u=this._numfmtService.getValue(l,g,o.row,o.col)),!u||u.pattern==="General"||f.checkCellValueType(i.v)!==t.CellValueType.NUMBER)return a(n);if((!n||n===o.rawData)&&(n={...o.rawData}),A.isTextFormat(u.pattern))return(v=this._configService.getConfig(w))!=null&&v.disableTextFormatMark?(n.t=t.CellValueType.STRING,a(n)):(n.t=t.CellValueType.STRING,n.markers={...n==null?void 0:n.markers,...oe},a(n));let C="";const h=s.getValue(o.row,o.col);if(h&&h.parameters===`${i.v}_${u.pattern}`)return a({...n,...h.result});const M=Y(u.pattern,Number(i.v),this.local);if(C=M.result,!C)return a(n);const p={v:C,t:t.CellValueType.NUMBER};if(M.color){const c=this._themeService.getColorFromTheme(`${M.color}.500`);c&&(p.interceptorStyle={cl:{rgb:c}})}return s.setValue(o.row,o.col,{result:p,parameters:`${i.v}_${u.pattern}`}),Object.assign(n,p),a(n)},priority:f.InterceptCellContentPriority.NUMFMT})),this.disposeWithMe(this._commandService.onCommandExecuted(n=>{if(n.id===f.SetNumfmtMutation.id){const o=n.params;Object.keys(o.values).forEach(a=>{o.values[a].ranges.forEach(g=>{t.Range.foreach(g,(u,i)=>{s.realDeleteValue(u,i)})})})}else if(n.id===f.SetRangeValuesMutation.id){const o=n.params;new t.ObjectMatrix(o.cellValue).forValue((a,l)=>{s.realDeleteValue(a,l)})}})),this.disposeWithMe(this._instanceService.getCurrentTypeOfUnit$(t.UniverInstanceType.UNIVER_SHEET).pipe(N.switchMap(n=>{var o;return(o=n==null?void 0:n.activeSheet$)!=null?o:N.of(null)}),N.skip(1)).subscribe(()=>s.reset()))}setNumfmtLocal(s){this._local$.next(s)}};exports.SheetsNumfmtCellContentController=se([I(0,t.IUniverInstanceService),I(1,t.Inject(f.SheetInterceptorService)),I(2,t.Inject(t.ThemeService)),I(3,t.Inject(t.ICommandService)),I(4,t.Inject(f.INumfmtService)),I(5,t.Inject(t.LocaleService)),I(6,t.IConfigService)],exports.SheetsNumfmtCellContentController);class F extends t.Disposable{constructor(){super(...arguments);T(this,"_currencySymbol$",new N.BehaviorSubject("US"));T(this,"currencySymbol$",this._currencySymbol$.asObservable())}setCurrencySymbolByCountryCode(s){this._currencySymbol$.next(s)}getCurrencySymbol(){return this._currencySymbol$.getValue()}}var ae=Object.defineProperty,ce=Object.getOwnPropertyDescriptor,ie=(e,r,s)=>r in e?ae(e,r,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[r]=s,le=(e,r,s,n)=>{for(var o=n>1?void 0:n?ce(r,s):r,a=e.length-1,l;a>=0;a--)(l=e[a])&&(o=l(o)||o);return o},O=(e,r)=>(s,n)=>r(s,n,e),z=(e,r,s)=>ie(e,typeof r!="symbol"?r+"":r,s);exports.UniverSheetsNumfmtPlugin=class extends t.Plugin{constructor(r=j,s,n,o){super(),this._config=r,this._injector=s,this._configService=n,this._commandService=o;const{...a}=t.merge({},j,this._config);this._configService.setConfig(w,a)}onStarting(){t.registerDependencies(this._injector,[[exports.SheetsNumfmtCellContentController],[D],[F]]),t.touchDependencies(this._injector,[[exports.SheetsNumfmtCellContentController]])}onRendered(){t.touchDependencies(this._injector,[[F]]),[H,k,W,q,R].forEach(r=>{this.disposeWithMe(this._commandService.registerCommand(r))})}};z(exports.UniverSheetsNumfmtPlugin,"pluginName",Q);z(exports.UniverSheetsNumfmtPlugin,"type",t.UniverInstanceType.UNIVER_SHEET);exports.UniverSheetsNumfmtPlugin=le([t.DependentOn(f.UniverSheetsPlugin),O(1,t.Inject(t.Injector)),O(2,t.IConfigService),O(3,t.ICommandService)],exports.UniverSheetsNumfmtPlugin);const ue=e=>U.find(s=>e.includes(s)),me=()=>U.map(e=>({label:e,value:e})),fe=e=>V.map(r=>({label:r.label(e),value:r.suffix(e),color:r.color})),de=()=>G.map(e=>({label:e.label,value:e.suffix})),ge=()=>B.map(e=>({label:e.label,value:e.suffix,color:e.color}));exports.AddDecimalCommand=H;exports.CURRENCYFORMAT=V;exports.DATEFMTLISG=G;exports.MenuCurrencyService=D;exports.NUMBERFORMAT=B;exports.SHEETS_NUMFMT_PLUGIN_CONFIG_KEY=w;exports.SetCurrencyCommand=W;exports.SetNumfmtCommand=R;exports.SetPercentCommand=q;exports.SubtractDecimalCommand=k;exports.countryCurrencyMap=L;exports.currencySymbols=U;exports.getCurrencyFormatOptions=fe;exports.getCurrencyOptions=me;exports.getCurrencyType=ue;exports.getDateFormatOptions=de;exports.getDecimalFromPattern=E;exports.getDecimalString=x;exports.getNumberFormatOptions=ge;exports.getPatternPreview=K;exports.getPatternPreviewIgnoreGeneral=Y;exports.getPatternType=ne;exports.isPatternEqualWithoutDecimal=ee;exports.isPatternHasDecimal=te;exports.setPatternDecimal=P;

package/lib/es/index.js

@@ -1,7 +1,7 @@
-var ae = Object.defineProperty;
-var le = (e, t, n) => t in e ? ae(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var ce = Object.defineProperty;
+var le = (e, t, n) => t in e ? ce(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var M = (e, t, n) => le(e, typeof t != "symbol" ? t + "" : t, n);
-import { numfmt as x, CommandType as P, ICommandService as E, IUniverInstanceService as F, IUndoRedoService as ue, CellValueType as I, ObjectMatrix as b, sequenceExecute as me, Range as N, Inject as T, ThemeService as fe, LocaleService as de, IConfigService as X, Disposable as Q, LocaleType as $, InterceptorEffectEnum as K, UniverInstanceType as ee, DependentOn as ge, Injector as he, Plugin as ve, merge as pe, registerDependencies as Se, touchDependencies as z } from "@univerjs/core";
+import { numfmt as x, CommandType as w, ICommandService as E, IUniverInstanceService as F, IUndoRedoService as ue, CellValueType as I, ObjectMatrix as b, sequenceExecute as me, Range as N, Inject as T, ThemeService as fe, LocaleService as de, IConfigService as X, Disposable as Q, LocaleType as $, InterceptorEffectEnum as K, UniverInstanceType as ee, DependentOn as ge, Injector as he, Plugin as pe, merge as ve, registerDependencies as Se, touchDependencies as z } from "@univerjs/core";
 import { getSheetCommandTarget as H, transformCellsToRange as ye, checkCellValueType as G, rangeMerge as Y, SetNumfmtMutation as te, factorySetNumfmtUndoMutation as _e, RemoveNumfmtMutation as Ce, SetRangeValuesMutation as B, factoryRemoveNumfmtUndoMutation as be, SheetsSelectionsService as j, INumfmtService as W, SheetInterceptorService as Me, INTERCEPTOR_POINT as $e, InterceptCellContentPriority as Re, UniverSheetsPlugin as Ie } from "@univerjs/sheets";
 import { isTextFormat as ne } from "@univerjs/engine-numfmt";
 import { BehaviorSubject as k, merge as Ne, switchMap as Ee, of as Te, skip as xe } from "rxjs";
@@ -34,7 +34,7 @@ const re = [
   "₽",
   "₾",
   "₿"
-], Pe = {
+], we = {
   US: "$",
   // United States Dollar
   CA: "C$",
@@ -74,7 +74,7 @@ const re = [
   SI: "€",
   ES: "€"
   // Add more mappings as needed
-}, Ue = [
+}, Pe = [
   {
     label: "1930-08-05",
     suffix: "yyyy-MM-dd"
@@ -119,7 +119,7 @@ const re = [
     label: "08-05 下午 01:30",
     suffix: "MM-dd A/P hh:mm"
   }
-], we = [
+], Ue = [
   {
     label: "(1,235)",
     suffix: "#,##0_);(#,##0)"
@@ -175,39 +175,39 @@ const re = [
     suffix: (e) => `"${e}"#,##0.00_);[Red]-"${e}"#,##0.00`,
     color: "red"
   }
-], Oe = "SHEET_NUMFMT_PLUGIN", w = (e, t = 0) => {
+], Oe = "SHEET_NUMFMT_PLUGIN", U = (e, t = 0) => {
   var r;
   return e && (r = x.getInfo(e).maxDecimals) != null ? r : t;
 }, tt = (e, t) => {
   if (e && !t || !e && t)
     return !1;
   const n = (u) => u.reduce(
-    (g, v) => {
+    (g, p) => {
       if (g.isEnd)
         return g;
-      const h = v.value || v.num;
-      return v.type === "point" ? (g.isEnd = !0, g) : { ...g, result: g.result + h };
+      const h = p.value || p.num;
+      return p.type === "point" ? (g.isEnd = !0, g) : { ...g, result: g.result + h };
     },
     { isEnd: !1, result: "" }
-  ).result, r = x.getInfo(e)._partitions, s = x.getInfo(t)._partitions, o = n(r[0].tokens), c = n(s[0].tokens), i = n(r[1].tokens), m = n(s[1].tokens);
-  return o === c && i === m && r[1].color === s[1].color;
+  ).result, r = x.getInfo(e)._partitions, s = x.getInfo(t)._partitions, o = n(r[0].tokens), a = n(s[0].tokens), i = n(r[1].tokens), m = n(s[1].tokens);
+  return o === a && i === m && r[1].color === s[1].color;
 }, q = (e) => new Array(Math.min(Math.max(0, Number(e)), 30)).fill(0).join(""), O = (e, t) => e.split(";").map((r) => /\.0?/.test(r) ? r.replace(
   /\.0*/g,
   `${t > 0 ? "." : ""}${q(Number(t || 0))}`
 ) : /0([^0]?)|0$/.test(r) ? r.replace(
   /0([^0]+)|0$/,
   `0${t > 0 ? "." : ""}${q(Number(t || 0))}$1`
-) : r).join(";"), nt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), U = {
+) : r).join(";"), nt = (e) => /\.0?/.test(e) || /0([^0]?)|0$/.test(e), P = {
   id: "sheet.command.numfmt.set.numfmt",
-  type: P.COMMAND,
+  type: w.COMMAND,
   // eslint-disable-next-line max-lines-per-function
   handler: (e, t) => {
     if (!t)
       return !1;
     const n = e.get(E), r = e.get(F), s = e.get(ue), o = H(r, t);
     if (!o) return !1;
-    const { unitId: c, subUnitId: i, worksheet: m } = o, u = t.values.filter((l) => !!l.pattern), g = t.values.filter((l) => !l.pattern), v = ye(c, i, u), h = {
-      unitId: c,
+    const { unitId: a, subUnitId: i, worksheet: m } = o, u = t.values.filter((l) => !!l.pattern), g = t.values.filter((l) => !l.pattern), p = ye(a, i, u), h = {
+      unitId: a,
       subUnitId: i,
       ranges: g.map((l) => ({
         startColumn: l.col,
@@ -217,48 +217,48 @@ const re = [
       }))
     }, C = [], S = [];
     if (u.length) {
-      const l = u.reduce((d, a) => {
-        ne(a.pattern) && d.setValue(a.row, a.col, { t: I.STRING });
-        const _ = m.getCellRaw(a.row, a.col);
+      const l = u.reduce((d, c) => {
+        ne(c.pattern) && d.setValue(c.row, c.col, { t: I.STRING });
+        const _ = m.getCellRaw(c.row, c.col);
         if (_) {
           const V = G(_.v);
-          V !== _.t && d.setValue(a.row, a.col, { t: V });
+          V !== _.t && d.setValue(c.row, c.col, { t: V });
         }
         return d;
-      }, new b()).getMatrix(), p = new b();
-      new b(l).forValue((d, a) => {
-        const _ = m.getCellRaw(d, a);
-        _ ? p.setValue(d, a, { t: _.t }) : p.setValue(d, a, { t: void 0 });
-      }), Object.keys(v.values).forEach((d) => {
-        const a = v.values[d];
-        a.ranges = Y(a.ranges);
+      }, new b()).getMatrix(), v = new b();
+      new b(l).forValue((d, c) => {
+        const _ = m.getCellRaw(d, c);
+        _ ? v.setValue(d, c, { t: _.t }) : v.setValue(d, c, { t: void 0 });
+      }), Object.keys(p.values).forEach((d) => {
+        const c = p.values[d];
+        c.ranges = Y(c.ranges);
       }), C.push({
         id: te.id,
-        params: v
+        params: p
       });
-      const y = _e(e, v);
+      const y = _e(e, p);
       S.push(...y);
     }
     if (g.length) {
       h.ranges = Y(h.ranges);
-      const l = g.reduce((d, a) => {
-        const _ = m.getCellRaw(a.row, a.col);
+      const l = g.reduce((d, c) => {
+        const _ = m.getCellRaw(c.row, c.col);
         if (_) {
           const V = G(_.v);
-          V !== _.t && d.setValue(a.row, a.col, { t: V });
+          V !== _.t && d.setValue(c.row, c.col, { t: V });
         }
         return d;
-      }, new b()).getMatrix(), p = new b();
-      new b(l).forValue((d, a) => {
-        const _ = m.getCellRaw(d, a);
-        _ ? p.setValue(d, a, { t: _.t }) : p.setValue(d, a, { t: void 0 });
+      }, new b()).getMatrix(), v = new b();
+      new b(l).forValue((d, c) => {
+        const _ = m.getCellRaw(d, c);
+        _ ? v.setValue(d, c, { t: _.t }) : v.setValue(d, c, { t: void 0 });
       }), C.push({
         id: Ce.id,
         params: h
       }, {
         id: B.id,
         params: {
-          unitId: c,
+          unitId: a,
           subUnitId: i,
           cellValue: l
         }
@@ -267,51 +267,51 @@ const re = [
       S.push({
         id: B.id,
         params: {
-          unitId: c,
+          unitId: a,
           subUnitId: i,
-          cellValue: p.getMatrix()
+          cellValue: v.getMatrix()
         }
       }, ...y);
     }
     const f = me(C, n).result;
     return f && s.pushUndoRedo({
-      unitID: c,
+      unitID: a,
       undoMutations: S,
       redoMutations: C
     }), f;
   }
 }, De = {
   id: "sheet.command.numfmt.add.decimal.command",
-  type: P.COMMAND,
+  type: w.COMMAND,
   handler: async (e) => {
     const t = e.get(E), n = e.get(j), r = e.get(W), s = e.get(F), o = n.getCurrentSelections();
     if (!o || !o.length)
       return !1;
-    const c = H(s);
-    if (!c) return !1;
-    const { unitId: i, subUnitId: m } = c;
+    const a = H(s);
+    if (!a) return !1;
+    const { unitId: i, subUnitId: m } = a;
     let u = 0;
     o.forEach((C) => {
       N.foreach(C.range, (S, f) => {
         const l = r.getValue(i, m, S, f);
         if (!l) {
-          const y = c.worksheet.getCellRaw(S, f);
+          const y = a.worksheet.getCellRaw(S, f);
           if (!u && y && y.t === I.NUMBER && y.v) {
             const d = /\.(\d*)$/.exec(String(y.v));
             if (d) {
-              const a = d[1].length;
-              if (!a)
+              const c = d[1].length;
+              if (!c)
                 return;
-              u = Math.max(u, a);
+              u = Math.max(u, c);
             }
           }
           return;
         }
-        const p = w(l.pattern);
-        u = p > u ? p : u;
+        const v = U(l.pattern);
+        u = v > u ? v : u;
       });
     });
-    const g = u + 1, v = O(`0${g > 0 ? ".0" : ""}`, g), h = [];
+    const g = u + 1, p = O(`0${g > 0 ? ".0" : ""}`, g), h = [];
     return o.forEach((C) => {
       N.foreach(C.range, (S, f) => {
         const l = r.getValue(i, m, S, f);
@@ -319,10 +319,10 @@ const re = [
           h.push({
             row: S,
             col: f,
-            pattern: v
+            pattern: p
           });
         else {
-          const p = w(l.pattern), y = O(l.pattern, p + 1);
+          const v = U(l.pattern), y = O(l.pattern, v + 1);
           y !== l.pattern && h.push({
             row: S,
             col: f,
@@ -330,7 +330,7 @@ const re = [
           });
         }
       });
-    }), h.length ? await t.executeCommand(U.id, { values: h }) : !1;
+    }), h.length ? await t.executeCommand(P.id, { values: h }) : !1;
   }
 };
 class oe {
@@ -350,21 +350,21 @@ class oe {
 }
 const Ae = {
   id: "sheet.command.numfmt.set.currency",
-  type: P.COMMAND,
+  type: w.COMMAND,
   handler: async (e) => {
-    const t = e.get(E), n = e.get(j), r = e.get(oe), s = Pe[r.getCurrencySymbol()] || "$", o = n.getCurrentSelections();
+    const t = e.get(E), n = e.get(j), r = e.get(oe), s = we[r.getCurrencySymbol()] || "$", o = n.getCurrentSelections();
     if (!o || !o.length)
       return !1;
-    const c = [], i = se[4].suffix(s);
+    const a = [], i = se[4].suffix(s);
     return o.forEach((u) => {
-      N.foreach(u.range, (g, v) => {
-        c.push({ row: g, col: v, pattern: i, type: "currency" });
+      N.foreach(u.range, (g, p) => {
+        a.push({ row: g, col: p, pattern: i, type: "currency" });
       });
-    }), await t.executeCommand(U.id, { values: c });
+    }), await t.executeCommand(P.id, { values: a });
   }
 }, Fe = {
   id: "sheet.command.numfmt.set.percent",
-  type: P.COMMAND,
+  type: w.COMMAND,
   handler: async (e) => {
     const t = e.get(E), r = e.get(j).getCurrentSelections();
     if (!r || !r.length)
@@ -374,28 +374,28 @@ const Ae = {
       N.foreach(i.range, (m, u) => {
         s.push({ row: m, col: u, pattern: o, type: "percent" });
       });
-    }), await t.executeCommand(U.id, { values: s });
+    }), await t.executeCommand(P.id, { values: s });
   }
 }, je = {
   id: "sheet.command.numfmt.subtract.decimal.command",
-  type: P.COMMAND,
+  type: w.COMMAND,
   handler: async (e) => {
     const t = e.get(E), n = e.get(j), r = e.get(W), s = e.get(F), o = n.getCurrentSelections();
     if (!o || !o.length)
       return !1;
-    const c = H(s);
-    if (!c) return !1;
-    const { unitId: i, subUnitId: m } = c;
+    const a = H(s);
+    if (!a) return !1;
+    const { unitId: i, subUnitId: m } = a;
     let u = 0;
     o.forEach((S) => {
       N.foreach(S.range, (f, l) => {
-        const p = r.getValue(i, m, f, l);
-        if (!p) {
-          const d = c.worksheet.getCellRaw(f, l);
+        const v = r.getValue(i, m, f, l);
+        if (!v) {
+          const d = a.worksheet.getCellRaw(f, l);
           if (!u && d && d.t === I.NUMBER && d.v) {
-            const a = /\.(\d*)$/.exec(String(d.v));
-            if (a) {
-              const _ = a[1].length;
+            const c = /\.(\d*)$/.exec(String(d.v));
+            if (c) {
+              const _ = c[1].length;
               if (!_)
                 return;
               u = Math.max(u, _);
@@ -403,32 +403,32 @@ const Ae = {
           }
           return;
         }
-        const y = w(p.pattern);
+        const y = U(v.pattern);
         u = y > u ? y : u;
       });
     });
-    const g = u - 1, v = O(`0${g > 0 ? ".0" : "."}`, g), h = [];
+    const g = u - 1, p = O(`0${g > 0 ? ".0" : "."}`, g), h = [];
     return o.forEach((S) => {
       N.foreach(S.range, (f, l) => {
-        const p = r.getValue(i, m, f, l);
-        if (!p)
+        const v = r.getValue(i, m, f, l);
+        if (!v)
           h.push({
             row: f,
             col: l,
-            pattern: v
+            pattern: p
           });
         else {
-          const y = w(p.pattern);
+          const y = U(v.pattern);
           h.push({
             row: f,
             col: l,
-            pattern: O(p.pattern, y - 1)
+            pattern: O(v.pattern, y - 1)
           });
         }
       });
-    }), await t.executeCommand(U.id, { values: h });
+    }), await t.executeCommand(P.id, { values: h });
   }
-}, ce = "sheets-numfmt.config", Z = {}, rt = (e) => x.getInfo(e).type || "unknown", Le = (e, t, n = "en") => {
+}, ae = "sheets-numfmt.config", Z = {}, rt = (e) => x.getInfo(e).type || "unknown", Le = (e, t, n = "en") => {
   const s = x.getInfo(e)._partitions[1], o = x.format(e, t, { locale: n, throws: !1 });
   return t < 0 ? {
     result: o,
@@ -441,8 +441,8 @@ const Ae = {
   // In Excel, the default General format also needs to handle numeric precision.
 } : Le(e, t, n);
 var Be = Object.getOwnPropertyDescriptor, He = (e, t, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Be(t, n) : t, o = e.length - 1, c; o >= 0; o--)
-    (c = e[o]) && (s = c(s) || s);
+  for (var s = r > 1 ? void 0 : r ? Be(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (s = a(s) || s);
   return s;
 }, R = (e, t) => (n, r) => t(n, r, e);
 const We = {
@@ -452,11 +452,11 @@ const We = {
   }
 };
 let D = class extends Q {
-  constructor(t, n, r, s, o, c, i) {
+  constructor(t, n, r, s, o, a, i) {
     super();
     M(this, "_local$", new k("en"));
     M(this, "local$", this._local$.asObservable());
-    this._instanceService = t, this._sheetInterceptorService = n, this._themeService = r, this._commandService = s, this._numfmtService = o, this._localeService = c, this._configService = i, this._initInterceptorCellContent();
+    this._instanceService = t, this._sheetInterceptorService = n, this._themeService = r, this._commandService = s, this._numfmtService = o, this._localeService = a, this._configService = i, this._initInterceptorCellContent();
   }
   get local() {
     const t = this._local$.getValue();
@@ -489,35 +489,23 @@ let D = class extends Q {
       // eslint-disable-next-line complexity
       handler: (n, r, s) => {
         var S;
-        const o = r.unitId, c = r.subUnitId;
+        const o = r.unitId, a = r.subUnitId;
         let i;
         const m = n;
-        if (!m)
+        if (!m || m.v === void 0 || m.v === null)
           return s(n);
         if (n != null && n.s) {
           const f = r.workbook.getStyles().get(n.s);
           f != null && f.n && (i = f.n);
         }
-        if (i || (i = this._numfmtService.getValue(o, c, r.row, r.col)), !i || (n.t || G(m.v)) !== I.NUMBER)
+        if (i || (i = this._numfmtService.getValue(o, a, r.row, r.col)), !i || i.pattern === "General" || G(m.v) !== I.NUMBER)
           return s(n);
-        if (ne(i.pattern))
-          return (S = this._configService.getConfig(ce)) != null && S.disableTextFormatMark ? s({
-            ...n,
-            t: I.STRING
-          }) : s({
-            ...n,
-            t: I.STRING,
-            markers: {
-              ...n == null ? void 0 : n.markers,
-              ...We
-            }
-          });
+        if ((!n || n === r.rawData) && (n = { ...r.rawData }), ne(i.pattern))
+          return (S = this._configService.getConfig(ae)) != null && S.disableTextFormatMark ? (n.t = I.STRING, s(n)) : (n.t = I.STRING, n.markers = { ...n == null ? void 0 : n.markers, ...We }, s(n));
         let g = "";
-        const v = t.getValue(r.row, r.col);
-        if (v && v.parameters === `${m.v}_${i.pattern}`)
-          return s({ ...n, ...v.result });
-        if (m.v === void 0 || m.v === null)
-          return s(n);
+        const p = t.getValue(r.row, r.col);
+        if (p && p.parameters === `${m.v}_${i.pattern}`)
+          return s({ ...n, ...p.result });
         const h = Ge(i.pattern, Number(m.v), this.local);
         if (g = h.result, !g)
           return s(n);
@@ -529,15 +517,15 @@ let D = class extends Q {
         return t.setValue(r.row, r.col, {
           result: C,
           parameters: `${m.v}_${i.pattern}`
-        }), s({ ...n, ...C });
+        }), Object.assign(n, C), s(n);
       },
       priority: Re.NUMFMT
     })), this.disposeWithMe(this._commandService.onCommandExecuted((n) => {
       if (n.id === te.id) {
         const r = n.params;
         Object.keys(r.values).forEach((s) => {
-          r.values[s].ranges.forEach((c) => {
-            N.foreach(c, (i, m) => {
+          r.values[s].ranges.forEach((a) => {
+            N.foreach(a, (i, m) => {
               t.realDeleteValue(i, m);
             });
           });
@@ -588,19 +576,19 @@ class J extends Q {
   }
 }
 var ke = Object.defineProperty, Ke = Object.getOwnPropertyDescriptor, ze = (e, t, n) => t in e ? ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n, Ye = (e, t, n, r) => {
-  for (var s = r > 1 ? void 0 : r ? Ke(t, n) : t, o = e.length - 1, c; o >= 0; o--)
-    (c = e[o]) && (s = c(s) || s);
+  for (var s = r > 1 ? void 0 : r ? Ke(t, n) : t, o = e.length - 1, a; o >= 0; o--)
+    (a = e[o]) && (s = a(s) || s);
   return s;
 }, L = (e, t) => (n, r) => t(n, r, e), ie = (e, t, n) => ze(e, typeof t != "symbol" ? t + "" : t, n);
-let A = class extends ve {
+let A = class extends pe {
   constructor(e = Z, t, n, r) {
     super(), this._config = e, this._injector = t, this._configService = n, this._commandService = r;
-    const { ...s } = pe(
+    const { ...s } = ve(
       {},
       Z,
       this._config
     );
-    this._configService.setConfig(ce, s);
+    this._configService.setConfig(ae, s);
   }
   onStarting() {
     Se(this._injector, [
@@ -619,7 +607,7 @@ let A = class extends ve {
       je,
       Ae,
       Fe,
-      U
+      P
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
@@ -633,33 +621,33 @@ A = Ye([
   L(2, X),
   L(3, E)
 ], A);
-const st = (e) => re.find((n) => e.includes(n)), ot = () => re.map((e) => ({ label: e, value: e })), ct = (e) => se.map((t) => ({
+const st = (e) => re.find((n) => e.includes(n)), ot = () => re.map((e) => ({ label: e, value: e })), at = (e) => se.map((t) => ({
   label: t.label(e),
   value: t.suffix(e),
   color: t.color
-})), it = () => Ue.map((e) => ({ label: e.label, value: e.suffix })), at = () => we.map((e) => ({ label: e.label, value: e.suffix, color: e.color }));
+})), it = () => Pe.map((e) => ({ label: e.label, value: e.suffix })), ct = () => Ue.map((e) => ({ label: e.label, value: e.suffix, color: e.color }));
 export {
   De as AddDecimalCommand,
   se as CURRENCYFORMAT,
-  Ue as DATEFMTLISG,
+  Pe as DATEFMTLISG,
   oe as MenuCurrencyService,
-  we as NUMBERFORMAT,
-  ce as SHEETS_NUMFMT_PLUGIN_CONFIG_KEY,
+  Ue as NUMBERFORMAT,
+  ae as SHEETS_NUMFMT_PLUGIN_CONFIG_KEY,
   Ae as SetCurrencyCommand,
-  U as SetNumfmtCommand,
+  P as SetNumfmtCommand,
   Fe as SetPercentCommand,
   D as SheetsNumfmtCellContentController,
   je as SubtractDecimalCommand,
   A as UniverSheetsNumfmtPlugin,
-  Pe as countryCurrencyMap,
+  we as countryCurrencyMap,
   re as currencySymbols,
-  ct as getCurrencyFormatOptions,
+  at as getCurrencyFormatOptions,
   ot as getCurrencyOptions,
   st as getCurrencyType,
   it as getDateFormatOptions,
-  w as getDecimalFromPattern,
+  U as getDecimalFromPattern,
   q as getDecimalString,
-  at as getNumberFormatOptions,
+  ct as getNumberFormatOptions,
   Le as getPatternPreview,
   Ge as getPatternPreviewIgnoreGeneral,
   rt as getPatternType,