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

# Conflicts:
#	src/window/tabFormView/TabFormFieldEdit.vue

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.14",
+  "version": "4.0.17",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -20,7 +20,7 @@
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.10.3",
     "moment": "^2.29.4",
-    "pc-component-v3": "1.0.72",
+    "pc-component-v3": "1.0.74",
     "uuid": "^8.3.2",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-request": "^1.2.4",

src/resource/dictionary/FieldUtil.js

@@ -225,6 +225,9 @@ export default {
       return (fieldValue1.id == fieldValue2.id)
         && (fieldValue1.displayValue[0] == fieldValue2.displayValue[0]);
     } else if (fieldValue1.fieldType == 'String') {
+      if(fieldValue1.displayValue !== fieldValue2.displayValue){
+        return false;
+      }
       if (fieldValue1.displayValue == undefined) {
         fieldValue1.displayValue = [];
       }

src/window/tabFormView/TabFormFieldEdit.vue

@@ -472,7 +472,7 @@ export default {
 
         const modelDataFieldDisplayValue = this.getModelDataFieldDisplayValue();
 
-        if (currentValue != oldValue && currentValue != modelDataFieldDisplayValue) {
+        if (currentValue !== oldValue && currentValue !== modelDataFieldDisplayValue) {
           var newFieldValue = {
             displayValue: [currentValue],
             fieldType: 'String',

src/window/tabGridView/CellItem.vue

@@ -387,7 +387,7 @@ export default {
         const modelDataFieldDisplayValue = this.getModelDataFieldDisplayValue();
         
 
-        if (currentValue != oldValue && currentValue != modelDataFieldDisplayValue) {
+        if (currentValue !== oldValue && currentValue !== modelDataFieldDisplayValue) {
           var newFieldValue = {
             displayValue: [currentValue],
             fieldType: 'String',

src/workflow/ExecutionList.vue

@@ -9,6 +9,9 @@
       <li>
         <a data-toggle="tab" @click="changeSelectTab('PROCESS_REPORT')">流程报表实例</a>
       </li>
+      <li>
+        <a data-toggle="tab" @click="changeSelectTab('PROCESS')">流程任务</a>
+      </li>
     </ul>
 
     <div id="myTabContent" class="tab-content">
@@ -70,12 +73,24 @@
             <template #headerCell="{ column }">
               <template v-if="column.key == 'httpRequestType'">
                 <span>
-                  {{ taskType == "HTTP" ? "HTTP请求类型" : "流程报表文件编码" }}
+                  {{
+                    taskType == "HTTP"
+                      ? "HTTP请求类型"
+                      : taskType == "PROCESS"
+                        ? "流程编号"
+                        : "流程报表文件编码"
+                  }}
                 </span>
               </template>
               <template v-if="column.key == 'httpRequestUrl'">
                 <span>
-                  {{ taskType == "HTTP" ? "HTTP请求路径" : "流程报表名称" }}
+                  {{
+                    taskType == "HTTP"
+                      ? "HTTP请求路径"
+                      : taskType == "PROCESS"
+                        ? "流程任务名称"
+                        : "流程报表名称"
+                  }}
                 </span>
               </template>
             </template>
@@ -86,21 +101,27 @@
                     ? ""
                     : record.taskType == "HTTP"
                       ? "HTTP请求"
-                      : "流程报表"
+                      : record.taskType == "PROCESS"
+                        ? "流程任务"
+                        : "流程报表"
                 }}
               </template>
               <template v-if="column.key == 'httpRequestType'">
                 {{
                   record.taskType == "HTTP"
                     ? record.httpRequestType
-                    : record.processReportNo
+                    : taskType == "PROCESS"
+                      ? record.processNo
+                      : record.processReportNo
                 }}
               </template>
               <template v-if="column.key == 'httpRequestUrl'">
                 {{
                   record.taskType == "HTTP"
                     ? record.httpRequestUrl
-                    : record.processReportName
+                    : taskType == "PROCESS"
+                      ? record.taskName
+                      : record.processReportName
                 }}
               </template>
               <template v-if="column.key == 'taskInstanceStatus'">
@@ -185,17 +206,7 @@ export default {
           key: 'operationResult',
           width: 180,
           fixed: 'right',
-          customCell : () => {
-            return {
-              style: {
-                width: '180px',
-                overflow: 'hidden',
-                whiteSpace: 'nowrap',
-                textOverflow:'ellipsis',
-                cursor:'pointer',
-              },
-            };
-          },
+          ellipsis: true,
         },
       ].map(item => ({ ...item, align: 'center' })),
 

src/workflow/TaskProcessManagement.vue

@@ -1331,11 +1331,11 @@ export default {
             response.errorMessage = '请选择流程编号';
             return response;
           }
-          if(_self.processDatas.length == 0){
-            response.errorCode = 9;
-            response.errorMessage = '请添加流程参数';
-            return response;
-          }
+          // if(_self.processDatas.length == 0){
+          //   response.errorCode = 9;
+          //   response.errorMessage = '请添加流程参数';
+          //   return response;
+          // }
         }
       }
       return response;