From adfee6296162aa783d6f25a28915d2906bde3d4a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Oct 2020 11:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=AD=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2web/source/o2_core/o2/widget/O2Identity.js | 28 +++ .../x_component_Selector/QueryStatement.js | 162 ++++++++++++++ o2web/source/x_component_Selector/lp/en.js | 1 + o2web/source/x_component_Selector/lp/zh-cn.js | 1 + .../$Main/bottom/icon/statement.png | Bin 0 -> 4431 bytes .../$Main/bottom/tools.json | 10 + .../$Main/default/icon/statement.png | Bin 0 -> 4431 bytes .../$Main/default/tools.json | 10 + .../Module/Package.js | 4 +- .../Module/Statement.js | 39 ++++ .../Module/StatementSelector.js | 6 + .../x_component_cms_FormDesigner/Script.js | 4 + .../x_component_portal_PageDesigner/Script.js | 12 ++ .../$Main/bottom/icon/statement.png | Bin 0 -> 4431 bytes .../$Main/bottom/tools.json | 10 + .../$Main/default/icon/statement.png | Bin 0 -> 4431 bytes .../$Main/default/tools.json | 10 + .../Module/Package.js | 2 + .../Module/Statement.js | 124 +++++++++++ .../Module/Statement/default/css.wcss | 91 ++++++++ .../Module/Statement/default/icon/copy.png | Bin 0 -> 663 bytes .../Module/Statement/default/icon/copy1.png | Bin 0 -> 692 bytes .../Module/Statement/default/icon/delete.png | Bin 0 -> 715 bytes .../Module/Statement/default/icon/delete1.png | Bin 0 -> 794 bytes .../Module/Statement/default/icon/move.png | Bin 0 -> 564 bytes .../Module/Statement/default/icon/move1.png | Bin 0 -> 707 bytes .../Module/Statement/default/icon/multi.png | Bin 0 -> 279 bytes .../Module/Statement/default/icon/single.png | Bin 0 -> 372 bytes .../Statement/default/icon/statement.png | Bin 0 -> 390 bytes .../Module/Statement/statement.html | 168 +++++++++++++++ .../Module/Statement/template.json | 90 ++++++++ .../Module/StatementSelector.js | 25 +++ .../StatementSelector/StatementSelector.html | 198 ++++++++++++++++++ .../Module/StatementSelector/default/css.wcss | 55 +++++ .../default/icon/buttonIcon.png | Bin 0 -> 769 bytes .../StatementSelector/default/icon/copy.png | Bin 0 -> 663 bytes .../StatementSelector/default/icon/copy1.png | Bin 0 -> 692 bytes .../StatementSelector/default/icon/delete.png | Bin 0 -> 715 bytes .../default/icon/delete1.png | Bin 0 -> 794 bytes .../StatementSelector/default/icon/hand2.png | Bin 0 -> 760 bytes .../StatementSelector/default/icon/hand3.png | Bin 0 -> 978 bytes .../default/icon/inputtext.png | Bin 0 -> 535 bytes .../StatementSelector/default/icon/move.png | Bin 0 -> 564 bytes .../StatementSelector/default/icon/move1.png | Bin 0 -> 707 bytes .../Module/StatementSelector/template.json | 85 ++++++++ .../Property.js | 10 + .../widget/PersonSelector.js | 82 ++++---- 47 files changed, 1187 insertions(+), 40 deletions(-) create mode 100644 o2web/source/x_component_Selector/QueryStatement.js create mode 100644 o2web/source/x_component_cms_FormDesigner/$Main/bottom/icon/statement.png create mode 100644 o2web/source/x_component_cms_FormDesigner/$Main/default/icon/statement.png create mode 100644 o2web/source/x_component_cms_FormDesigner/Module/Statement.js create mode 100644 o2web/source/x_component_cms_FormDesigner/Module/StatementSelector.js create mode 100644 o2web/source/x_component_process_FormDesigner/$Main/bottom/icon/statement.png create mode 100644 o2web/source/x_component_process_FormDesigner/$Main/default/icon/statement.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement.js create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/css.wcss create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/copy.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/copy1.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/delete.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/delete1.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/move.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/move1.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/multi.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/single.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/statement.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/statement.html create mode 100644 o2web/source/x_component_process_FormDesigner/Module/Statement/template.json create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector.js create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/StatementSelector.html create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/css.wcss create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/buttonIcon.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/copy.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/copy1.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/delete.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/delete1.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/hand2.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/hand3.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/inputtext.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/move.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/move1.png create mode 100644 o2web/source/x_component_process_FormDesigner/Module/StatementSelector/template.json diff --git a/o2web/source/o2_core/o2/widget/O2Identity.js b/o2web/source/o2_core/o2/widget/O2Identity.js index 7b3663239d..b9fc79c36e 100644 --- a/o2web/source/o2_core/o2/widget/O2Identity.js +++ b/o2web/source/o2_core/o2/widget/O2Identity.js @@ -468,6 +468,34 @@ o2.widget.O2QueryView = new Class({ } } }); + +o2.widget.O2QueryStatement = new Class({ + Extends: o2.widget.O2View, + getPersonData: function(){ + if (!this.data.query){ + var data = null; + o2.Actions.load("x_query_assemble_designer").StatementAction.get(this.data.id, function(json){ + data = json.data + }, null, false); + this.data = data; + return data; + }else{ + return this.data; + } + }, + open : function (e) { + if( this.data.id && this.data.query ){ + var appId = "query.StatementDesigner" + this.data.id; + if (layout.desktop.apps[appId]){ + layout.desktop.apps[appId].setCurrent(); + }else { + var options = {"id": this.data.id, "application": this.data.query, "appId": appId}; + layout.desktop.openApplication(e, "query.StatementDesigner", options); + } + } + } +}); + o2.widget.O2QueryStat = new Class({ Extends: o2.widget.O2View, getPersonData: function(){ diff --git a/o2web/source/x_component_Selector/QueryStatement.js b/o2web/source/x_component_Selector/QueryStatement.js new file mode 100644 index 0000000000..b7fd1d4601 --- /dev/null +++ b/o2web/source/x_component_Selector/QueryStatement.js @@ -0,0 +1,162 @@ +MWF.xApplication.Selector = MWF.xApplication.Selector || {}; +MWF.xDesktop.requireApp("Selector", "Person", null, false); +MWF.xApplication.Selector.QueryStatement = new Class({ + Extends: MWF.xApplication.Selector.Person, + options: { + "style": "default", + "count": 0, + "title": MWF.xApplication.Selector.LP.selectStatement, + "values": [], + "names": [], + "expand": false, + "forceSearchInItem" : true + }, + _init : function(){ + this.selectType = "querystatement"; + this.className = "QueryStatement"; + }, + loadSelectItems: function(addToNext){ + this.queryAction.listApplication(function(json){ + if (json.data.length){ + json.data.each(function(data){ + if (!data.statementList){ + this.queryAction.listStatement(data.id, function(statementsJson){ + data.statementList = statementsJson.data; + }.bind(this), null, false); + } + if (data.statementList && data.statementList.length){ + var category = this._newItemCategory(data, this, this.itemAreaNode); + data.statementList.each(function(d){ + d.applicationName = data.name; + var item = this._newItem(d, this, category.children); + this.items.push(item); + }.bind(this)); + } + }.bind(this)); + } + }.bind(this)); + }, + + _scrollEvent: function(y){ + return true; + }, + _getChildrenItemIds: function(data){ + return data.statementList || []; + }, + _newItemCategory: function(data, selector, item, level){ + return new MWF.xApplication.Selector.QueryStatement.ItemCategory(data, selector, item, level) + }, + + _listItemByKey: function(callback, failure, key){ + return false; + }, + _getItem: function(callback, failure, id, async){ + this.queryAction.getStatement(function(json){ + if (callback) callback.apply(this, [json]); + }.bind(this), failure, ((typeOf(id)==="string") ? id : id.id), async); + }, + _newItemSelected: function(data, selector, item){ + return new MWF.xApplication.Selector.QueryStatement.ItemSelected(data, selector, item) + }, + _listItemByPinyin: function(callback, failure, key){ + return false; + }, + _newItem: function(data, selector, container, level){ + return new MWF.xApplication.Selector.QueryStatement.Item(data, selector, container, level); + } +}); +MWF.xApplication.Selector.QueryStatement.Item = new Class({ + Extends: MWF.xApplication.Selector.Person.Item, + _getShowName: function(){ + return this.data.name; + }, + _setIcon: function(){ + this.iconNode.setStyle("background-image", "url("+"../x_component_Selector/$Selector/default/icon/view.png)"); + }, + loadSubItem: function(){ + return false; + }, + checkSelectedSingle: function(){ + var selectedItem = this.selector.options.values.filter(function(item, index){ + if (typeOf(item)==="object"){ + if( this.data.id && item.id ){ + return this.data.id === item.id; + }else{ + return this.data.name === item.name; + } + //return (this.data.id === item.id) || (this.data.name === item.name) ; + } + //if (typeOf(item)==="object") return (this.data.id === item.id) || (this.data.name === item.name) ; + if (typeOf(item)==="string") return (this.data.id === item) || (this.data.name === item); + return false; + }.bind(this)); + if (selectedItem.length){ + this.selectedSingle(); + } + }, + checkSelected: function(){ + + var selectedItem = this.selector.selectedItems.filter(function(item, index){ + if( item.data.id && this.data.id){ + return item.data.id === this.data.id; + }else{ + return item.data.name === this.data.name; + } + //return (item.data.id === this.data.id) || (item.data.name === this.data.name); + }.bind(this)); + if (selectedItem.length){ + //selectedItem[0].item = this; + selectedItem[0].addItem(this); + this.selectedItem = selectedItem[0]; + this.setSelected(); + } + } +}); + +MWF.xApplication.Selector.QueryStatement.ItemSelected = new Class({ + Extends: MWF.xApplication.Selector.Person.ItemSelected, + _getShowName: function(){ + return this.data.name; + }, + _setIcon: function(){ + this.iconNode.setStyle("background-image", "url("+"../x_component_Selector/$Selector/default/icon/view.png)"); + }, + check: function(){ + if (this.selector.items.length){ + var items = this.selector.items.filter(function(item, index){ + //return (item.data.id === this.data.id) || (item.data.name === this.data.name); + if( item.data.id && this.data.id){ + return item.data.id === this.data.id; + }else{ + return item.data.name === this.data.name; + } + }.bind(this)); + this.items = items; + if (items.length){ + items.each(function(item){ + item.selectedItem = this; + item.setSelected(); + }.bind(this)); + } + } + } +}); + +MWF.xApplication.Selector.QueryStatement.ItemCategory = new Class({ + Extends: MWF.xApplication.Selector.Person.ItemCategory, + _getShowName: function(){ + return this.data.name; + }, + createNode: function(){ + this.node = new Element("div", { + "styles": this.selector.css.selectorItemCategory_department + }).inject(this.container); + }, + _setIcon: function(){ + this.iconNode.setStyle("background-image", "url("+"../x_component_Selector/$Selector/default/icon/applicationicon.png)"); + }, + _hasChild: function(){ + return (this.data.statementList && this.data.statementList.length); + }, + check: function(){} +}); diff --git a/o2web/source/x_component_Selector/lp/en.js b/o2web/source/x_component_Selector/lp/en.js index 2c141815fa..315bb8f20a 100644 --- a/o2web/source/x_component_Selector/lp/en.js +++ b/o2web/source/x_component_Selector/lp/en.js @@ -10,6 +10,7 @@ MWF.xApplication.Selector.LP = MWF.SelectorLP = { "selectAppliction": "Select Process Appliction", "selectProcess": "Select Process", "selectView": "Select View", + "selectStatement": "Select Statement", "selectCMSApplication": "Select CMS Application", "selectCMSCategory": "Select CMS Category", "searchDescription" : "search", diff --git a/o2web/source/x_component_Selector/lp/zh-cn.js b/o2web/source/x_component_Selector/lp/zh-cn.js index 4fc4ce4f02..6dd2a6625f 100644 --- a/o2web/source/x_component_Selector/lp/zh-cn.js +++ b/o2web/source/x_component_Selector/lp/zh-cn.js @@ -12,6 +12,7 @@ MWF.xApplication.Selector.LP = MWF.SelectorLP = { "selectAppliction": "选择流程应用", "selectProcess": "选择流程", "selectView": "选择视图", + "selectStatement" : "选择查询", "selectTable": "选择数据表", "selectFormStyle" : "选择表单样式", "selectCMSApplication": "选择内容管理应用", diff --git a/o2web/source/x_component_cms_FormDesigner/$Main/bottom/icon/statement.png b/o2web/source/x_component_cms_FormDesigner/$Main/bottom/icon/statement.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dc749b71592952ec7fb9267158d182c174c342 GIT binary patch literal 4431 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 V3j%J1BO(9*002ovPDHLkV1f#hdd&a; literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_cms_FormDesigner/$Main/bottom/tools.json b/o2web/source/x_component_cms_FormDesigner/$Main/bottom/tools.json index d3f1dacdbc..05f9172667 100644 --- a/o2web/source/x_component_cms_FormDesigner/$Main/bottom/tools.json +++ b/o2web/source/x_component_cms_FormDesigner/$Main/bottom/tools.json @@ -194,5 +194,15 @@ "icon": "comment.png", "text": "评论", "className": "Comment" + }, + "statementSelector": { + "icon": "statement.png", + "text": "选择查询", + "className": "StatementSelector" + }, + "statement": { + "icon": "statement.png", + "text": "嵌入查询", + "className": "Statement" } } \ No newline at end of file diff --git a/o2web/source/x_component_cms_FormDesigner/$Main/default/icon/statement.png b/o2web/source/x_component_cms_FormDesigner/$Main/default/icon/statement.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dc749b71592952ec7fb9267158d182c174c342 GIT binary patch literal 4431 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 V3j%J1BO(9*002ovPDHLkV1f#hdd&a; literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_cms_FormDesigner/$Main/default/tools.json b/o2web/source/x_component_cms_FormDesigner/$Main/default/tools.json index 076f59ceb4..60bef9eaaa 100644 --- a/o2web/source/x_component_cms_FormDesigner/$Main/default/tools.json +++ b/o2web/source/x_component_cms_FormDesigner/$Main/default/tools.json @@ -195,5 +195,15 @@ "icon": "comment.png", "text": "评论", "className": "Comment" + }, + "statementSelector": { + "icon": "statement.png", + "text": "选择查询", + "className": "StatementSelector" + }, + "statement": { + "icon": "statement.png", + "text": "嵌入查询", + "className": "Statement" } } \ No newline at end of file diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Package.js b/o2web/source/x_component_cms_FormDesigner/Module/Package.js index 0a88f4f31e..f7ead6ad0e 100644 --- a/o2web/source/x_component_cms_FormDesigner/Module/Package.js +++ b/o2web/source/x_component_cms_FormDesigner/Module/Package.js @@ -41,4 +41,6 @@ MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Office", null, false); MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Attachment", null, false); MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Log", null, false); MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Office", null, false); -MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Comment", null, false); \ No newline at end of file +MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Comment", null, false); +MWF.xDesktop.requireApp("cms.FormDesigner", "Module.Statement", null, false); +MWF.xDesktop.requireApp("cms.FormDesigner", "Module.StatementSelector", null, false); \ No newline at end of file diff --git a/o2web/source/x_component_cms_FormDesigner/Module/Statement.js b/o2web/source/x_component_cms_FormDesigner/Module/Statement.js new file mode 100644 index 0000000000..70c226b511 --- /dev/null +++ b/o2web/source/x_component_cms_FormDesigner/Module/Statement.js @@ -0,0 +1,39 @@ +MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {}; +MWF.xDesktop.requireApp("process.FormDesigner", "Module.Statement", null, false); +MWF.xApplication.cms.FormDesigner.Module.Statement = MWF.CMSFCStatement = new Class({ + Extends: MWF.FCStatement, + Implements : [MWF.CMSFCMI]//, + //_createViewNode: function(callback){ + // if (!this.viewNode) this.viewNode = new Element("div", {"styles": this.css.viewNode}).inject(this.node); + // this.node.setStyle("background", "transparent"); + // + // this.viewTable = new Element("table", { + // "styles": this.css.viewTitleTableNode, + // "border": "0px", + // "cellPadding": "0", + // "cellSpacing": "0" + // }).inject(this.viewNode); + // this.viewLine = new Element("tr", {"styles": this.css.viewTitleLineNode}).inject(this.viewTable); + // + // if (this.json.select!="no"){ + // this.viewSelectCell = new Element("td", { + // "styles": this.css.viewTitleCellNode + // }).inject(this.viewLine); + // this.viewSelectCell.setStyle("width", "10px"); + // } + // this.form.designer.actions.getQueryView(this.json["view"], function(json){ + // var viewData = JSON.decode(json.data.data); + // viewData.selectEntryList.each(function(column){ + // // if (column.export){ + // var viewCell = new Element("td", { + // "styles": this.css.viewTitleCellNode, + // "text": column.displayName + // }).inject(this.viewLine); + // // } + // }.bind(this)); + // + // if (callback) callback(); + // }.bind(this)); + // this._setViewNodeTitle(); + //} +}); diff --git a/o2web/source/x_component_cms_FormDesigner/Module/StatementSelector.js b/o2web/source/x_component_cms_FormDesigner/Module/StatementSelector.js new file mode 100644 index 0000000000..718c36e1aa --- /dev/null +++ b/o2web/source/x_component_cms_FormDesigner/Module/StatementSelector.js @@ -0,0 +1,6 @@ +MWF.xApplication.cms.FormDesigner.Module = MWF.xApplication.cms.FormDesigner.Module || {}; +MWF.xDesktop.requireApp("process.FormDesigner", "Module.StatementSelector", null, false); +MWF.xApplication.cms.FormDesigner.Module.StatementSelector = MWF.CMSFCStatementSelector = new Class({ + Extends: MWF.FCStatementSelector, + Implements : [MWF.CMSFCMI] +}); diff --git a/o2web/source/x_component_cms_FormDesigner/Script.js b/o2web/source/x_component_cms_FormDesigner/Script.js index 359796cc03..feb0a2da3f 100644 --- a/o2web/source/x_component_cms_FormDesigner/Script.js +++ b/o2web/source/x_component_cms_FormDesigner/Script.js @@ -102,6 +102,10 @@ MWF.xApplication.cms.FormDesigner.Script = new Class({ this.loadAuthorScript(v); break; case "Reader": this.loadReaderScript(v); break; + case "Statement": + this.loadStatementScript(v); break; + case "StatementSelector": + this.loadStatementSelectorScript(v); break; } this.bindDataId(v); }, diff --git a/o2web/source/x_component_portal_PageDesigner/Script.js b/o2web/source/x_component_portal_PageDesigner/Script.js index c33d202771..620ff94307 100644 --- a/o2web/source/x_component_portal_PageDesigner/Script.js +++ b/o2web/source/x_component_portal_PageDesigner/Script.js @@ -158,6 +158,10 @@ MWF.xApplication.portal.PageDesigner.Script = new Class({ this.loadSubformScript(v); break; case "ViewSelector": this.loadViewSelectorScript(v); break; + case "Statement": + this.loadStatementScript(v); break; + case "StatementSelector": + this.loadStatementSelectorScript(v); break; } this.bindDataId(v); }, @@ -421,6 +425,14 @@ MWF.xApplication.portal.PageDesigner.Script = new Class({ this.loadEventsScript(data); }, + loadStatementScript: function(data){ + this.loadEventsScript(data); + }, + loadStatementSelectorScript: function(data){ + this.addScriptItem(data.selectedScript, "code", data, "selectedScript"); + this.loadEventsScript(data); + }, + loadEventsScript: function(data){ Object.each(data.events, function(event, key){ diff --git a/o2web/source/x_component_process_FormDesigner/$Main/bottom/icon/statement.png b/o2web/source/x_component_process_FormDesigner/$Main/bottom/icon/statement.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dc749b71592952ec7fb9267158d182c174c342 GIT binary patch literal 4431 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 V3j%J1BO(9*002ovPDHLkV1f#hdd&a; literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/$Main/bottom/tools.json b/o2web/source/x_component_process_FormDesigner/$Main/bottom/tools.json index 1f052a7bda..f5aaff3862 100644 --- a/o2web/source/x_component_process_FormDesigner/$Main/bottom/tools.json +++ b/o2web/source/x_component_process_FormDesigner/$Main/bottom/tools.json @@ -174,5 +174,15 @@ "icon": "office.png", "text": "Office控件", "className": "Office" + }, + "statementSelector": { + "icon": "statement.png", + "text": "选择查询", + "className": "StatementSelector" + }, + "statement": { + "icon": "statement.png", + "text": "嵌入查询", + "className": "Statement" } } \ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/$Main/default/icon/statement.png b/o2web/source/x_component_process_FormDesigner/$Main/default/icon/statement.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dc749b71592952ec7fb9267158d182c174c342 GIT binary patch literal 4431 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 V3j%J1BO(9*002ovPDHLkV1f#hdd&a; literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/$Main/default/tools.json b/o2web/source/x_component_process_FormDesigner/$Main/default/tools.json index 82720eb1ca..cd77817072 100644 --- a/o2web/source/x_component_process_FormDesigner/$Main/default/tools.json +++ b/o2web/source/x_component_process_FormDesigner/$Main/default/tools.json @@ -191,5 +191,15 @@ "icon": "office.png", "text": "Office控件", "className": "Office" + }, + "statementSelector": { + "icon": "statement.png", + "text": "选择查询", + "className": "StatementSelector" + }, + "statement": { + "icon": "statement.png", + "text": "嵌入查询", + "className": "Statement" } } \ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/Module/Package.js b/o2web/source/x_component_process_FormDesigner/Module/Package.js index 73889f9e14..45289b13d6 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Package.js +++ b/o2web/source/x_component_process_FormDesigner/Module/Package.js @@ -41,3 +41,5 @@ MWF.xDesktop.requireApp("process.FormDesigner", "Module.Attachment", null, false MWF.xDesktop.requireApp("process.FormDesigner", "Module.Orgfield", null, false); MWF.xDesktop.requireApp("process.FormDesigner", "Module.Org", null, false); MWF.xDesktop.requireApp("process.FormDesigner", "Module.Opinion", null, false); +MWF.xDesktop.requireApp("process.FormDesigner", "Module.Statement", null, false); +MWF.xDesktop.requireApp("process.FormDesigner", "Module.StatementSelector", null, false); diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement.js b/o2web/source/x_component_process_FormDesigner/Module/Statement.js new file mode 100644 index 0000000000..19c1165416 --- /dev/null +++ b/o2web/source/x_component_process_FormDesigner/Module/Statement.js @@ -0,0 +1,124 @@ +MWF.xApplication.process.FormDesigner.Module = MWF.xApplication.process.FormDesigner.Module || {}; +MWF.xDesktop.requireApp("process.FormDesigner", "Module.View", null, false); +MWF.xApplication.process.FormDesigner.Module.Statement = MWF.FCStatement = new Class({ + Extends: MWF.FCView, + options: { + "style": "default", + "propertyPath": "../x_component_process_FormDesigner/Module/Statement/statement.html" + }, + + initialize: function(form, options){ + this.setOptions(options); + + this.path = "../x_component_process_FormDesigner/Module/Statement/"; + this.cssPath = "../x_component_process_FormDesigner/Module/Statement/"+this.options.style+"/css.wcss"; + + this.imagePath_default = "../x_component_query_ViewDesigner/$Statement/"; + this.imagePath_custom = "../x_component_process_FormDesigner/Module/Actionbar/"; + + this._loadCss(); + this.moduleType = "element"; + this.moduleName = "statement"; + + this.form = form; + this.container = null; + this.containerNode = null; + }, + _createMoveNode: function(){ + this.moveNode = new Element("div", { + "MWFType": "statement", + "id": this.json.id, + "styles": this.css.moduleNodeMove, + "events": { + "selectstart": function(){ + return false; + } + } + }).inject(this.form.container); + }, + + _createNode: function(){ + this.node = this.moveNode.clone(true, true); + this.node.setStyles(this.css.moduleNode); + this.node.set("id", this.json.id); + this.node.addEvent("selectstart", function(){ + return false; + }); + + this.iconNode = new Element("div", { + "styles": this.css.iconNode + }).inject(this.node); + new Element("div", { + "styles": this.css.iconNodeIcon + }).inject(this.iconNode); + new Element("div", { + "styles": this.css.iconNodeText, + "text": "Statement" + }).inject(this.iconNode); + + this.iconNode.addEvent("click", function(){ + this._checkView(); + }.bind(this)); + }, + _createViewNode: function(callback){ + + if (!this.viewNode) this.viewNode = new Element("div", {"styles": this.css.viewNode}).inject(this.node); + if( !this.actionbarNode)this.actionbarNode = new Element("div.actionbarNode",{}).inject( this.viewNode, "top" ); + + this.node.setStyle("background", "transparent"); + + + this.viewTable = new Element("table", { + "styles": this.css.viewTitleTableNode, + "border": "0px", + "cellPadding": "0", + "cellSpacing": "0" + }).inject(this.viewNode); + this.viewLine = new Element("tr", {"styles": this.css.viewTitleLineNode}).inject(this.viewTable); + + if (this.json.select!="no"){ + this.viewSelectCell = new Element("td", { + "styles": this.css.viewTitleCellNode + }).inject(this.viewLine); + this.viewSelectCell.setStyle("width", "10px"); + } + + MWF.Actions.get("x_query_assemble_designer").getView(this.json["queryView"].id, function(json){ + var viewData = JSON.decode(json.data.data); + + this.viewData = viewData; + if( this.json.actionbar === "show" ){ + this.actionbarList = []; + this._showActionbar(); + } + + var columnList = viewData.selectEntryList || viewData.selectList; + columnList.each(function(column){ + if (!column.hideColumn){ + var viewCell = new Element("td", { + "styles": this.css.viewTitleCellNode, + "text": column.displayName + }).inject(this.viewLine); + } + }.bind(this)); + + if (callback) callback(); + }.bind(this)); + this._setViewNodeTitle(); + }, + _checkView: function(callback){ + if (this.json["queryView"] && this.json["queryView"]!="none"){ + this.iconNode.setStyle("display", "none"); + if (this.viewNode) this.viewNode.destroy(); + this.viewNode = null; + this._createViewNode(function(){ + if (callback) callback(); + }.bind(this)); + }else{ + this.iconNode.setStyle("display", "block"); + if (this.viewNode) this.viewNode.destroy(); + this.node.setStyles(this.css.moduleNode); + if (callback) callback(); + } + } +}); diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement/default/css.wcss b/o2web/source/x_component_process_FormDesigner/Module/Statement/default/css.wcss new file mode 100644 index 0000000000..ef614b1500 --- /dev/null +++ b/o2web/source/x_component_process_FormDesigner/Module/Statement/default/css.wcss @@ -0,0 +1,91 @@ +{ + "moduleNodeMove": { + "border": "2px dashed #ffa200", + "height": "22px", + "line-height": "22px", + "overflow": "hidden", + "margin": "3px", + "display": "block", + "-webkit-user-select": "none", + "-moz-user-select": "none", + "position": "absolute", + "z-index": 10002, + "opacity": 0.7, + "width": "100px", + "cursor": "move", + "background-color": "#EEE" + }, + "moduleNodeShow": { + "border": "1px dashed #333", + "height": "2px", + "cursor": "pointer", + "line-height": "22px", + "overflow": "hidden", + "margin": "3px", + "-webkit-user-select": "none", + "-moz-user-select": "none", + "position": "static", + "display": "block", + "top": "auto", + "left": "auto", + "width": "auto", + "opacity": 0.5, + "background": "#ffa200" + }, + "moduleNode": { + "border": "1px dashed #333", + "height": "100px", + "cursor": "pointer", + "line-height": "22px", + "overflow": "hidden", + "margin": "3px", + "-webkit-user-select": "none", + "-moz-user-select": "none", + "position": "static", + "display": "block", + "top": "auto", + "left": "auto", + "width": "auto", + "opacity": 1, + "background": "transparent" + }, + "iconNode": { + "width": "70px", + "height": "24px", + "color": "#999", + "font-size": "12px", + "position": "static", + "margin": "10px auto" + }, + "iconNodeIcon":{ + "width": "24px", + "height": "24px", + "background": "url("+"../x_component_process_FormDesigner/Module/Statement/default/icon/statement.png) 5px center no-repeat", + "float": "left" + }, + "iconNodeText":{ + "line-height": "24px", + "height": "24px", + "width": "44px", + "float": "right" + }, + "viewNode": { + "overflow": "hidden", + "height": "100%" + }, + "viewTitleTableNode": { + "width": "100%", + "height": "30px", + "background-color": "#EEE", + "border": "1px solid #999" + }, + "viewTitleLineNode": { + "line-height": "30px" + }, + "viewTitleCellNode": { + "border-left": "1px solid #FFF", + "border-right": "1px solid #999", + "padding": "0px 10px" + } + +} \ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/copy.png b/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..195dc6d6c365d298e466026b37c1959d96119ea7 GIT binary patch literal 663 zcmV;I0%-k-P)^@R5;6Z z(>-WZK@^7J_sq=QY_e{46@P+~LNG}sRzZsxQHvCsN*h5ir6^j7pq-$xu$N#V1gx}9 zClV7;5)7zih-s3DB)G=7|99>ji@So7-P24n=VQ(@GctDX!^_@$bj%oviY6e4Dh;od zooe%Wvs8LEKQ&&bL&@bwi=STIAI@!-gB2jC5+?y?VR~VkrNxam-`6*8&po|RZ5LpS zNKdJ%c4bTX`XjKsnecf%W>1%6WT?pKNdLLq{=(f(Col?P1+oq@R>)W(n=x!|*BIIh z6DJGw_w`)u6yN|vAhMteYK5#b%r5^v+VCFl1IGssaclZZMS{vs-LJ2$)n7DAr6==K z<29#%AXsBsDoO}SBaXR#_Ap!JKx)(1)3O2pj0_dYWz5By*X74fRT01$Fk%P_RzOMDtV?GU{nsYq#K8iy zb6qzLYDj`_f5$BwC*WE(t0m#xYJ*=jC2|HQYHh=pf#QG7oowi`h!L!{DB$8|qY{~X zu8@sU1tWq;n$XThR0%;45mdqXM892|{CJ@0DS*}>?ami06Q_^tvM~Y3K(_-`#m!8f z8f!QIrH4y#61;0Ym0cCoLl8{IPombPHtnn7%SbTdI&G-d>ZQo!_wBMF9nzX!g8HVY xYTJPGciz9XMh3w2fmZ(7v{)r*QZD48?mrio{~IaoqUSP(WM*2h3jsNd*dGY#Eq+)=zIm7nTNO~@T@k#^TQ6V<>E`NuvQX|p!7GUuELig&>gy% zQ2EKk#ok5$Pv6+s`ZVwQY0`J;=Y{m@iX4cR+9h0et zX}pSsl%DE*`&X;&vek)-Diu z%A>vjNvJ~8d5&^R!q~^ED_KSf~G=bMrO2>Qa~phliJdSj^0F} z-J^oa?|+%#^s|E(hh5l?3+|#lnBwyG86qMBLbHMatcGc!;Rk`36L97)noxERrW(Ld zLo{1Gs;vC!b6Y%Ez5t=T-xHjV%Y}P>*{~4_DjJ366RprOD?$cP3p4QM59!yiZ3p)s z9>b%i1z)|UVCVuz?E$XuSWMu_dcA&BC=_T|`jWw|LeziKKfS&0>%9mZ#{p|~`h1AT zC4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;yxzh{5!Htr?51 zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7 zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l z!7?%Uwib*ROP67Hw`ika)gX-(8Ia`-u_IEhxG7U<13kSsMW+$lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/delete1.png b/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/delete1.png new file mode 100644 index 0000000000000000000000000000000000000000..8f420087aae2f5a6e8cb22376e257d0ee8b2e12e GIT binary patch literal 794 zcmV+#1LgdQP)cswrYx^Dc>q6}rZNF;JA7z~yXLagkDqClRXM}B%5 zN@5K}FM@SB;B0D!r>z5y>Y#OwGL+>QhVhkPB8te3kHg5O;XM}t*VPI`mQl>4ku?+k zntX@K+jrqlqfk1mJc)t&8Pah-q zV-A#|ENd8swV~QZavi>l9YE|GF+~IPR9jiHLKok`umjh!aa-Hvny{&y;?};Q~=g|Y`ss`9?2Mu&P z2YEdKhrb%q=nH7iUxG0WN@1Ao`LF0oUCFZ`Wn(b_%l5 zXf&p(s+Exqor3%3J#0BxEX}+}qL4z8k+2+_LG1S&oP9S?*>?wowSh8}W&D2sadWC( z_xAR-nA3RTGzjVJ}6NX*A^BQ#)`$_(q91v Y050~uP_q{>b^rhX07*qoM6N<$f&s=-HUIzs literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/move.png b/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/move.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb1887d01afffceac856906a84243c331ee6ad1 GIT binary patch literal 564 zcmV-40?Yl0P)!O*UXZN^24)5G^4Ybfee{Sr^;dFXo zap_$cLt%r{r;f*>(bx(TuS#E}XXjq)W}F#j(5Tz}p4&(ea{>W+0lfGx1KYMn48s61 zgNR1M44OtrcE;iWW|$3=nZeA0h9G#@N0`0+&+(&je6~)ujKN%-t4%P;=x?;txado zWXFhbQ!CY`w1QS@wfO3Nhq!@-$Tnn91>{e>iO%9gPxhEp+BcO_P|A0t6n9P6tx*lx zD$E>XHo$EBHchi*^6`^RH5$zfJ}oWF&OM24A>5-vco4#yc=mjHx)~dKiH=jf7X$q^8(fZDIp?*dkQ%v8md+i7ycUj39)98y6DLT_NDYMMW2d zqNorAUD?#whc6T>q;1k^GPO;kojfKs$t2D|}rRQewihOo55;karr7@CU3BL1`_6)-dN8V?`b zhbU%HT_+4-X^Ns+s*A*8MnrJ>6`nnr#7ZQLdOd_?0^J-D=E(9w!!l}gsmU2+ibXV z^A@nVfxNjN(I|&iehoccU1)CJ1+`kOjIop8-P>8r&(C3cCWu2?7S7R8G)-Ito#w%< zkKqfYgYVv5^q7q3A2^Cjm#--a=yHNsEQ-0=DJ0@N(rE#uqyVh^L@A`kHWxugOoCqv zV|no_K7V?zFck@g&Wyn696<2R6q0MJ$QmsWTw{>9B{ZJ90)2Q9!$W6re%J-G*{U!V zJ0NP=+lrA9m-4Gz3xRKARP*YmU6k=&aW)Hp`j5rn-hootT1-$tEm%)u#EhO z>U6r(CX-3eFpLtbY*Xic3?4fLl}c4{E{Y=je*Xub&v%28N1<7k?Y3Af7qnV!2Wj}5 pc1|K&!D)_m7(&#ZP_R4(rLEUTR(dzwcK9{yO=q#OMVZ&lsx|q9P+wyrh$HRk( z;%iGk?|qZdvh~}k%WeC)F8sZd)Uz;rN%R8079aQOOE=%2+sUslUdF1hSo%oRvgrC^ zufyvYb~!XyOmh6rA)wHgQc%$;;BKU$FZh4Dm0tz-o-3)RZ{G91$vE%12iplpz4qnG aN5n6hBwx?D^ZO{!GYp=telF{r5}E)xoNsji literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/single.png b/o2web/source/x_component_process_FormDesigner/Module/Statement/default/icon/single.png new file mode 100644 index 0000000000000000000000000000000000000000..4a224d783435d5f10cfdbffae2149356e8b83766 GIT binary patch literal 372 zcmV-)0gL{LP)Px#1ZP1_K>z@;j|==^1poj69!W$&R5(w?lCf@sKn#Wt=m=8AyafS))Qz=6GN((& zJOS$5t{L(Kd4W_No1q&*St4=p6dk(5h#X;}ilXPP z>*jPkW`wkD`$I~(;rN6h;QRi_ahx@dW7yKNtUcxXzJG*E5jPN86h-k%dBP9~!|)SD zKd$S(=6T+7dLT)Xhq|uc@O@I2<&4vRP}>mLQ6Z=P1vMGfawu%}g73UkeP6%+(%>OxHxH4P z1ovy`sW^2;5CrdVt-esk9>j4x#)Q{s(?z&aL*=$pSc^q_xwuG*YgYN*2yp;aR(Y(? Sb0gLO0000;1k*-!zk~CMF9Bv_3(^PCOq; +
+ + + + + + + + + + + + + + + + + +
标识:
名称:
描述:
Class:
+ +
+
+ +
+
+ +
+
+ + + + + +
查询:
+ + + + + +
立即载入: + 是 + 否 +
+
+ + + + + + + + + + + + + + + + + + + + + +
显示标题 + 显示 + 不显示 +
选择文件 + +
操作条 + 显示 + 不显示 +
+ +
过滤
+
+
+ + + + + + + + + + + + + + + + + +
标题:
路径:
数据类型:
+ 作为默认过滤条件
+ 作为自定义过滤数据 +
+ + + + + + + + + + + + + + +
逻辑:
比较:
值: + + + + + + +
+
+
+
+
默认过滤条件
+
+
自定义过滤数据
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/Module/Statement/template.json b/o2web/source/x_component_process_FormDesigner/Module/Statement/template.json new file mode 100644 index 0000000000..8dd83f0350 --- /dev/null +++ b/o2web/source/x_component_process_FormDesigner/Module/Statement/template.json @@ -0,0 +1,90 @@ +{ + "id": "", + "name": "", + "type": "Statement", + "description": "", + "view": "", + "isTitle": "yes", + "select": "no", //single, multi + "isOpen": "yes", + "events": { + "queryLoad": { + "code": "", + "html": "" + }, + "postLoad": { + "code": "", + "html": "" + }, + "load": { + "code": "", + "html": "" + }, + "loadView" : { + "code": "", + "html": "" + }, + "select": { + "code": "", + "html": "" + }, + "openDocument": { + "code": "", + "html": "" + }, + "click": { + "code": "", + "html": "" + }, + "dblclick": { + "code": "", + "html": "" + }, + "keydown": { + "code": "", + "html": "" + }, + "keypress": { + "code": "", + "html": "" + }, + "keyup": { + "code": "", + "html": "" + }, + "mousedown": { + "code": "", + "html": "" + }, + "mousemove": { + "code": "", + "html": "" + }, + "mouseout": { + "code": "", + "html": "" + }, + "mouseover": { + "code": "", + "html": "" + }, + "mouseup": { + "code": "", + "html": "" + }, + "focus": { + "code": "", + "html": "" + }, + "blur": { + "code": "", + "html": "" + } + }, + "properties": {}, + "class": "", + "styles": {}, + "titleStyles":{}, + "itemStyles": {}, + "container": "" +} \ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector.js b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector.js new file mode 100644 index 0000000000..9557a0506d --- /dev/null +++ b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector.js @@ -0,0 +1,25 @@ +MWF.xApplication.process.FormDesigner.Module = MWF.xApplication.process.FormDesigner.Module || {}; +MWF.xDesktop.requireApp("process.FormDesigner", "Module.$Element", null, false); +MWF.xApplication.process.FormDesigner.Module.StatementSelector = MWF.FCStatementSelector = new Class({ + Extends: MWF.xApplication.process.FormDesigner.Module.Button, + Implements: [Options, Events], + options: { + "style": "default", + "propertyPath": "../x_component_process_FormDesigner/Module/StatementSelector/StatementSelector.html" + }, + + initialize: function(form, options){ + this.setOptions(options); + + this.path = "../x_component_process_FormDesigner/Module/StatementSelector/"; + this.cssPath = "../x_component_process_FormDesigner/Module/StatementSelector/"+this.options.style+"/css.wcss"; + + this._loadCss(); + this.moduleType = "element"; + this.moduleName = "statementSelector"; + + this.form = form; + this.container = null; + this.containerNode = null; + } +}); diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/StatementSelector.html b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/StatementSelector.html new file mode 100644 index 0000000000..6c8718861d --- /dev/null +++ b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/StatementSelector.html @@ -0,0 +1,198 @@ +
+
+ + + + + + + + + + + + + +
标识:
名称:
描述:
+ +
+
+ +
视图选择框
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
选择框标题:
列标题: + 显示 + 隐藏 +
默认展开 + 展开 + 不展开 +
选择: + 单选 + 多选 +
操作条 + 显示 + 不显示 +
+
+ + + + + + + + + + + + + + + + +
+ + + + + +
查询:
+
+ +
+
+ +
选择结果处理
+ + + + + +
处理方式: + 赋值 + 脚本 +
+ +
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + +
标题:
路径:
数据类型:
+ 作为默认过滤条件
+ 作为自定义过滤数据 +
+ + + + + + + + + + + + + + +
逻辑:
比较:
值: + + + + + + +
+
+
+
+
默认过滤条件
+
+
自定义过滤数据
+ +
+
+ +
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/css.wcss b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/css.wcss new file mode 100644 index 0000000000..ef16f4a94d --- /dev/null +++ b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/css.wcss @@ -0,0 +1,55 @@ +{ + "moduleNodeMove": { + "border-radius": "5px", + "border": "1px solid #ffa200", + "overflow": "hidden", + "margin": "3px", + "-webkit-user-select": "none", + "-moz-user-select": "none", + "position": "absolute", + "z-index": 10002, + "opacity": 0.7, + "cursor": "move", + "height": "26px", + "display": "inline-block" + }, + "moduleNodeShow": { + "border": "1px solid #333", + "margin": "3px", + "-webkit-user-select": "none", + "-moz-user-select": "none", + "position": "static", + "top": "auto", + "left": "auto", + "width": "18px", + "height": "2px", + "opacity": 0.5, + "display": "inline-block", + "background": "#ffa200" + }, + "moduleNode": { + "border-radius": "5px", + "border-top": "1px solid #999", + "border-left": "1px solid #999", + "border-right": "1px solid #333", + "border-bottom": "1px solid #333", + "overflow": "hidden", + "cursor": "pointer", + "margin": "3px", + "-webkit-user-select": "none", + "-moz-user-select": "none", + "position": "static", + "top": "auto", + "left": "auto", + "opacity": 1, + "height": "26px", + "display": "inline-block" + }, + "buttonIcon": { + "height": "26px", + "cursor": "pointer", + "border": "0px", + "margin": "0px" + } + +} \ No newline at end of file diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/buttonIcon.png b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/buttonIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..fdcd08c037c25c5df8d12e5331904c89ce611590 GIT binary patch literal 769 zcmV+c1OEJpP)HFpWsJ$P>^RPJI*sFat2*`~h|CuYVXyvv8NVl!>+9?Enyo=t{#xAd{QQhb z$#J}PdoUP`$K$sE$uK)RK=9)7G6(|f>ALRw{<~@wE((8JA0nfr_l)&=J;N{>jRuTs zx~^rKx3{;8H52lTVwN2+UDI^KFuUC^qtWQEYxTP8y7(ykIXh(G3;3v-N^Qz__|ef( zYIe0+^?k2gDQ|+3*FU1nG*z`JolGXcO39-pe9vpt>xEEqAwEh}*9}VT;cy6zDHiO9 zM$hx$z!qt#Ks*iI&@D=@f~(nV7QX}@*Z%(g!G{Ck2w54tArZ1-S@iSap`s|+Do1hr z>|f!dlzCZV`i1b?ty-;?qM!m!PQIc_OQn)++rat<1Xi0+YI}PqrL=tDeW%m8zrUw| zAj(pHM$ATO2~pYsO=!3gs4bJ_H3~<(=^+yR_bmL433X`s;W7* zV_BA}swffRU_oOegfyEj^n=cPKL2rnxU?+OwjEp`E6TDuIN$R6(TvdENmkJBP<^uAE79`yE{KWe|Q+fTHtD$hSpce<%Ll`Ysk^J)6+_& zauG literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/copy.png b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/copy.png new file mode 100644 index 0000000000000000000000000000000000000000..195dc6d6c365d298e466026b37c1959d96119ea7 GIT binary patch literal 663 zcmV;I0%-k-P)^@R5;6Z z(>-WZK@^7J_sq=QY_e{46@P+~LNG}sRzZsxQHvCsN*h5ir6^j7pq-$xu$N#V1gx}9 zClV7;5)7zih-s3DB)G=7|99>ji@So7-P24n=VQ(@GctDX!^_@$bj%oviY6e4Dh;od zooe%Wvs8LEKQ&&bL&@bwi=STIAI@!-gB2jC5+?y?VR~VkrNxam-`6*8&po|RZ5LpS zNKdJ%c4bTX`XjKsnecf%W>1%6WT?pKNdLLq{=(f(Col?P1+oq@R>)W(n=x!|*BIIh z6DJGw_w`)u6yN|vAhMteYK5#b%r5^v+VCFl1IGssaclZZMS{vs-LJ2$)n7DAr6==K z<29#%AXsBsDoO}SBaXR#_Ap!JKx)(1)3O2pj0_dYWz5By*X74fRT01$Fk%P_RzOMDtV?GU{nsYq#K8iy zb6qzLYDj`_f5$BwC*WE(t0m#xYJ*=jC2|HQYHh=pf#QG7oowi`h!L!{DB$8|qY{~X zu8@sU1tWq;n$XThR0%;45mdqXM892|{CJ@0DS*}>?ami06Q_^tvM~Y3K(_-`#m!8f z8f!QIrH4y#61;0Ym0cCoLl8{IPombPHtnn7%SbTdI&G-d>ZQo!_wBMF9nzX!g8HVY xYTJPGciz9XMh3w2fmZ(7v{)r*QZD48?mrio{~IaoqUSP(WM*2h3jsNd*dGY#Eq+)=zIm7nTNO~@T@k#^TQ6V<>E`NuvQX|p!7GUuELig&>gy% zQ2EKk#ok5$Pv6+s`ZVwQY0`J;=Y{m@iX4cR+9h0et zX}pSsl%DE*`&X;&vek)-Diu z%A>vjNvJ~8d5&^R!q~^ED_KSf~G=bMrO2>Qa~phliJdSj^0F} z-J^oa?|+%#^s|E(hh5l?3+|#lnBwyG86qMBLbHMatcGc!;Rk`36L97)noxERrW(Ld zLo{1Gs;vC!b6Y%Ez5t=T-xHjV%Y}P>*{~4_DjJ366RprOD?$cP3p4QM59!yiZ3p)s z9>b%i1z)|UVCVuz?E$XuSWMu_dcA&BC=_T|`jWw|LeziKKfS&0>%9mZ#{p|~`h1AT zC4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;yxzh{5!Htr?51 zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7 zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l z!7?%Uwib*ROP67Hw`ika)gX-(8Ia`-u_IEhxG7U<13kSsMW+$lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/delete1.png b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/delete1.png new file mode 100644 index 0000000000000000000000000000000000000000..8f420087aae2f5a6e8cb22376e257d0ee8b2e12e GIT binary patch literal 794 zcmV+#1LgdQP)cswrYx^Dc>q6}rZNF;JA7z~yXLagkDqClRXM}B%5 zN@5K}FM@SB;B0D!r>z5y>Y#OwGL+>QhVhkPB8te3kHg5O;XM}t*VPI`mQl>4ku?+k zntX@K+jrqlqfk1mJc)t&8Pah-q zV-A#|ENd8swV~QZavi>l9YE|GF+~IPR9jiHLKok`umjh!aa-Hvny{&y;?};Q~=g|Y`ss`9?2Mu&P z2YEdKhrb%q=nH7iUxG0WN@1Ao`LF0oUCFZ`Wn(b_%l5 zXf&p(s+Exqor3%3J#0BxEX}+}qL4z8k+2+_LG1S&oP9S?*>?wowSh8}W&D2sadWC( z_xAR-nA3RTGzjVJ}6NX*A^BQ#)`$_(q91v Y050~uP_q{>b^rhX07*qoM6N<$f&s=-HUIzs literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/hand2.png b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/hand2.png new file mode 100644 index 0000000000000000000000000000000000000000..6ef4e93833befc4e6c1e2a9842d99664c80a13d0 GIT binary patch literal 760 zcmVr5FI{y597a%O!MnMqybN7-P7|KWPbIj6v7+5P&fTDFmb^ z+qS5&F~&koISpu7rBXp85`m^^5JEr-iRI;GSk@m558uSf$_LENJwPInfTn5ieZQG| zF2J%ZOiyQUqrV@sv-d$nAR@ed_Z|SSv$KPrM@NXoV%Yk=h4JxmOifOn2?&4HWtt|; zD<-npeXOmmfrx{17ea`CbK)T4*xueo>30d6-!@yeEd)?XK`Dino&6l2Wo=;){!hGFG$xv%T%>mLF9 q0N}O)G*1#3gVqED#-Ls5|MeHs1Gs6K3UA^70000~ff~(mje}NEPxXa3& zI9X&7G|UWwAiiSaM4~e3_AygVw^rAER2Kb+wrx*$vI)c=9O`oKt#iIQ_tdF^Tm9c9 z>Mb4~9=_)|&WA#XRsbRDZm%ecqVhE`#w>MrcmL5e!2bUJL&tF*IgZoPP}Cb_t<_rV zZ&p@Tz8)PNZ46*{cX!Nn-S4H8|0ecj2(;Fp^z`)1R?%g#tQOf-UM(3MhLXlXsxlKU&OCJC5n6|cdV(~cd-@VJ`<|bofW290kgb>Xg z0Tk1{v9ZC^XU~Yo*P`FJ`;eq_q}nEuQBwJT!z-3au3j3k#(hP;75)V~jy-#n$##soN>m*Vl=n;!$a1 zDh;gseP{^47*let86F-c=DH}Q$mR2Btx-y0toeIvu8xf#u|y)l$M^4Jv~J4Y?d+`h zXbK<*0t$t~6^N0MkxF$pVu?h8!NI}G{e?oICP2;C(D(ho^Smo_$z+m=i3ygLmTs)* zvRv0?XlRI3Dn%HETwGk>`+m?cKqiy2#WOI$byTWrbmg)|#WEBQlxH zQo{gydwY+RQiDMdbhNj()6(+K{>rr0fpD!)qg^N0XiJR5d!Tlb^rhX07*qoM6N<$f@*u& A+S69j5N=49U8jZi`=hB z8_j04)ZKCSKKvV;oSYycRI61) zC!GELJ=WG%h-O4HK7Ibk>FFP0G~Auk%n708Km^=H!4VOPVvl$0D;<`>%s4+kXK*mb z%r!Ohb_=Znn22amd}DRx4RDj}?$l=I86K`)IlxjgBZP3%u|QFLXL_nhhJN2toJ5D`)kQx&o- zV|RB~n<23MWy@5RrKMNY>y7JK-1^GykcxjxshrPO}+FlBCOV z=fO;nqodz0l9D6}II4+-(CoJhU5K$^sYt7z>wSnZqS|9xJzxfDSzcJBGVouD|Dr4} Z_zTZv^dVFj;4c6G002ovPDHLkV1l#^`FH>T literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/move.png b/o2web/source/x_component_process_FormDesigner/Module/StatementSelector/default/icon/move.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb1887d01afffceac856906a84243c331ee6ad1 GIT binary patch literal 564 zcmV-40?Yl0P)!O*UXZN^24)5G^4Ybfee{Sr^;dFXo zap_$cLt%r{r;f*>(bx(TuS#E}XXjq)W}F#j(5Tz}p4&(ea{>W+0lfGx1KYMn48s61 zgNR1M44OtrcE;iWW|$3=nZeA0h9G#@N0`0+&+(&je6~)ujKN%-t4%P;=x?;txado zWXFhbQ!CY`w1QS@wfO3Nhq!@-$Tnn91>{e>iO%9gPxhEp+BcO_P|A0t6n9P6tx*lx zD$E>XHo$EBHchi*^6`^RH5$zfJ}oWF&OM24A>5-vco4#yc=mjHx)~dKiH=jf7X$q^8(fZDIp?*dkQ%v8md+i7ycUj39)98y6DLT_NDYMMW2d zqNorAUD?#whc6T>q;1k^GPO;kojfKs$t2D|}rRQewihOo55;karr7@CU3BL1`_6)-dN8V?`b zhbU%HT_+4-X^Ns+s*A*8MnrJ>6`nnr#7ZQLdOd_?0^J-D=E(9w!!l}gsmU2+ibXV z^A@nVfxNjN(I|&iehoccU1)CJ1+`kOjIop8-P>8r&(C3cCWu2?7S7R8G)-Ito#w%< zkKqfYgYVv5^q7q3A2^Cjm#--a=yHNsEQ-0=DJ0@N(rE#uqyVh^L@A`kHWxugOoCqv zV|no_K7V?zFck@g&Wyn696<2R6q0MJ$QmsWTw{>9B{ZJ90)2Q9!$W6re%J-G*{U!V zJ0NP=+lrA9m-4Gz3xRKARP*YmU6k=&aW)Hp`j5rn-hootT1-$tEm%)u#EhO z>U6r(CX-3eFpLtbY*Xic3?4fLl}c4{E{Y=je*Xub&v%28N1<7k?Y3Af7qnV!2Wj}5 p