cloud-web-corejs 1.0.54-dev.405 → 1.0.54-dev.407

package/src/components/xform/utils/util.js

@@ -422,6 +422,16 @@ export function traverseFieldWidgetsOfContainer(
     /*con.widgetList.forEach((cw) => {
       handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
     });*/
+    if (!!con.widgetList) {
+      con.widgetList.forEach((childItem) => {
+        loopHandleWidgetItem(childItem, con, handler);
+      });
+    }
+    if (!!e.buttons) {
+      con.buttons.forEach((childItem) => {
+        loopHandleWidgetItem(childItem, con, handler);
+      });
+    }
     for (let column of con.options.tableColumns) {
       if (column.widget) {
         handleWidgetForTraverse(column.widget, handler, staticWidgetsIncluded);

package/src/views/user/wf/wfReport/index.vue

@@ -16,24 +16,15 @@
       <el-select
         class="f-btn"
         v-model="formData.stat"
-        :placeholder="$t2('全部状态', 'components.wf.wfReport.allStatus')"
+        :placeholder="$t1('全部状态')"
         clearable
         @clear="formData.stat = null"
         @change="handleSelectChange"
         style="width: 128px !important"
       >
-        <el-option
-          :label="$t2('审核中', 'components.wf.wfStatus1')"
-          :value="1"
-        ></el-option>
-        <el-option
-          :label="$t2('已完成', 'components.wf.wfStatus2')"
-          :value="2"
-        ></el-option>
-        <el-option
-          :label="$t2('已驳回', 'components.wf.wfStatus3')"
-          :value="3"
-        ></el-option>
+        <el-option :label="$t1('审核中')" :value="1"></el-option>
+        <el-option :label="$t1('已完成')" :value="2"></el-option>
+        <el-option :label="$t1('已驳回')" :value="3"></el-option>
       </el-select>
       <el-select
         class="f-btn"
@@ -52,14 +43,14 @@
       </el-select>
       <el-input
         v-model="formData.name"
-        placeholder="流程主题"
+        :placeholder="$t1('流程主题')"
         style="width: 128px !important"
       ></el-input>
       <span class="button-sty">
         <el-date-picker
           v-model="formData.startStartTime"
           type="date"
-          placeholder="启动时间（开始）"
+          :placeholder="$t1('启动时间（开始）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
@@ -70,7 +61,7 @@
         <el-date-picker
           v-model="formData.endStartTime"
           type="date"
-          placeholder="启动时间（结束）"
+          :placeholder="$t1('启动时间（结束）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
@@ -82,7 +73,7 @@
         <el-date-picker
           v-model="formData.startEndTime"
           type="date"
-          placeholder="结束时间（开始）"
+          :placeholder="$t1('结束时间（开始）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
@@ -93,7 +84,7 @@
         <el-date-picker
           v-model="formData.endEndTime"
           type="date"
-          placeholder="结束时间（结束）"
+          :placeholder="$t1('结束时间（结束）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
@@ -331,8 +322,13 @@ export default {
         },
         columns: [
           { type: "checkbox", width: 48, resizable: false, fixed: "left" },
-          { field: "obj_type_name", title: "流程类型", width: 150, fixed: "left" },
-          { field: "name", title: "流程主题", width: 180 },
+          {
+            field: "obj_type_name",
+            title: this.$t1("流程类型"),
+            width: 150,
+            fixed: "left",
+          },
+          { field: "name", title: this.$t1("流程主题"), width: 180 },
           {
             field: "stat",
             title: "状态",
@@ -361,10 +357,10 @@ export default {
               },
             },
           },
-          { field: "task_name", title: "当前节点", width: 180 },
+          { field: "task_name", title: this.$t1("当前节点"), width: 180 },
           {
             field: "candidate_names",
-            title: "当前处理人",
+            title: this.$t1("当前处理人"),
             width: 180,
             slots: {
               default: ({ row }) => {
@@ -377,11 +373,11 @@ export default {
               },
             },
           },
-          { field: "start_time", title: "启动时间", width: 150 },
-          { field: "end_time", title: "结束时间", width: 150 },
+          { field: "start_time", title: this.$t1("启动时间"), width: 150 },
+          { field: "end_time", title: this.$t1("结束时间"), width: 150 },
           {
             field: "duration",
-            title: "总耗时",
+            title: this.$t1("总耗时"),
             width: 180,
             slots: {
               default: ({ row }) => {
@@ -396,7 +392,7 @@ export default {
           },
           {
             field: "task_duration",
-            title: "当前节点耗时",
+            title: this.$t1("当前节点耗时"),
             width: 180,
             slots: {
               default: ({ row }) => {
@@ -409,8 +405,8 @@ export default {
               },
             },
           },
-          { field: "approver_num", title: "审批总人数", width: 180 },
-          { field: "node_num", title: "审批节点数量", width: 180 },
+          { field: "approver_num", title: this.$t1("审批总人数"), width: 180 },
+          { field: "node_num", title: this.$t1("审批节点数量"), width: 180 },
           {
             width: 90,
             fixed: "right",
@@ -429,7 +425,7 @@ export default {
                     <el-tooltip
                       enterable={false}
                       effect="dark"
-                      content="查看"
+                      content={this.$t1("查看详情")}
                       placement="top"
                       popper-class="tooltip-skin"
                     >
@@ -446,7 +442,7 @@ export default {
                     <el-tooltip
                       enterable={false}
                       effect="dark"
-                      content={this.$t1("查看")}
+                      content={this.$t1("查看单据")}
                       placement="top"
                       popper-class="tooltip-skin"
                     >