cloud-web-corejs 1.0.31 → 1.0.32

package/src/views/bd/setting/form_template/ftHistoryDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="实体历史列表"
+      :title="$t1('实体历史列表')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="falseValue"
@@ -28,15 +28,16 @@
             <div class="clearfix screen-btns">
               <div class="fr">
                 <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                            plain>{{$t1('重置')}}
+                            plain>{{ $t1('重置') }}
                 </vxe-button>
-                <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{ $t1('搜索') }}
+                <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                  {{ $t1('搜索') }}
                 </vxe-button>
               </div>
             </div>
             <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
                       @reset="resetEvent">
-              <vxe-form-item title="模板版本:" field="formVersion">
+              <vxe-form-item :title="$t1('模板版本') + ':'" field="formVersion">
                 <template v-slot>
                   <base-input-number v-model="formData.formVersion"/>
                 </template>

package/src/views/bd/setting/form_template/itemEdit.vue

@@ -7,9 +7,11 @@
           {{ dataId ? $t1('查看流程模版') : $t1('新增流程模版') }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">{{$t1('重置')}}
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
         </div>
       </div>
       <div class="d-cont">
@@ -20,7 +22,7 @@
             <tr>
               <th>
                 <em class="f-red">*</em>
-                流程模版名称
+                {{ $t1('流程模版名称') }}
               </th>
               <td>
                 <el-form-item prop="modelName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -29,7 +31,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                流程模版KEY
+                {{ $t1('流程模版KEY') }}
               </th>
               <td>
                 <el-form-item prop="modelKey" :rules="[{ required: true, trigger: 'blur' }]" v-if="!dataId">
@@ -39,7 +41,7 @@
               </td>
               <th>
                 <em class="f-red">*</em>
-                表单类型编码
+                {{ $t1('表单类型编码') }}
               </th>
               <td>
                 {{ wfObjConfigItem.objTypeCode }}
@@ -47,69 +49,69 @@
             </tr>
             <tr>
               <th>
-                跳过相邻任务
+                {{ $t1('跳过相邻任务') }}
               </th>
               <td>
                 <el-form-item prop="skipAdjacentTask" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-radio-group v-model="wfObjConfigItem.skipAdjacentTask">
-                    <el-radio :label="true">是</el-radio>
-                    <el-radio :label="false">否</el-radio>
+                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
               <th>
-                驳回后提交模式
+                {{ $t1('驳回后提交模式') }}
               </th>
               <td colspan="3">
                 <el-form-item prop="toRejectNode" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-radio-group v-model="wfObjConfigItem.toRejectNode">
-                    <el-radio :label="true">由提交人确定提交节点</el-radio>
-                    <el-radio :label="false">由驳回人指定提交节点</el-radio>
+                    <el-radio :label="true">{{ $t1('由提交人确定提交节点') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('由驳回人指定提交节点') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
             </tr>
             <tr>
               <th>
-                流程启动处理
+                {{ $t1('流程启动处理') }}
               </th>
               <td colspan="5">
                 <el-form-item prop="startMode" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-radio-group v-model="wfObjConfigItem.startMode">
-                    <el-radio :label="1">节点无候选人，提示异常</el-radio>
-                    <el-radio :label="2">节点无候选人，提示警告</el-radio>
-                    <el-radio :label="3">节点无候选人，无提示</el-radio>
+                    <el-radio :label="1">{{ $t1('节点无候选人，提示异常') }}</el-radio>
+                    <el-radio :label="2">{{ $t1('节点无候选人，提示警告') }}</el-radio>
+                    <el-radio :label="3">{{ $t1('节点无候选人，无提示') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
             </tr>
             <tr>
               <th>
-                跨任务跳过
+                {{ $t1('跨任务跳过') }}
               </th>
               <td>
                 <el-form-item prop="skipSameUserTask" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-radio-group v-model="wfObjConfigItem.skipSameUserTask">
-                    <el-radio :label="true">是</el-radio>
-                    <el-radio :label="false">否</el-radio>
+                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
               <th>
-                是否启用
+                {{ $t1('是否启用') }}
               </th>
               <td>
                 <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
                   <el-radio-group v-model="wfObjConfigItem.enabled">
-                    <el-radio :label="true">是</el-radio>
-                    <el-radio :label="false">否</el-radio>
+                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>
             </tr>
             <tr>
               <th>
-                任务action脚本<br/>
+                {{ $t1('任务action脚本') }}<br/>
                 <scriptDescriptionButton path="static/readme/Wf.txt"></scriptDescriptionButton>
                 <scriptTestButton :script.sync="wfObjConfigItem.script"></scriptTestButton>
               </th>
@@ -123,12 +125,12 @@
             <tr>
               <th class="no"></th>
               <td colspan="7">
-                <span class="fl tips">注：流程任务执行过程中，每一次的action动作都会执行此脚本。</span>
+                <span class="fl tips">{{ $t1('注：流程任务执行过程中，每一次的action动作都会执行此脚本。') }}</span>
               </td>
             </tr>
             <tr>
               <th>
-                模板筛选脚本<br/>
+                {{ $t1('模板筛选脚本') }}<br/>
                 <scriptDescriptionButton path="static/readme/Wf.txt"></scriptDescriptionButton>
                 <scriptTestButton :script.sync="wfObjConfigItem.script"></scriptTestButton>
               </th>
@@ -143,7 +145,9 @@
               <th class="no"></th>
               <td colspan="7">
                 <span
-                  class="fl tips">注：流程启动时，执行筛选脚本，返回true或者不配置筛选脚本表示选用当前模板，返回false表示不选用当前模板。</span>
+                  class="fl tips">{{
+                    $t1('注：流程启动时，执行筛选脚本，返回true或者不配置筛选脚本表示选用当前模板，返回false表示不选用当前模板。')
+                  }}</span>
               </td>
             </tr>
             <tr>

package/src/views/bd/setting/form_template/itemList.vue

@@ -16,7 +16,7 @@
                               :disabled="!wfObjConfig.id">{{ $t1('新增') }}
                   </vxe-button>
                   <div class="txt-name el-icon-house">
-                    表单类型名称：
+                    {{ $t1('表单类型名称') }}：
                     <span>{{ wfObjConfig.objTypeName }}</span>
                   </div>
                 </div>

package/src/views/bd/setting/form_template/list.vue

@@ -8,7 +8,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
-          <div class="tit"><b>表单分类</b></div>
+          <div class="tit"><b>{{ $t1('表单分类') }}</b></div>
           <div class="tree-btns" style="margin-top: 10px;">
           </div>
           <el-tree
@@ -45,7 +45,8 @@
                     <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog()"
                                 v-if="isDev && currentFormType.editAuth===1">{{ $t1('新增') }}
                     </vxe-button>
-                    <vxe-button status="success" class="button-sty" icon="el-icon-download" @click="jsonImport" v-if="currentFormType.editAuth===1">{{ $t1('导入发布') }}
+                    <vxe-button status="success" class="button-sty" icon="el-icon-download" @click="jsonImport"
+                                v-if="currentFormType.editAuth===1">{{ $t1('导入发布') }}
                     </vxe-button>
                     <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
                                 v-if="isDev && currentFormType.exportAuth===1">{{ $t1('导出发布') }}
@@ -55,20 +56,21 @@
                   </template>
                   <template #buttonRight>
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                plain>{{$t1('重置')}}
+                                plain>{{ $t1('重置') }}
                     </vxe-button>
-                    <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">{{ $t1('搜索') }}
+                    <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                      {{ $t1('搜索') }}
                     </vxe-button>
                   </template>
                   <template #menuKindName>
-                    <vxe-form-item title="表单分类:" field="tag">
+                    <vxe-form-item :title="$t1('表单分类') + ':'" field="tag">
                       <template v-slot>
                         <el-input v-model="currentMenuKindName" disabled></el-input>
                       </template>
                     </vxe-form-item>
                   </template>
                   <template #tag>
-                    <vxe-form-item title="项目标签:" field="tag">
+                    <vxe-form-item :title="$t1('项目标签') + ':'" field="tag">
                       <template v-slot>
                         <el-input
                           class="search-input"
@@ -91,7 +93,7 @@
                 <projectTagView v-model="row.formTemplateTagDTOs" :readonly="true"></projectTagView>
               </template>
             </vxe-grid>
-            <el-drawer title="流程模板" :visible.sync="showItemView" :modal="false" :wrapperClosable="false"
+            <el-drawer :title="$t1('流程模板')" :visible.sync="showItemView" :modal="false" :wrapperClosable="false"
                        :destroy-on-close="true" size="90%" direction="btt">
               <itemList v-if="showItemView" :formTemplate="currentRow"
                         @openWfDesignDialog="openWfDesignDialog"></itemList>
@@ -108,34 +110,34 @@
         </el-tab-pane>
       </template>
     </x-tabs>
-    <el-drawer :title="'表单设计('+formName+')'" :visible.sync="showDesingerDialog" :modal="false"
+    <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
                :destroy-on-close="true"
                size="100%" direction="rtl" :before-close="closeFormDesignwinEvent" :append-to-body="false"
                class="designer-drawer" :class="[isFullscreen ? 'is-fullscreen' : '']" @close="handleFormDesignClose">
       <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
-        <el-tab-pane label="设计器" name="first">
+        <el-tab-pane :label="$t1('设计器')" name="first">
           <designer ref="designer" :formCode.sync="formCode" @reflushTemplateList="reflushTemplateList"></designer>
         </el-tab-pane>
-        <el-tab-pane label="后端脚本" name="second">
+        <el-tab-pane :label="$t1('后端脚本')" name="second">
           <formScriptList :formCode="formCode" :formTemplate="currentFormTemplate"
                           v-if="showFormScriptList"></formScriptList>
         </el-tab-pane>
       </el-tabs>
       <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
-        <el-tooltip effect="dark" content="全屏" placement="top">
+        <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
           <i class="iconfont icon-quanping"></i>
         </el-tooltip>
 
       </el-button>
       <el-button class="isFullIcon" v-else @click="handleFullscreen">
-        <el-tooltip effect="dark" content="缩小" placement="top">
+        <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
           <i class="iconfont icon-suoxiao"></i>
         </el-tooltip>
       </el-button>
     </el-drawer>
 
     <el-dialog
-      :title="流程设计"
+      :title="$t1('流程设计')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"

package/src/views/bd/setting/form_template/mixins/dialog.js

@@ -1,4 +1,5 @@
 import {selectDialogMixins} from "@base/mixins/selectDialog";
+import {getJsxStatus} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -45,18 +46,18 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '模板名称',
+            title: this.$t1('模板名称'),
             field: 'formName',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '模板编码',
+            title: this.$t1('模板编码'),
             field: 'formCode',
             width: 150
           },
           {
-            title: '模板版本',
+            title: this.$t1('模板版本'),
             field: 'formVersion',
             width: 150
           },
@@ -67,17 +68,9 @@ modules = {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [
-                    <div class="txt-status">
-                      <span>启用</span>
-                    </div>
-                  ];
+                  return getJsxStatus(null,this.$t1('启用'))
                 } else {
-                  return [
-                    <div class="txt-status disable">
-                      <span>禁用</span>
-                    </div>
-                  ];
+                  return getJsxStatus('s-3',this.$t1('禁用'))
                 }
               }
             }
@@ -88,7 +81,7 @@ modules = {
             width: 150
           },
           {
-            title: '数据表名',
+            title: this.$t1('数据表名'),
             field: 'ftableName',
             width: 200
           },

package/src/views/bd/setting/form_template/mixins/ftHistoryDialog.js

@@ -41,23 +41,23 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '模板名称',
+            title: this.$t1('模板名称'),
             field: 'formName',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '模板编码',
+            title: this.$t1('模板编码'),
             field: 'formCode',
             width: 150
           },
           {
-            title: '模板版本',
+            title: this.$t1('模板版本'),
             field: 'formVersion',
             width: 150
           },
           {
-            title: '表单类型',
+            title: this.$t1('表单类型'),
             field: 'menuKindName',
             width: 150,
           },

package/src/views/bd/setting/form_template/mixins/itemList.js

@@ -1,5 +1,6 @@
 import editView from "@base/views/bd/setting/form_template/itemEdit.vue";
 import wfObjConfigDialog from "@base/views/bd/setting/form_template/editWfObjConfigDialog.vue";
+import {getJsxBtn, getJsxBtnList, getJsxStatus} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -38,9 +39,9 @@ modules = {
     initTableList() {
       let that = this;
       let startModeMap = {
-        1: "节点无候选人，提示异常",
-        2: "节点无候选人，提示警告",
-        3: "节点无候选人，无提示",
+        1: this.$t1('节点无候选人，提示异常'),
+        2: this.$t1('节点无候选人，提示警告'),
+        3: this.$t1('节点无候选人，无提示'),
       }
       let tableOption1 = {
         vue: that,
@@ -64,18 +65,18 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '流程模版名称',
+            title: this.$t1('流程模版名称'),
             field: 'modelName',
             width: 150,
             fixed: 'left'
           },
           {
-            title: '流程模版KEY',
+            title: this.$t1('流程模版KEY'),
             field: 'modelKey',
             width: 150
           },
           {
-            title: '单据类型编码',
+            title: this.$t1('单据类型编码'),
             field: 'objTypeCode',
             width: 150
           },
@@ -86,43 +87,43 @@ modules = {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">{ this.$t1('启用') }</div>];
+                  return getJsxStatus(null, this.$t1('启用'))
                 } else {
-                  return [<div class="txt-status s-3">{ this.$t1('禁用') }</div>];
+                  return getJsxStatus('s-3', this.$t1('禁用'))
                 }
               }
             }
           },
           {
-            title: '跳过相邻任务',
+            title: this.$t1('跳过相邻任务'),
             field: 'skipAdjacentTask',
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.skipAdjacentTask) {
-                  return [<div class="txt-status">是</div>];
+                  return getJsxStatus(null, this.$t1('是'))
                 } else {
-                  return [<div class="txt-status s-3">否</div>];
+                  return getJsxStatus('s-3', this.$t1('否'))
                 }
               }
             }
           },
           {
-            title: '驳回后提交模式',
+            title: this.$t1('驳回后提交模式'),
             field: 'toRejectNode',
             width: 180,
             slots: {
               default: ({row}) => {
                 if (row.toRejectNode) {
-                  return [<div class="txt-status">由提交人确定提交节点</div>];
+                  return getJsxStatus(null, this.$t1('由提交人确定提交节点'))
                 } else {
-                  return [<div class="txt-status s-3">由驳回人指定提交节点</div>];
+                  return getJsxStatus('s-3', this.$t1('由驳回人指定提交节点'))
                 }
               }
             }
           },
           {
-            title: '流程启动处理',
+            title: this.$t1('流程启动处理'),
             field: 'startMode',
             width: 180,
             slots: {
@@ -132,15 +133,15 @@ modules = {
             }
           },
           {
-            title: '跨任务跳过',
+            title: this.$t1('跨任务跳过'),
             field: 'skipSameUserTask',
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.skipSameUserTask) {
-                  return [<div class="txt-status">是</div>];
+                  return getJsxStatus(null, this.$t1('是'))
                 } else {
-                  return [<div class="txt-status s-3">否</div>];
+                  return getJsxStatus('s-3', this.$t1('否'))
                 }
               }
             }
@@ -157,44 +158,29 @@ modules = {
             title: '',
             slots: {
               default: ({row}) => {
-                return [
-                  <a
-                    href="javascript:void(0);"
-                    class="a-link"
-                    onclick={() => {
-                      this.openEditDialog(row.id);
-                    }}
-                  >
-                    <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
-                                popper-class="tooltip-skin">
-                      <i class="el-icon-edit"/>
-                    </el-tooltip>
-                  </a>,
-                  <a
-                    href="javascript:void(0);"
-                    onClick={() => {
+                return getJsxBtnList([
+                  {
+                    iconName: "el-icon-edit",
+                    content: this.$t1('查看'),
+                    onclick: () => {
+                      this.openEditDialog(row);
+                    }
+                  },
+                  {
+                    iconName: "iconfont icon-liuchengguanli-shejiqi_liucheng",
+                    content: this.$t1('流程设计'),
+                    onclick: () => {
                       this.wfEdit(row.modelId);
-                    }}
-                    class="a-link"
-                  >
-                    <el-tooltip enterable={false} effect="dark" content="流程设计" placement="top"
-                                popper-class="tooltip-skin">
-                      <i class="iconfont icon-liuchengguanli-shejiqi_liucheng"/>
-                    </el-tooltip>
-                  </a>,
-                  <a
-                    href="javascript:void(0);"
-                    class="a-link"
-                    onClick={() => {
+                    }
+                  },
+                  {
+                    iconName: "el-icon-delete",
+                    content: this.$t1('删除'),
+                    onclick: () => {
                       this.deleteItem(row);
-                    }}
-                  >
-                    <el-tooltip enterable={false} effect="dark" content="删除" placement="top"
-                                popper-class="tooltip-skin">
-                      <i class="el-icon-delete"/>
-                    </el-tooltip>
-                  </a>
-                ];
+                    }
+                  },
+                ]);
               }
             }
           }
@@ -205,9 +191,9 @@ modules = {
       });
     },
     deleteItem(row) {
-      this.$baseConfirm('您确定要删除吗？').then(() => {
+      this.$baseConfirm(this.$t1('您确定要删除吗？')).then(() => {
         this.$http({
-          aes:true,
+          aes: true,
           method: 'post',
           url: "/" + this.formTemplate.serviceName + '/wf_obj_config_item/delete',
           data: {id: row.id},
@@ -227,7 +213,7 @@ modules = {
     },
     initWfObjConfig() {
       this.$http({
-          aes:true,
+        aes: true,
         method: 'post',
         url: "/" + this.formTemplate.serviceName + '/wf_obj_config/getByObjTypeCode',
         data: {stringOne: this.formTemplate.objTypeCode},