Merge branch 'master' of https://prodog.leanwo.com:3000/prodog-client-2023/client-base-v4

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.83",
+  "version": "3.0.85",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/widget/image-upload.vue

@@ -79,7 +79,7 @@ export default {
           type: 'post',
           contentType: false,
           processData: false,
-          dataType: 'text',
+          // dataType: 'text',
           data: formData,
           beforeSend: function(request) {
             Common.addTokenToRequest(request);

src/window/tabView/TabButton.vue

@@ -655,7 +655,13 @@ export default {
       let modelData = JSON.stringify(this.modelData);
       console.log(modelData);
       localStorage.setItem(_self.uuid + '#GenerateDocumentTool', modelData);
-      window.open(frameUrl);
+
+      var iWidth = 800;//弹出窗口的宽度;
+      var iHeight = 400; //弹出窗口的高度;
+      var iTop = (window.screen.availHeight-30-iHeight)/2;//获得窗口的垂直位置;
+      var iLeft = (window.screen.availWidth-10-iWidth)/2; //获得窗口的水平位置;
+      window.open(frameUrl,'_blank','height='+iHeight+',innerHeight='+iHeight+',width='+iWidth+',innerWidth='+iWidth+',top='+iTop+',left='+iLeft+',toolbar=no,menubar=no,scrollbars=auto,resizeable=no,location=no,status=no');
+      // window.open(frameUrl);
     },
 
     modelDataChanged: function (newModelData) {

src/workflow/WorkflowEdit.vue

@@ -366,6 +366,16 @@ export default {
   },
 
   computed: {},
+  watch:{
+    'selectedWorkflow.window': {
+      handler(newValue,oldVal) {
+        if(newValue != oldVal && newValue){
+          this.selectedWorkflow.name = newValue.value;
+        }
+      },
+      deep: true,
+    },
+  },
 
   mounted: function () {
     this.queryBpmn();
@@ -375,7 +385,6 @@ export default {
     this.loadClients();
     this.loadProcessReports();
   },
-
   methods: {
     rowSelection: function () {
       const onChange = (selectedRowKeys, selectedRows) => {