流程配置映射增加列名显示

增加系统配置SSO密钥提示

o2web/source/o2_core/o2/xDesktop/Authentication.js

@@ -461,7 +461,7 @@ MWF.xDesktop.Authentication.LoginForm = new Class({
             var _self = this;
             var res = new Request.JSON({
                 "method": "POST",
-                "url": url + "/jaxrs/sso",
+                "url": o2.filterUrl(url + "/jaxrs/sso"),
                 "data": JSON.stringify(json),
                 secure: false,
                 emulation: false,

o2web/source/x_component_process_ProcessDesigner/$Process/process.html

@@ -335,10 +335,10 @@
                 </td>
             </tr>
         </table>
-        <div class="MWFScriptText" name="targetAssignDataScriptText" data-o2-api="../api/server.module_assignData.html#server.module_body"></div>
+        <div class="MWFScriptText" name="targetAssignDataScriptText" data-o2-api="../api/server.module_assignData.html#server.module_data"></div>
         <div style="margin: 5px;">{{$.lp.getOldData}}: var data = Object.clone(this.data); </div>
         <div style="margin: 5px;">{{$.lp.setNewPublishData}}: return data;</div>
-        <div style="padding: 5px"><a href="../api/server.module_body.html#server.module_body" target="_blank">{{$.lp.apiDoc}}</a></div>
+        <div style="padding: 5px"><a href="../api/server.module_body.html#server.module_data" target="_blank">{{$.lp.apiDoc}}</a></div>
 
     </div>
 

o2web/source/x_component_process_ProcessDesigner/Activity.js

@@ -157,7 +157,7 @@ MWF.xApplication.process.ProcessDesigner.Activity = new Class({
 
             this.set.click(function(e){
                 if (this.process.isCreateRoute){
-                    this.checkCreateRoute();
+                    // this.checkCreateRoute();
                 }else{
                     if (this.process.selectedActivitys.length){
                         if (!this.noselected){
@@ -248,6 +248,7 @@ MWF.xApplication.process.ProcessDesigner.Activity = new Class({
             if (!route.fromActivity){
                 this.process.routeCreateFromActivity(this);
             }else{
+                debugger;
                 this.process.routeCreateToActivity(this);
             }
         }

o2web/source/x_component_process_ProcessDesigner/lp/en.js

@@ -116,9 +116,10 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 	"projectionTitle": "Mapping business data",
 	"projectionActionNode_add": "Add mapping entry",
 	"projectionActionNode_modify": "Modify the mapping entry",
-	"projectionDataName": "Name",
+	"projectionDataName": "DataName",
 	"projectionPath": "Path",
 	"projectionType":"Type",
+    "projectionName":"Name",
 	"projectionInputError": "Please enter the data name and data path",
 	"projectionTypeCountError": "{type} type data mapping entries, up to {count} allowed.",
 	"projectionSameNameError": "Same data name already exists",

o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js

@@ -119,6 +119,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 	"projectionDataName": "数据名称",
 	"projectionPath": "数据路径",
 	"projectionType":"数据类型",
+    "projectionName":"列名",
 	"projectionInputError": "请输入数据名称和数据路径",
 	"projectionTypeCountError": "{type}类型的数据映射条目，最多允许{count}条。",
 	"projectionSameNameError": "相同的数据名称已存在",

o2web/source/x_component_process_ProcessDesigner/widget/ProjectionEditor.js

@@ -12,7 +12,7 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
             "boolean": 2,
             "date":2,
             "time": 2,
-            "datetime": 5
+            "dateTime": 5
         }
 	},
 	initialize: function(node, text, options){
@@ -47,6 +47,7 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
             "<th>"+MWF.xApplication.process.ProcessDesigner.LP.projectionDataName+"</th>" +
             "<th>"+MWF.xApplication.process.ProcessDesigner.LP.projectionPath+"</th>" +
             "<th>"+MWF.xApplication.process.ProcessDesigner.LP.projectionType+"</th>" +
+            "<th>"+MWF.xApplication.process.ProcessDesigner.LP.projectionName+"</th>" +
             "<th></th>" +
             "</tr></table>";
         this.tableArea.set("html", html);
@@ -127,6 +128,24 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
         }
         return true;
     },
+    checkItemColumn: function(){
+        var columnNames = {
+            "string": 0,
+            "long": 0,
+            "double": 0,
+            "boolean": 0,
+            "date":0,
+            "time": 0,
+            "dateTime": 0
+        };
+        var rows = this.table.rows;
+        for (var i=0; i<this.data.length; i++){
+            columnNames[this.data[i].type]++;
+            var n = columnNames[this.data[i].type] || 1;
+            var c = this.data[i].type+"Value"+(n>=10 ? n : "0"+n);
+            rows[i+1].cells[3].set("text", c);
+        }
+    },
     modifyProjectionItem: function(){
         var name = this.nameInput.get("value");
         var path = this.pathInput.get("value");
@@ -138,6 +157,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
             this.currentItem.data.type = type;
             this.currentItem.refresh();
             this.currentItem.unSelected();
+
+            this.checkItemColumn();
+
             this.fireEvent("change");
             this.fireEvent("modifyItem");
         }
@@ -151,6 +173,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
             var o = { "name": name, "path": path, "type": type };
             this.data.push(o);
             new MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item(o, this);
+
+            this.checkItemColumn();
+
             this.fireEvent("change");
             this.fireEvent("addItem");
         }
@@ -159,6 +184,7 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
         this.data.each(function(d){
             new MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item(d, this);
         }.bind(this));
+        this.checkItemColumn();
     }
 
 });
@@ -176,6 +202,8 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item = new Clas
         td = this.tr.insertCell().setStyles(this.css.projectionTableTd).set("text", this.data.path);
         td = this.tr.insertCell().setStyles(this.css.projectionTableTd).set("text", this.data.type);
 
+        td = this.tr.insertCell().setStyles(this.css.projectionTableTd).set("text", this.data.type);
+
         td = this.tr.insertCell().setStyles(this.css.projectionTableTd);
         this.delAction = new Element("div", {"styles": this.css.projectionItemAction}).inject(td);
 
@@ -197,8 +225,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item = new Clas
 
         this.tr.addEvents({
             "click": function(){
-                if (this.editor.currentItem) this.editor.currentItem.unSelected();
-                this.selected();
+                var item = this.editor.currentItem;
+                if (item) item.unSelected();
+                if (item!==this) this.selected();
             }.bind(this)
         })
     },
@@ -228,8 +257,12 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item = new Clas
         tds[2].set("text", this.data.type);
     },
     destroy: function(){
+        this.unSelected();
         this.tr.destroy();
         this.editor.data.erase(this.data);
+
+        this.editor.checkItemColumn();
+
         this.editor.fireEvent("change");
         this.editor.fireEvent("deleteItem");
         o2.release(this);

o2web/source/x_component_systemconfig/o2.config.js

 module.exports = {
     "server": {
-        "host": "qywx.o2oa.net",
-        "port": "20030",
+        "host": "develop.o2oa.net",
+        "port": "80",
         "httpPort": "80",
         "https": false
     }

o2web/source/x_component_systemconfig/public/lp/en.js

@@ -420,6 +420,7 @@ o2.xApplication.systemconfig.LP = {
         "isEnable": "是否启用",
         "ssoConfigName": "鉴权名称",
         "ssoConfigKey": "密钥",
+        "ssoConfigKeyInfo": "密钥长度8位",
         "removeSSOConfigTitle": "删除鉴权配置确认",
         "removeSSOConfig": "您确定要删除鉴权配置：“{name}” 吗？",
 

o2web/source/x_component_systemconfig/public/lp/zh-cn.js

@@ -427,6 +427,7 @@ o2.xApplication.systemconfig.LP = {
         "isEnable": "是否启用",
         "ssoConfigName": "鉴权名称",
         "ssoConfigKey": "密钥",
+        "ssoConfigKeyInfo": "密钥长度8位",
         "removeSSOConfigTitle": "删除鉴权配置确认",
         "removeSSOConfig": "您确定要删除鉴权配置：“{name}” 吗？",
 

o2web/source/x_component_systemconfig/src/components/content/SecuritySSOConfig/SSOConfig.vue

@@ -55,6 +55,7 @@
       <BaseSwitch :label="lp._ssoConfig.isEnable" v-model:value="currentSSOData.enable"/>
       <BaseInput :label="lp._ssoConfig.ssoConfigName" v-model:value="currentSSOData.client"/>
       <BaseInput :label="lp._ssoConfig.ssoConfigKey" v-model:value="currentSSOData.key"/>
+      <div style="color: #999999; margin-left: 120px">{{lp._ssoConfig.ssoConfigKeyInfo}}</div>
     </div>
   </div>
 </template>