Skip to content

S
sdkjs
Commit 53c85d1e authored by SergeyLuzyanin's avatar SergeyLuzyanin
Browse files
Options

add asc_getCurrentListType, asc_setListType to spreadsheet_api

parent dc732abd
Show whitespace changes
Inline Side-by-side
Showing with 266 additions and 214 deletions
cell/api.js
View file @ 53c85d1e
......@@ -249,6 +249,26 @@ var editor;
}
return AscCommonExcel.getCurrencyFormat(cultureInfo, 2, true, true);
};
spreadsheet_api.prototype.asc_getCurrentListType = function(){
var ws = this.wb.getWorksheet();
var oParaPr;
if (ws && ws.objectRender && ws.objectRender.controller) {
oParaPr = ws.objectRender.controller.getParagraphParaPr();
}
return new AscCommon.asc_CListType(AscFormat.fGetListTypeFromBullet(oParaPr && oParaPr.Bullet));
};
spreadsheet_api.prototype.asc_setListType = function(type, subtype){
var ws = this.wb.getWorksheet();
var oParaPr;
if (ws && ws.objectRender && ws.objectRender.controller) {
ws.objectRender.setListType(type, subtype);
}
};
spreadsheet_api.prototype.asc_setLocale = function(val) {
if (!this.isLoadFullApi) {
this.tmpLocale = val;
......@@ -2645,6 +2665,15 @@ var editor;
this._isLockedSparkline(id, changeSparkline);
};
spreadsheet_api.prototype.asc_setListType = function (type, subtype) {
var oWorksheet = this.wb.getWorksheet();
if(oWorksheet){
if(oWorksheet.isSelectOnShape){
return oWorksheet.objectRender.setListType(type, subtype);
}
}
};
// Cell interface
spreadsheet_api.prototype.asc_getCellInfo = function() {
return this.wb.getSelectionInfo();
......@@ -3577,6 +3606,8 @@ var editor;
prot["asc_setFontRenderingMode"] = prot.asc_setFontRenderingMode;
prot["asc_setSelectionDialogMode"] = prot.asc_setSelectionDialogMode;
prot["asc_ChangeColorScheme"] = prot.asc_ChangeColorScheme;
prot["asc_setListType"] = prot.asc_setListType;
prot["asc_getCurrentListType"] = prot.asc_getCurrentListType;
/////////////////////////////////////////////////////////////////////////
///////////////////CoAuthoring and Chat api//////////////////////////////
/////////////////////////////////////////////////////////////////////////
......
common/Charts/DrawingObjects.js
View file @ 53c85d1e
......@@ -2585,6 +2585,19 @@ function DrawingObjects() {
_this.controller.setMathProps(MathProps);
}
_this.setListType = function(type, subtype)
{
var NumberInfo =
{
Type : 0,
SubType : -1
};
NumberInfo.Type = type;
NumberInfo.SubType = subtype;
_this.controller.checkSelectedObjectsAndCallback(_this.controller.setParagraphNumbering, [AscFormat.fGetPresentationBulletByNumInfo(NumberInfo)], false, AscDFH.historydescription_Presentation_SetParagraphNumbering);
};
_this.editImageDrawingObject = function(imageUrl) {
if ( imageUrl ) {
......
common/Drawings/CommonController.js
View file @ 53c85d1e
......@@ -10748,6 +10748,223 @@ function ApplyPresetToChartSpace(oChartSpace, aPreset, bCreate){
return oShape;
}
function fGetListTypeFromBullet(Bullet) {
var ListType = {
Type : -1,
SubType : -1
};
if (Bullet)
{
if (Bullet && Bullet.bulletType)
{
switch (Bullet.bulletType.type)
{
case AscFormat.BULLET_TYPE_BULLET_CHAR:
{
ListType.Type = 0;
ListType.SubType = undefined;
switch (Bullet.bulletType.Char)
{
case "•":
{
ListType.SubType = 1;
break;
}
case "o":
{
ListType.SubType = 2;
break;
}
case "§":
{
ListType.SubType = 3;
break;
}
case String.fromCharCode(0x0076):
{
ListType.SubType = 4;
break;
}
case String.fromCharCode(0x00D8):
{
ListType.SubType = 5;
break;
}
case String.fromCharCode(0x00FC):
{
ListType.SubType = 6;
break;
}
case String.fromCharCode(119):
{
ListType.SubType = 7;
break;
}
}
break;
}
case AscFormat.BULLET_TYPE_BULLET_BLIP:
{
ListType.Type = 0;
ListType.SubType = undefined;
break;
}
case AscFormat.BULLET_TYPE_BULLET_AUTONUM:
{
ListType.Type = 1;
ListType.SubType = undefined;
if (AscFormat.isRealNumber(Bullet.bulletType.AutoNumType))
{
var AutoNumType = AscCommonWord.g_NumberingArr[Bullet.bulletType.AutoNumType] - 99;
if (AutoNumType > 0 && AutoNumType < 9)
{
ListType.SubType = AutoNumType;
}
}
break;
}
}
}
}
return ListType;
}
function fGetPresentationBulletByNumInfo(NumInfo){
var bullet = new AscFormat.CBullet();
if(NumInfo.SubType < 0)
{
bullet.bulletType = new AscFormat.CBulletType();
bullet.bulletType.type = AscFormat.BULLET_TYPE_BULLET_NONE;
}
else
{
switch (NumInfo.Type)
{
case 0 : /*bulletChar*/
{
switch(NumInfo.SubType)
{
case 0:
case 1:
{
var bulletText = "•";
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Arial";
break;
}
case 2:
{
bulletText = "o";
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Courier New";
break;
}
case 3:
{
bulletText = "§";
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 4:
{
bulletText = String.fromCharCode( 0x0076 );
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 5:
{
bulletText = String.fromCharCode( 0x00D8 );
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 6:
{
bulletText = String.fromCharCode( 0x00FC );
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 7:
{
bulletText = String.fromCharCode(119);
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
}
bullet.bulletType = new AscFormat.CBulletType();
bullet.bulletType.type = AscFormat.BULLET_TYPE_BULLET_CHAR;
bullet.bulletType.Char = bulletText;
break;
}
case 1 : /*autonum*/
{
switch(NumInfo.SubType)
{
case 0 :
case 1 :
{
var numberingType = 12;//numbering_numfmt_arabicPeriod;
break;
}
case 2:
{
numberingType = 11;//numbering_numfmt_arabicParenR;
break;
}
case 3 :
{
numberingType = 34;//numbering_numfmt_romanUcPeriod;
break;
}
case 4 :
{
numberingType = 5;//numbering_numfmt_alphaUcPeriod;
break;
}
case 5 :
{
numberingType = 8;
break;
}
case 6 :
{
numberingType = 40;
break;
}
case 7 :
{
numberingType = 31;//numbering_numfmt_romanLcPeriod;
break;
}
}
bullet.bulletType = new AscFormat.CBulletType();
bullet.bulletType.type = AscFormat.BULLET_TYPE_BULLET_AUTONUM;
bullet.bulletType.AutoNumType = numberingType;
break;
}
default :
{
break;
}
}
}
return bullet;
}
//--------------------------------------------------------export----------------------------------------------------
window['AscFormat'] = window['AscFormat'] || {};
window['AscFormat'].HANDLE_EVENT_MODE_HANDLE = HANDLE_EVENT_MODE_HANDLE;
......@@ -10819,4 +11036,6 @@ function ApplyPresetToChartSpace(oChartSpace, aPreset, bCreate){
window['AscFormat'].isConnectorPreset = isConnectorPreset;
window['AscFormat'].fCreateSignatureShape = fCreateSignatureShape;
window['AscFormat'].CreateBlipFillUniFillFromUrl = CreateBlipFillUniFillFromUrl;
window['AscFormat'].fGetListTypeFromBullet = fGetListTypeFromBullet;
window['AscFormat'].fGetPresentationBulletByNumInfo = fGetPresentationBulletByNumInfo;
})(window);
slide/Editor/Format/Presentation.js
View file @ 53c85d1e
......@@ -2038,137 +2038,7 @@ CPresentation.prototype =
Get_PresentationBulletByNumInfo : function(NumInfo)
{
var bullet = new AscFormat.CBullet();
if(NumInfo.SubType < 0)
{
bullet.bulletType = new AscFormat.CBulletType();
bullet.bulletType.type = AscFormat.BULLET_TYPE_BULLET_NONE;
}
else
{
switch (NumInfo.Type)
{
case 0 : /*bulletChar*/
{
switch(NumInfo.SubType)
{
case 0:
case 1:
{
var bulletText = "•";
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Arial";
break;
}
case 2:
{
bulletText = "o";
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Courier New";
break;
}
case 3:
{
bulletText = "§";
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 4:
{
bulletText = String.fromCharCode( 0x0076 );
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 5:
{
bulletText = String.fromCharCode( 0x00D8 );
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 6:
{
bulletText = String.fromCharCode( 0x00FC );
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
case 7:
{
bulletText = String.fromCharCode(119);
bullet.bulletTypeface = new AscFormat.CBulletTypeface();
bullet.bulletTypeface.type = AscFormat.BULLET_TYPE_TYPEFACE_BUFONT;
bullet.bulletTypeface.typeface = "Wingdings";
break;
}
}
bullet.bulletType = new AscFormat.CBulletType();
bullet.bulletType.type = AscFormat.BULLET_TYPE_BULLET_CHAR;
bullet.bulletType.Char = bulletText;
break;
}
case 1 : /*autonum*/
{
switch(NumInfo.SubType)
{
case 0 :
case 1 :
{
var numberingType = 12;//numbering_numfmt_arabicPeriod;
break;
}
case 2:
{
numberingType = 11;//numbering_numfmt_arabicParenR;
break;
}
case 3 :
{
numberingType = 34;//numbering_numfmt_romanUcPeriod;
break;
}
case 4 :
{
numberingType = 5;//numbering_numfmt_alphaUcPeriod;
break;
}
case 5 :
{
numberingType = 8;
break;
}
case 6 :
{
numberingType = 40;
break;
}
case 7 :
{
numberingType = 31;//numbering_numfmt_romanLcPeriod;
break;
}
}
bullet.bulletType = new AscFormat.CBulletType();
bullet.bulletType.type = AscFormat.BULLET_TYPE_BULLET_AUTONUM;
bullet.bulletType.AutoNumType = numberingType;
break;
}
default :
{
break;
}
}
}
return bullet;
return AscFormat.fGetPresentationBulletByNumInfo(NumInfo);
},
SetParagraphAlign : function(Align)
......
slide/api.js
View file @ 53c85d1e
......@@ -1639,88 +1639,7 @@ background-repeat: no-repeat;\
ParaPr.SmallCaps = TextPr.SmallCaps;
ParaPr.TextSpacing = TextPr.Spacing;
ParaPr.Position = TextPr.Position;
if (ParaPr.Bullet)
{
var ListType = {
Type : -1,
SubType : -1
};
if (ParaPr.Bullet && ParaPr.Bullet.bulletType)
{
switch (ParaPr.Bullet.bulletType.type)
{
case AscFormat.BULLET_TYPE_BULLET_CHAR:
{
ListType.Type = 0;
ListType.SubType = undefined;
switch (ParaPr.Bullet.bulletType.Char)
{
case "•":
{
ListType.SubType = 1;
break;
}
case "o":
{
ListType.SubType = 2;
break;
}
case "§":
{
ListType.SubType = 3;
break;
}
case String.fromCharCode(0x0076):
{
ListType.SubType = 4;
break;
}
case String.fromCharCode(0x00D8):
{
ListType.SubType = 5;
break;
}
case String.fromCharCode(0x00FC):
{
ListType.SubType = 6;
break;
}
case String.fromCharCode(119):
{
ListType.SubType = 7;
break;
}
}
break;
}
case AscFormat.BULLET_TYPE_BULLET_BLIP:
{
ListType.Type = 0;
ListType.SubType = undefined;
break;
}
case AscFormat.BULLET_TYPE_BULLET_AUTONUM:
{
ListType.Type = 1;
ListType.SubType = undefined;
if (AscFormat.isRealNumber(ParaPr.Bullet.bulletType.AutoNumType))
{
var AutoNumType = AscCommonWord.g_NumberingArr[ParaPr.Bullet.bulletType.AutoNumType] - 99;
if (AutoNumType > 0 && AutoNumType < 9)
{
ListType.SubType = AutoNumType;
}
}
break;
}
}
}
ParaPr.ListType = ListType;
}
else
{
ParaPr.ListType = {Type : -1, SubType : -1};
}
ParaPr.ListType = AscFormat.fGetListTypeFromBullet(ParaPr.Bullet);
this.sync_ParaSpacingLine(ParaPr.Spacing);
this.Update_ParaInd(ParaPr.Ind);
this.sync_PrAlignCallBack(ParaPr.Jc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7