Skip to content

Commit 82dc875

Browse files
ahyahyahyahy
committed
Релиз 2.2.0.0
1 parent f8f2487 commit 82dc875

29 files changed

Lines changed: 1779 additions & 765 deletions

‎DeclarativeForms/DeclarativeForms/DeclarativeForms.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,7 @@ public void ProcessMessage(string p1)
21062106
{
21072107
if (Sender.GetType() != typeof(osdf.DfMenuItem))
21082108
{
2109-
GlobalContext().Echo("Не обработано событие = " + nameEvent);
2109+
//GlobalContext().Echo("Не обработано событие = " + nameEvent);
21102110
}
21112111
}
21122112
}
@@ -3203,6 +3203,7 @@ public static DfArrayList StrFindBetween(string p1, string p2 = null, string p3
32033203
{"Button", new object[3] { "", true, "button" } },
32043204
{"Files", new object[3] { "", true, "files" } },
32053205
{"Value", new object[3] { "", true, "_value" } },
3206+
{"ScrolledValue", new object[3] { "", true, "scrolledValue" } },
32063207
// Это для объектов
32073208
{"WindowHeight", new object[3] { "", true, "windowHeight" } },
32083209
{"WindowWidth", new object[3] { "", true, "windowWidth" } },
@@ -3440,7 +3441,7 @@ public static DfArrayList StrFindBetween(string p1, string p2 = null, string p3
34403441
{"Отложено", new object[3] { "", true, "defer" } },
34413442
{"Связь", new object[3] { "", true, "htmlFor" } },
34423443
{"Гибкость", new object[3] { "", false, "flex" } },
3443-
3444+
{"ЗетИндекс", new object[3] { "", false, "zIndex" } },
34443445

34453446
};
34463447
}

‎DeclarativeForms/DeclarativeForms/EventArgs.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ public int WindowWidth
5151
get { return Convert.ToInt32(windowWidth.AsNumber()); }
5252
set { windowWidth = ValueFactory.Create(value); }
5353
}
54+
55+
public IValue scrolledValue { get; set; }
56+
[ContextProperty("Прокручено", "ScrolledValue")]
57+
public int ScrolledValue
58+
{
59+
get { return Convert.ToInt32(scrolledValue.AsNumber()); }
60+
set { scrolledValue = ValueFactory.Create(value); }
61+
}
5462

5563
public IValue y { get; set; }
5664
[ContextProperty("Игрек", "Y")]

‎DeclarativeForms/DeclarativeForms/Form.cs‎

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,69 @@ public DfAction Loaded
244244
set { loaded = value; }
245245
}
246246

247+
public int scrolledValue { get; set; }
248+
[ContextProperty("Прокручено", "ScrolledValue")]
249+
public int ScrolledValue
250+
{
251+
get { return scrolledValue; }
252+
private set { scrolledValue = value; }
253+
}
254+
255+
public DfAction scrolled { get; set; }
256+
[ContextProperty("ПриПрокручивании", "Scrolled")]
257+
public DfAction Scrolled
258+
{
259+
get { return scrolled; }
260+
set
261+
{
262+
scrolled = value;
263+
string strFunc = @"
264+
window.addEventListener('scroll', function() {
265+
var winScroll = document.body.scrollTop || document.documentElement.scrollTop;
266+
var height = document.documentElement.scrollHeight - document.documentElement.clientHeight;
267+
var scrolledVal = (winScroll / height) * 100;
268+
sendPost('mainForm' +
269+
'" + DeclarativeForms.paramDelimiter + @"' + 'scrolled' +
270+
'" + DeclarativeForms.paramDelimiter + @"ScrolledValue=' + scrolledVal);
271+
});";
272+
DeclarativeForms.SendStrFunc(strFunc);
273+
}
274+
}
275+
247276
public DfAction resize { get; set; }
248277
[ContextProperty("РазмерИзменен", "Resize")]
249278
public DfAction Resize
250279
{
251280
get { return resize; }
252-
set { resize = value; }
281+
set
282+
{
283+
resize = value;
284+
string strFunc;
285+
if (!DeclarativeForms.openInBrowser)
286+
{
287+
strFunc = @"
288+
nw.Window.get().on('resize', function(width, height)
289+
{
290+
sendPost('mainForm' +
291+
'" + DeclarativeForms.paramDelimiter + @"' + 'resize' +
292+
'" + DeclarativeForms.paramDelimiter + @"WindowWidth=' + width +
293+
'" + DeclarativeForms.paramDelimiter + @"WindowHeight=' + height);
294+
});
295+
";
296+
}
297+
else
298+
{
299+
strFunc = @"
300+
window.addEventListener('resize', function(event) {
301+
sendPost('mainForm' +
302+
'" + DeclarativeForms.paramDelimiter + @"' + 'resize' +
303+
'" + DeclarativeForms.paramDelimiter + @"WindowWidth=' + window.innerWidth +
304+
'" + DeclarativeForms.paramDelimiter + @"WindowHeight=' + window.innerHeight);
305+
}, true);
306+
";
307+
}
308+
DeclarativeForms.SendStrFunc(strFunc);
309+
}
253310
}
254311

255312
[ContextMethod("Открыть", "Open")]

‎DeclarativeForms/DeclarativeForms/IndexhtmlLin.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function funFromString(func)
2121
}
2222
function doEvent(event)
2323
{
24+
event.stopPropagation();
2425
if (event.type == 'mouseup')
2526
{
2627
let button;
@@ -150,13 +151,6 @@ function sendPost(str)
150151
nodeClientSend = getConnSend();
151152
nodeClientSend.write(str);
152153
}
153-
nw.Window.get().on('resize', function(width, height)
154-
{
155-
sendPost('mainForm' +
156-
'" + spacer + @"' + 'resize' +
157-
'" + spacer + @"WindowWidth=' + width +
158-
'" + spacer + @"WindowHeight=' + height);
159-
});
160154
function startTimer(nameEl, interval) {
161155
window.TimerId = window.setInterval(function(){
162156
sendPost(nameEl + '" + spacer + @"tick');

‎DeclarativeForms/DeclarativeForms/IndexhtmlLinBr.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function funFromString(func)
2121
}
2222
function doEvent(event)
2323
{
24+
event.stopPropagation();
2425
if (event.type == 'mouseup')
2526
{
2627
let button;
@@ -209,13 +210,6 @@ function stopTimer(nameEl) {
209210
}
210211
};
211212
212-
window.addEventListener('resize', function(event) {
213-
sendPost('mainForm' +
214-
'" + spacer + @"' + 'resize' +
215-
'" + spacer + @"WindowWidth=' + window.innerWidth +
216-
'" + spacer + @"WindowHeight=' + window.innerHeight);
217-
}, true);
218-
219213
//setTimeout(function(){ alert('Не обновляйте страницу во время работы программы. Это вызовет перезапуск программы. Введенные данные могут не сохраниться.'); }, 1);
220214
221215
var receiveClient = new WebSocket('ws://127.0.0.1:" + DeclarativeForms.portSendServer + @"/');

‎DeclarativeForms/DeclarativeForms/IndexhtmlWin.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function funFromString(func)
2121
}
2222
function doEvent(event)
2323
{
24+
event.stopPropagation();
2425
if (event.type == 'mouseup')
2526
{
2627
let button;
@@ -227,13 +228,6 @@ function getSendClient()
227228
};
228229
return sendClient1;
229230
}
230-
nw.Window.get().on('resize', function(width, height)
231-
{
232-
sendPost('mainForm' +
233-
'" + spacer + @"' + 'resize' +
234-
'" + spacer + @"WindowWidth=' + width +
235-
'" + spacer + @"WindowHeight=' + height);
236-
});
237231
function sleep(milliseconds) {
238232
const date = Date.now();
239233
let currentDate = null;

‎DeclarativeForms/DeclarativeForms/IndexhtmlWinBr.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ function funFromString(func)
2121
}
2222
function doEvent(event)
2323
{
24+
event.stopPropagation();
2425
if (event.type == 'mouseup')
2526
{
2627
let button;
@@ -209,13 +210,6 @@ function stopTimer(nameEl) {
209210
}
210211
};
211212
212-
window.addEventListener('resize', function(event) {
213-
sendPost('mainForm' +
214-
'" + spacer + @"' + 'resize' +
215-
'" + spacer + @"WindowWidth=' + window.innerWidth +
216-
'" + spacer + @"WindowHeight=' + window.innerHeight);
217-
}, true);
218-
219213
//setTimeout(function(){ alert('Не обновляйте страницу во время работы программы. Это вызовет перезапуск программы. Введенные данные могут не сохраниться.'); }, 1);
220214
221215
var receiveClient = new WebSocket('ws://127.0.0.1:" + DeclarativeForms.portSendServer + @"/');

‎DeclarativeForms/DeclarativeForms/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Можно задать все значения или принять номера сборки и редакции по умолчанию
3333
// используя "*", как показано ниже:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.1.0.0")]
36-
[assembly: AssemblyFileVersion("2.1.0.0")]
35+
[assembly: AssemblyVersion("2.2.0.0")]
36+
[assembly: AssemblyFileVersion("2.2.0.0")]

‎DeclarativeForms/DeclarativeForms/Style.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,6 +1641,36 @@ public IValue AnimationDelay
16411641
}
16421642
}
16431643
}
1644+
1645+
public string reszIndex { get; set; }
1646+
public IValue zIndex { get; set; }
1647+
[ContextProperty("ЗетИндекс", "ZIndex")]
1648+
public IValue ZIndex
1649+
{
1650+
get { return zIndex; }
1651+
set
1652+
{
1653+
zIndex = value;
1654+
if (value == null)
1655+
{
1656+
reszIndex = "auto";
1657+
}
1658+
else if (value.GetType() == typeof(ScriptEngine.Machine.Values.StringValue))
1659+
{
1660+
reszIndex = value.AsString();
1661+
}
1662+
else
1663+
{
1664+
reszIndex = value.AsNumber().ToString().Replace(",", ".");
1665+
}
1666+
1667+
if (Owner != null)
1668+
{
1669+
string strFunc = "mapKeyEl.get('" + ((dynamic)Owner).ItemKey + "').style['zIndex'] = '" + reszIndex + "';";
1670+
DeclarativeForms.SendStrFunc(strFunc);
1671+
}
1672+
}
1673+
}
16441674

16451675
public string resanimationIterationCount { get; set; }
16461676
public IValue animationIterationCount { get; set; }

‎docs/OSDFormsRu/Events.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ <H3 class=dtH3>События</H3>
6161
<TR vAlign=top>
6262
<TD width="50%"><A href="OSDForms.ElementMouseUpEvent.html">ПриОтпусканииМыши&nbsp;(MouseUp) (Элемент)</A></TD>
6363
<TD width="50%">Возвращает или задает код для выполнения при отпускании кнопки мыши, когда указатель мыши находится на элементе.</TD></TR>
64+
<TR vAlign=top>
65+
<TD width="50%"><A href="OSDForms.FormScrollEvent.html">ПриПрокручивании&nbsp;(Scroll) (Форма)</A></TD>
66+
<TD width="50%">Возвращает или задает код для выполнения, при перемещении ползунка полосы прокрутки, с помощью мыши или клавиатурой.</TD></TR>
6467
<TR vAlign=top>
6568
<TD width="50%"><A href="OSDForms.TimerTickEvent.html">ПриСрабатыванииТаймера&nbsp;(Tick) (Таймер)</A></TD>
6669
<TD width="50%">Возвращает или задает код для выполнения по истечении указанного интервала таймера.</TD></TR>

0 commit comments

Comments
 (0)