Permalink
Browse files

3.1.1 (beta)

Перенесена часть функционала режима обработки для обычных форм
Исправлены ошибки
  • Loading branch information...
lavelinevgeny committed Apr 7, 2017
1 parent 283da35 commit b2e3436518e652f4374bf7a0bf12bb1ebd263dbe
@@ -1 +1 @@
V8Unpack.exe -B ..\source consquery_.epf
V8Unpack.exe -B ..\source consquery83.epf
@@ -348,17 +348,12 @@
{0},7,1,0,48312c09-257f-4b29-b280-284dd89efc1e},
{1,0},0,0},9,2,0,2,1,1,
{5,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,6,1,5,
{6,99010879-b042-4aed-ba3c-97267f2334da,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{6,bcfe86c4-d869-48ac-be47-ad2877c71062,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
{6,f23fa040-0919-40b5-8e36-c383ae161557,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,0,00000000-0000-0000-0000-000000000000,142,
{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},
{6,16ff18c3-0782-4878-a4a9-6654cf6284f4,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
{6,5c84ab0e-5f6a-4968-a33d-9f5ec799990d,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,532e6e71-4839-448c-a92f-e7a41fc569c1,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,0,00000000-0000-0000-0000-000000000000,300,
{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},
{6,b950e48e-ff94-4ed8-b6a2-60fef2baba0d,1,e1692cc2-605b-4535-84dd-28440238746c,
{6,e3fa4a40-2d4f-40ca-a5ab-e81581987a1c,1,e1692cc2-605b-4535-84dd-28440238746c,
{3,"КнопкаОКНажатие",
{1,"КнопкаОКНажатие",
{1,1,
@@ -377,20 +372,25 @@
},6,
{1,0},
{1,0}
},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,5,b950e48e-ff94-4ed8-b6a2-60fef2baba0d,
},
{6,3bda2861-bc38-429e-b82c-cae2ac5b0a64,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
{6,f422f2e6-5e91-4cd6-a610-1dcfa4cc359b,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,0,00000000-0000-0000-0000-000000000000,142,
{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,5,e3fa4a40-2d4f-40ca-a5ab-e81581987a1c,
{8,"КнопкаОКНажатие",0,1,
{1,1,
{"ru","ОК"}
},1,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,1,1e2,0,0,1,0,0,0,0},16ff18c3-0782-4878-a4a9-6654cf6284f4,
},1,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,1,1e2,0,0,1,0,0,0,0},bcfe86c4-d869-48ac-be47-ad2877c71062,
{8,"Разделитель",0,1,
{1,0},0,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,6,1e2,2,0,1,0,0,0,0},f23fa040-0919-40b5-8e36-c383ae161557,
{1,0},0,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,6,1e2,2,0,1,0,0,0,0},f422f2e6-5e91-4cd6-a610-1dcfa4cc359b,
{8,"Закрыть",0,1,
{1,1,
{"ru","Закрыть"}
},1,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,2,1e2,0,1,1,0,0,0,0},99010879-b042-4aed-ba3c-97267f2334da,
},1,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,2,1e2,0,1,1,0,0,0,0},3bda2861-bc38-429e-b82c-cae2ac5b0a64,
{8,"Разделитель1",0,1,
{1,0},0,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,5,1e2,2,0,1,0,0,0,0},5c84ab0e-5f6a-4968-a33d-9f5ec799990d,
{1,0},0,10fa53b0-6a9a-47da-9ac8-9009b9ee77b7,5,1e2,2,0,1,0,0,0,0},532e6e71-4839-448c-a92f-e7a41fc569c1,
{8,"Справка",0,1,
{1,1,
{"#","Справка"}
@@ -496,7 +496,7 @@
{0}
}
}
},235,103,1,0,1,4,4,728,235,103,96},
},235,103,1,0,1,4,4,740,235,103,96},
{
{2},8,
{3,
@@ -192,7 +192,7 @@
{0}
}
}
},416,316,1,0,1,4,4,728,416,316,96},
},416,316,1,0,1,4,4,740,416,316,96},
{
{1},3,
{2,
@@ -111,7 +111,7 @@
{0}
}
}
},1232,378,1,0,1,4,4,312,1232,378,96},
},1232,378,1,0,1,4,4,324,1232,378,96},
{
{0},5,
{1,

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -276,7 +276,7 @@
{0}
}
}
},400,75,1,0,1,4,4,594,400,75,96},
},400,75,1,0,1,4,4,606,400,75,96},
{
{-1},5,
{4,
@@ -332,7 +332,7 @@ TM3kU11Kn9oYTuxJBvGxGdh3nQTPHR6OQtL0kkzF3A+aI/3W40b7QybFBOQX},0}
{0}
}
}
},340,305,1,0,1,4,4,728,340,305,96},
},340,305,1,0,1,4,4,740,340,305,96},
{
{-1},5,
{2,
@@ -108,10 +108,7 @@
{0},4,1,0,00000000-0000-0000-0000-000000000000},
{1,0},0,0},9,2,0,0,0,1,
{5,ba236a86-e38f-4bdf-b6d2-4dda469d9fb1,14,1,2,
{6,f73cd243-bec5-4373-952c-ccef6c891c2e,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,142,
{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},
{6,93297061-7056-4149-9f16-c38816338675,1,e1692cc2-605b-4535-84dd-28440238746c,
{6,7535c980-8440-48ce-bf33-1cd3fa17b8d4,1,e1692cc2-605b-4535-84dd-28440238746c,
{3,"ДействияФормыСохранить",
{1,"ДействияФормыСохранить",
{1,1,
@@ -127,12 +124,15 @@
{0},"",-1,-1,1,0,""},
{0,0,0}
}
},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,93297061-7056-4149-9f16-c38816338675,
},0},
{6,75cc362f-769f-4763-ab7a-be4d30056c89,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,142,
{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,7535c980-8440-48ce-bf33-1cd3fa17b8d4,
{8,"Сохранить",0,1,
{1,1,
{"#","Сохранить"}
},0,ba236a86-e38f-4bdf-b6d2-4dda469d9fb1,13,1e2,0,0,1,0,0,0,0},f73cd243-bec5-4373-952c-ccef6c891c2e,
},0,ba236a86-e38f-4bdf-b6d2-4dda469d9fb1,13,1e2,0,0,1,0,0,0,0},75cc362f-769f-4763-ab7a-be4d30056c89,
{8,"Отмена",0,1,
{1,1,
{"ru","Отмена"}
@@ -141,7 +141,7 @@
{0}
}
}
},b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,423370a9-10fc-444c-9647-50e6e043cbd9,13,0,0}
},b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,b8c49b94-b4a1-457e-8a18-62c754a55f28,13,0,0}
},
{8,0,0,400,25,1,
{0,
@@ -1263,7 +1263,7 @@
{0}
}
}
},400,197,1,0,1,4,4,29,400,197,96},
},400,197,1,0,1,4,4,41,400,197,96},
{
{1},8,
{6,
@@ -112,37 +112,37 @@
{0},4,1,0,00000000-0000-0000-0000-000000000000},
{1,0},0,0},9,2,0,0,1,1,
{5,530073d9-02fd-49f7-8b8f-5568be8823ee,33,1,5,
{6,fd9ef537-d653-43c8-b64c-0702db01b7c9,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,194847bf-3abd-4c44-ac74-59d8453d71c9,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,83,
{1,99,357c6a54-357d-425d-a2bd-22f4f6e86c87,2147483647,0},0,1},0},
{6,8058dc54-677c-45cb-a7f3-99cd55d5904f,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
{6,03abbf78-5766-4bfe-95c9-f39f176c2d68,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,22a71527-1ca6-40c8-bb59-6f1992e99156,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,80,
{1,99,357c6a54-357d-425d-a2bd-22f4f6e86c87,2147483647,0},0,1},0},
{6,e4c9735a-e406-4bb1-8e69-0ef61d644f57,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,1bcd4f1b-0a2f-43dc-ae4b-87171c438e2a,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,82,
{1,99,357c6a54-357d-425d-a2bd-22f4f6e86c87,2147483647,0},0,1},0},
{6,0bce5822-1a4a-40ff-84af-1c970d1a4a4c,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,84,
{1,99,357c6a54-357d-425d-a2bd-22f4f6e86c87,2147483647,0},0,1},0},
{6,e17823e3-ae0d-4561-b0d0-9b6d7a903816,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,82,
{1,99,357c6a54-357d-425d-a2bd-22f4f6e86c87,2147483647,0},0,1},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,5,03abbf78-5766-4bfe-95c9-f39f176c2d68,
{6,bddfefb8-f818-4dae-aa1a-7a1f2db6ec3f,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,5,22a71527-1ca6-40c8-bb59-6f1992e99156,
{8,"Действие",0,1,
{1,1,
{"#","Действие"}
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,15,1e2,0,0,1,0,0,0,0},e17823e3-ae0d-4561-b0d0-9b6d7a903816,
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,15,1e2,0,0,1,0,0,0,0},1bcd4f1b-0a2f-43dc-ae4b-87171c438e2a,
{8,"Действие1",0,1,
{1,1,
{"#","Действие1"}
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,16,1e2,0,0,1,0,0,0,0},fd9ef537-d653-43c8-b64c-0702db01b7c9,
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,16,1e2,0,0,1,0,0,0,0},194847bf-3abd-4c44-ac74-59d8453d71c9,
{8,"Действие2",0,1,
{1,1,
{"#","Действие2"}
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,17,1e2,0,0,1,0,0,0,0},e4c9735a-e406-4bb1-8e69-0ef61d644f57,
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,17,1e2,0,0,1,0,0,0,0},0bce5822-1a4a-40ff-84af-1c970d1a4a4c,
{8,"Действие3",0,1,
{1,1,
{"#","Действие3"}
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,18,1e2,0,0,1,0,0,0,0},8058dc54-677c-45cb-a7f3-99cd55d5904f,
},0,530073d9-02fd-49f7-8b8f-5568be8823ee,18,1e2,0,0,1,0,0,0,0},bddfefb8-f818-4dae-aa1a-7a1f2db6ec3f,
{8,"Разделитель2",0,1,
{1,1,
{"ru","Действие4"}
@@ -212,10 +212,12 @@
{0},7,1,0,00000000-0000-0000-0000-000000000000},
{1,0},0,0},9,2,0,2,0,1,
{5,930f3f00-fe12-42c0-94c9-682239037127,3,1,3,
{6,b4647fe3-dcf0-421c-a437-4752f0a1a92a,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,e9875b0f-9f2f-41df-af45-aea18c274f97,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
{6,94147c5d-6d47-46f9-a763-c3575f4d6a22,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,2,00000000-0000-0000-0000-000000000000,142,
{1,0,357c6a54-357d-425d-a2bd-22f4f6e86c87,2147483647,0},0,1},0},
{6,8b924624-ac6a-43fd-9083-e9271bfcf2f8,1,e1692cc2-605b-4535-84dd-28440238746c,
{6,122e8fff-a9c4-4515-a8e3-b6a86bf89000,1,e1692cc2-605b-4535-84dd-28440238746c,
{3,"КнопкаВыполнитьНажатие",
{1,"КнопкаВыполнитьНажатие",
{1,1,
@@ -231,16 +233,14 @@
{0},"",-1,-1,1,0,""},
{0,0,0}
}
},0},
{6,398b8d72-1da7-4bfb-b368-584af073f023,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,3,8b924624-ac6a-43fd-9083-e9271bfcf2f8,
},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,3,122e8fff-a9c4-4515-a8e3-b6a86bf89000,
{8,"ОсновныеДействияФормыВыполнить",0,1,
{1,1,
{"ru","Выполнить"}
},1,930f3f00-fe12-42c0-94c9-682239037127,1,1e2,0,1,1,0,0,0,0},398b8d72-1da7-4bfb-b368-584af073f023,
},1,930f3f00-fe12-42c0-94c9-682239037127,1,1e2,0,1,1,0,0,0,0},e9875b0f-9f2f-41df-af45-aea18c274f97,
{8,"Разделитель",0,1,
{1,0},0,930f3f00-fe12-42c0-94c9-682239037127,2,1e2,2,1,1,0,0,0,0},b4647fe3-dcf0-421c-a437-4752f0a1a92a,
{1,0},0,930f3f00-fe12-42c0-94c9-682239037127,2,1e2,2,1,1,0,0,0,0},94147c5d-6d47-46f9-a763-c3575f4d6a22,
{8,"ОсновныеДействияФормыЗакрыть",0,1,
{1,1,
{"ru","Закрыть"}
@@ -249,7 +249,7 @@
{0}
}
}
},b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,34010924-60b9-4796-a7a1-8cc7b57dc446,1,0,0}
},b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,3448a87e-4929-4888-8b07-093679743398,1,0,0}
},
{8,0,444,734,469,1,
{0,
@@ -757,7 +757,7 @@ OQJ8JSV6zDKsacwr6yCXfqjzC1tzS0O1995iNXXFPVHj69LdrEZqSZdVa3UI5LQN
{0}
}
}
},734,469,1,0,1,4,4,915,734,469,96},
},734,469,1,0,1,4,4,932,734,469,96},
{
{0},4,
{3,
@@ -155,10 +155,8 @@

мТекущаяСтрока = Неопределено;

лКнопка = "ПредустановленныйКод";
Если ЭлементыФормы.КоманднаяПанельОсновная.Кнопки.Найти(лКнопка) = Неопределено Тогда
лДеревоМенюКнопки = гПолучитьМеню(лКнопка);
лКореньМеню = гЗаполнитьМенюПоДереву(ЭлементыФормы.КоманднаяПанельОсновная, лДеревоМенюКнопки, 0);
лКореньМеню = гЗаполнитьМенюПоДереву(ЭлементыФормы.КоманднаяПанельОсновная, гПолучитьМеню("ПредустановленныйКод"));
Если лКореньМеню <> Неопределено Тогда
лКореньМеню.Отображение = ОтображениеКнопкиКоманднойПанели.НадписьКартинка;
КонецЕсли;

@@ -136,7 +136,7 @@
{0},7,1,0,00000000-0000-0000-0000-000000000000},
{1,0},0,0},9,2,0,2,0,1,
{5,fd837f1d-5dcb-4dbe-b0bf-10c9cc5b09e7,2,1,2,
{6,15dfb3c2-10e4-4ddc-875e-6b7c57437993,1,e1692cc2-605b-4535-84dd-28440238746c,
{6,995f39c3-f088-42f6-972a-aabdebd80bdd,1,e1692cc2-605b-4535-84dd-28440238746c,
{3,"ОсновныеДействияФормыOK",
{1,"ОсновныеДействияФормыOK",
{1,1,
@@ -153,14 +153,14 @@
{0,0,0}
}
},0},
{6,5cbe9acd-a340-495a-86b0-1edac50e8c36,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,759dfa62-2d43-489b-a5be-e619a7f827f9,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
{6,4294967295,00000000-0000-0000-0000-000000000000,142,
{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},1,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,15dfb3c2-10e4-4ddc-875e-6b7c57437993,
{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,995f39c3-f088-42f6-972a-aabdebd80bdd,
{8,"OK",0,1,
{1,1,
{"#","OK"}
},0,fd837f1d-5dcb-4dbe-b0bf-10c9cc5b09e7,2,1e2,0,0,1,0,0,0,0},5cbe9acd-a340-495a-86b0-1edac50e8c36,
},0,fd837f1d-5dcb-4dbe-b0bf-10c9cc5b09e7,2,1e2,0,0,1,0,0,0,0},759dfa62-2d43-489b-a5be-e619a7f827f9,
{8,"Отмена",0,1,
{1,1,
{"ru","Отмена"}
@@ -169,7 +169,7 @@
{0}
}
}
},b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,77b104b7-807f-4a72-977f-d8af0e4f9ce9,2,0,0}
},b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,52e8183b-98b0-43bf-ad84-ee48fcbbf7b0,2,0,0}
},
{8,0,340,778,365,1,
{0,
@@ -1367,7 +1367,7 @@
{0}
}
}
},778,365,1,0,1,4,4,525,778,365,96},
},778,365,1,0,1,4,4,537,778,365,96},
{
{-1},6,
{4,
@@ -145,7 +145,7 @@
{0}
}
}
},600,300,1,0,0,4,4,732,600,300,96},
},600,300,1,0,0,4,4,744,600,300,96},
{
{-1},6,
{2,
Oops, something went wrong.

0 comments on commit b2e3436

Please sign in to comment.