cloud-web-corejs 1.0.31 → 1.0.32

package/src/views/bd/setting/form_script/mixins/form_list.js

@@ -7,6 +7,7 @@ import editView from "@base/views/bd/setting/form_script/edit1.vue";
 import scriptDialog from "@base/views/bd/setting/form_script/dialog.vue";
 import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 import {getBdFlag} from "@base/api/user";
+import {getJsxStatus, getJsxBtn} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -64,11 +65,15 @@ modules = {
       },
       showProjectTagDialog3: false,
       checkTags: [],
-      isDev: true
+      isDev: true,
+      menuKindAuth: {
+        editAuth: 0
+      }
     };
   },
   mounted() {
     this.getBdEnv();
+    this.getMenuKindAuth();
     this.initTableList();
   },
   methods: {
@@ -117,28 +122,28 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '脚本名称',
+            title: this.$t1('脚本名称'),
             field: 'scriptName',
             width: 180,
             fixed: 'left'
           },
           {
-            title: '脚本编码',
+            title: this.$t1('脚本编码'),
             field: 'scriptCode',
             width: 180
           },
           {
-            title: '脚本说明',
+            title: this.$t1('脚本说明'),
             field: 'scriptRemark',
             width: 250
           },
           {
-            title: '表单模板编码',
+            title: this.$t1('表单模板编码'),
             field: 'formCode',
             width: 250
           },
           {
-            title: '项目标签', field: 'tag', width: 250, slots: {default: "tag"}, params: {
+            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.formScriptTagDTOs) {
                   return row.formScriptTagDTOs.map(item => item.tagName).join(",")
@@ -148,21 +153,21 @@ modules = {
           },
           {
             field: 'transactions',
-            title: '开启事务',
+            title: this.$t1('开启事务'),
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.transactions == 1) {
-                  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('否'))
                 }
               }
             }
           },
           {
             field: 'sid',
-            title: '唯一标识',
+            title: this.$t1('唯一标识'),
             width: 280
           },
           {
@@ -177,32 +182,23 @@ modules = {
             sortable: false,
             slots: {
               default: ({row}) => {
-                return [
-                  <div>
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        this.openEditDialog(row);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
-                      </el-tooltip>
-                    </a>
-                  </div>
-                ];
+                return getJsxBtn({
+                  iconName: "el-icon-edit",
+                  content: this.$t1('查看'),
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  }
+                });
               }
             }
           }
         ],
         searchColumns: [
-          {title: "脚本名称", field: "scriptName", type: "input", common: true},
-          {title: "脚本编码", field: "scriptCode", type: "input", common: true},
-          {title: "脚本说明", field: "scriptRemark", type: "input", common: true},
-          {title: "脚本", field: "script", type: "input", common: true},
-          {title: "项目标签", field: "tag", type: "input", common: true, slot: "tag"},
+          {title: this.$t1('脚本名称'), field: "scriptName", type: "input", common: true},
+          {title: this.$t1('脚本编码'), field: "scriptCode", type: "input", common: true},
+          {title: this.$t1('脚本说明'), field: "scriptRemark", type: "input", common: true},
+          {title: this.$t1('脚本'), field: "script", type: "input", common: true},
+          {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
@@ -225,7 +221,7 @@ modules = {
           }
         })
         this.$http({
-          aes:true,
+          aes: true,
           url: USER_PREFIX + '/formScript/saves',
           method: `post`,
           data: data,
@@ -242,16 +238,20 @@ modules = {
           }
         });
       }
-    },
+    }
+    ,
     openProjectTagDialog3() {
       this.showProjectTagDialog3 = true;
-    },
+    }
+    ,
     confirmProjectTagDialog3(rows) {
       this.checkTags = rows;
-    },
+    }
+    ,
     getTabNames() {
       return this.checkTags.map(item => item.tagName).join(",");
-    },
+    }
+    ,
     getBdEnv() {
       getBdFlag({
         success: res => {
@@ -259,6 +259,22 @@ modules = {
         }
       });
     }
+    ,
+    getMenuKindAuth() {
+      let menuKindCode = this.formTemplate.menuKindCode;
+      if (menuKindCode) {
+        this.$http({
+          aes: true,
+          url: USER_PREFIX + '/menu_kind_auth/getAuth',
+          method: `post`,
+          data: {stringOne: menuKindCode},
+          isLoading: true,
+          success: res => {
+            this.menuKindAuth = res.objx || {}
+          }
+        });
+      }
+    }
   }
 };
 export default modules

package/src/views/bd/setting/form_script/mixins/list.js

@@ -1,6 +1,7 @@
 import tableForm from "@base/components/table/tableForm.vue";
 import editView from "@base/views/bd/setting/form_script/edit.vue";
 import {getBdFlag} from "@base/api/user";
+import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -72,38 +73,38 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '脚本名称',
+            title: this.$t1('脚本名称'),
             field: 'scriptName',
             width: 180,
             fixed: 'left'
           },
           {
-            title: '脚本编码',
+            title: this.$t1('脚本编码'),
             field: 'scriptCode',
             width: 180
           },
           {
-            title: '脚本说明',
+            title: this.$t1('脚本说明'),
             field: 'scriptRemark',
             width: 250
           },
           {
             field: 'transactions',
-            title: '开启事务',
+            title: this.$t1('开启事务'),
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.transactions == 1) {
-                  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('否'))
                 }
               }
             }
           },
           {
             field: 'sid',
-            title: '唯一标识',
+            title: this.$t1('唯一标识'),
             width: 280
           },
           {
@@ -118,31 +119,22 @@ modules = {
             sortable: false,
             slots: {
               default: ({row}) => {
-                return [
-                  <div>
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        this.openEditDialog(row);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
-                      </el-tooltip>
-                    </a>
-                  </div>
-                ];
+                return getJsxBtn({
+                  iconName: "el-icon-edit",
+                  content: this.$t1('查看'),
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  }
+                });
               }
             }
           }
         ],
         searchColumns: [
-          {title: "脚本名称", field: "scriptName", type: "input", common: true},
-          {title: "脚本编码", field: "scriptCode", type: "input", common: true},
-          {title: "脚本说明", field: "scriptRemark", type: "input", common: true},
-          {title: "脚本", field: "script", type: "input", common: true},
+          {title: this.$t1('脚本名称'), field: "scriptName", type: "input", common: true},
+          {title: this.$t1('脚本编码'), field: "scriptCode", type: "input", common: true},
+          {title: this.$t1('脚本说明'), field: "scriptRemark", type: "input", common: true},
+          {title: this.$t1('脚本'), field: "script", type: "input", common: true},
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {

package/src/views/bd/setting/form_script/mixins/list1.js

@@ -7,6 +7,7 @@ import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import editView from "@base/views/bd/setting/form_script/edit1.vue";
 import {treeScollx} from "@base/utils/global";
 import {getBdFlag} from "@base/api/user";
+import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -133,24 +134,24 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '脚本名称',
+            title: this.$t1('脚本名称'),
             field: 'scriptName',
             width: 180,
             fixed: 'left'
           },
           {
-            title: '脚本编码',
+            title: this.$t1('脚本编码'),
             field: 'scriptCode',
             width: 180
           },
-          {title: '表单分类', field: 'menuKindName', width: 150},
+          {title: this.$t1('表单分类'), field: 'menuKindName', width: 150},
           {
-            title: '表单模板编码',
+            title: this.$t1('表单模板编码'),
             field: 'formCode',
             width: 150
           },
           {
-            title: 'Url路径',
+            title: this.$t1('Url路径'),
             field: 'url',
             width: 200,
             slots: {
@@ -160,31 +161,31 @@ modules = {
             }
           },
           {
-            title: '脚本说明',
+            title: this.$t1('脚本说明'),
             field: 'scriptRemark',
             width: 250
           },
           {
-            title: '自定义URL',
+            title: this.$t1('自定义URL'),
             field: 'uri',
             width: 250
           },
           {
             field: 'transactions',
-            title: '开启事务',
+            title: this.$t1('开启事务'),
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.transactions == 1) {
-                  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: '项目标签', field: 'tag', width: 250, slots: {default: "tag"}, params: {
+            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.formScriptTagDTOs) {
                   return row.formScriptTagDTOs.map(item => item.tagName).join(",")
@@ -194,7 +195,7 @@ modules = {
           },
           {
             field: 'sid',
-            title: '唯一标识',
+            title: this.$t1('唯一标识'),
             width: 280
           },
           {
@@ -209,29 +210,20 @@ modules = {
             sortable: false,
             slots: {
               default: ({row}) => {
-                return [
-                  <div>
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        this.openEditDialog(row);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
-                      </el-tooltip>
-                    </a>
-                  </div>
-                ];
+                return getJsxBtn({
+                  iconName: "el-icon-edit",
+                  content: this.$t1('查看'),
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  }
+                });
               }
             }
           }
         ],
         searchColumns: [
           {
-            title: "表单分类",
+            title: this.$t1('表单分类'),
             field: "menuKindName",
             type: "input",
             common: true,
@@ -239,12 +231,12 @@ modules = {
             defaultValueEnabled: false,
             slot: "menuKindName"
           },
-          {title: "脚本名称", field: "scriptName", type: "input", common: true},
-          {title: "脚本编码", field: "scriptCode", type: "input", common: true},
-          {title: "脚本说明", field: "scriptRemark", type: "input", common: true},
-          {title: "脚本", field: "script", type: "input", common: true},
-          {title: "表单模板编码", field: "formCode", type: "input", common: true},
-          {title: "项目标签", field: "tag", type: "input", common: true, slot: "tag"},
+          {title: this.$t1('脚本名称'), field: "scriptName", type: "input", common: true},
+          {title: this.$t1('脚本编码'), field: "scriptCode", type: "input", common: true},
+          {title: this.$t1('脚本说明'), field: "scriptRemark", type: "input", common: true},
+          {title: this.$t1('脚本'), field: "script", type: "input", common: true},
+          {title: this.$t1('表单模板编码'), field: "formCode", type: "input", common: true},
+          {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ],
         config: {
           proxyConfig: {
@@ -268,7 +260,7 @@ modules = {
       let param = {enabled: true};
       let url = !id ? USER_PREFIX + '/menuKind/getAllList' : USER_PREFIX + '/menuKind/getChildren';
       this.$http({
-          aes:true,
+        aes: true,
         url: url,
         method: 'post',
         data: {

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="表单模板列表"
+    :title="$t1('表单模板列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -36,27 +36,27 @@
           </div>
           <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
                     @reset="resetEvent">
-            <vxe-form-item title="模板名称:" field="formName">
+            <vxe-form-item :title="$t1('模板名称') + ':'" field="formName">
               <template v-slot>
                 <el-input v-model="formData.formName" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="模板编码:" field="formCode">
+            <vxe-form-item :title="$t1('模板编码') + ':'" field="formCode">
               <template v-slot>
                 <el-input v-model="formData.formCode" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="模板版本:" field="formVersion">
+            <vxe-form-item :title="$t1('模板版本') + ':'" field="formVersion">
               <template v-slot>
                 <base-input-number v-model="formData.formVersion"/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="数据表名:" field="ftableName">
+            <vxe-form-item :title="$t1('数据表名') + ':'" field="ftableName">
               <template v-slot>
                 <el-input v-model="formData.ftableName" size="small" clearable/>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="数据表别名:" field="ftableAlias">
+            <vxe-form-item :title="$t1('数据表别名') + ':'" field="ftableAlias">
               <template v-slot>
                 <el-input v-model="formData.ftableAlias" size="small" clearable/>
               </template>

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

@@ -8,7 +8,7 @@
         </div>
         <div class="fr">
           <el-button type="success" class="button-sty" @click="openDesignDialog"
-                     icon="iconfont icon-liuchengguanli-shejiqi_liucheng" v-if="!!dataId">表单设计
+                     icon="iconfont icon-liuchengguanli-shejiqi_liucheng" v-if="!!dataId">{{ $t1('表单设计') }}
           </el-button>
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
             {{ $t1('重置') }}
@@ -27,7 +27,7 @@
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  模板名称
+                  {{ $t1('模板名称') }}
                 </th>
                 <td colspan="3">
                   <el-form-item prop="formName" :rules="[{ required: true, trigger: 'blur' }]">
@@ -36,7 +36,7 @@
                 </td>
               </tr>
               <tr>
-                <th>模板编码</th>
+                <th>{{ $t1('模板编码') }}</th>
                 <td colspan="3">
                   <el-form-item prop="formCode" :rules="[{ required: true, trigger: 'blur' }]" v-if="!formTemplate.id">
                     <el-input type="text" autocomplete="off" v-model="formTemplate.formCode" clearable/>
@@ -47,23 +47,12 @@
                 </td>
               </tr>
               <tr>
-                <!--              <th>-->
-                <!--                <em class="f-red">*</em>-->
-                <!--                服务名-->
-                <!--              </th>-->
-                <!--              <td>-->
-                <!--                <el-form-item prop="serviceId" :rules="[{ required: true, trigger: 'blur' }]">-->
-                <!--                  <el-select v-model="formTemplate.serviceId">-->
-                <!--                    <el-option v-for="serviceId in serviceIds" :value="serviceId">{{ serviceId }}</el-option>-->
-                <!--                  </el-select>-->
-                <!--                </el-form-item>-->
-                <!--              </td>-->
-                <th>是否启用</th>
+                <th>{{ $t1('是否启用') }}</th>
                 <td>
                   <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
                     <el-radio-group v-model="formTemplate.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>
@@ -71,7 +60,7 @@
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  表单分类
+                  {{ $t1('表单分类') }}
                 </th>
                 <td colspan="5">
                   <el-form-item prop="menuKindName" :rules="[{ required:true, trigger: ['blur', 'change'] }]">
@@ -102,15 +91,15 @@
               <tr>
                 <th>
                   <em class="f-red">*</em>
-                  模板版本
+                  {{ $t1('模板版本') }}
                 </th>
                 <td>{{ formTemplate.formVersion }}</td>
-                <th>是否历史版本</th>
-                <td>{{ formTemplate.history ? '是' : '否' }}</td>
+                <th>{{ $t1('是否历史版本') }}</th>
+                <td>{{ formTemplate.history ? $t1('是') : $t1('否') }}</td>
               </tr>
               <tr>
                 <th>
-                  项目标签
+                  {{ $t1('项目标签') }}
                 </th>
                 <td colspan="7">
                   <projectTagView v-model="formTemplate.formTemplateTagDTOs" :readonly="true"></projectTagView>
@@ -127,27 +116,31 @@
                 <td>{{ formTemplate.modifyDate }}</td>
               </tr>
               <tr>
-                <th><span class="tips">URL说明</span></th>
+                <th><span class="tips">{{ $t1('URL说明') }}</span></th>
                 <td colspan="7">
                 <span class="fl tips">
-                  <div> 一、表单模板嵌入第三方系统URL配置</div>
+                  <div> {{ $t1('一、表单模板嵌入第三方系统URL配置') }}</div>
                   <div style="padding-left: 20px">
-                    <p> 1、列表URL:   /#/form_outLinkView?url=/user/form/view/list&formCode=xx&tp=&i18nLang=&access_token=xx</p>
-                    <p> 2、详情URL:   /#/form_outLinkView?url=/user/form/view/edit&formCode=xx&dataId=1&tp=&i18nLang=&access_token=xx</p>
+                    <p> {{
+                        $t1('1、列表URL:   /#/form_outLinkView?url=/user/form/view/list&formCode=xx&tp=&i18nLang=&access_token=xx')
+                      }}</p>
+                    <p> {{
+                        $t1('2、详情URL:   /#/form_outLinkView?url=/user/form/view/edit&formCode=xx&dataId=1&tp=&i18nLang=&access_token=xx')
+                      }}</p>
                   </div>
-                  <div> 二、表单模板嵌入本地系统菜单URL配置</div>
+                  <div> {{ $t1('二、表单模板嵌入本地系统菜单URL配置') }}</div>
                   <div style="padding-left: 20px">
-                    <p> 1、菜单URL:   /user/form/view/list/xxx；xx为表单模板编码；菜单类型：动态表单</p>
+                    <p> {{ $t1('1、菜单URL:   /user/form/view/list/xxx；xx为表单模板编码；菜单类型：动态表单') }}</p>
                   </div>
-                  <div> 三、参数说明：</div>
+                  <div> {{ $t1('三、参数说明') }}</div>
                   <div style="padding-left: 20px">
-                    <p>1、url:详情页面固定为/user/form/view/edit，列表页面固定为/user/form/view/list；</p>
-                    <p>2、formCode:表单编码；</p>
-                    <p>3、dataId：单据ID,详情页面才需要传；</p>
-                    <p>4、i18nLang：国际化编码，不传默认中文；</p>
-                    <p>5、tp:第三方登录秘钥；</p>
-                    <p>6、access_token：用户信息token；</p>
-                    <p>7、tp与access_token只需要传其中一个即可；</p>
+                    <p>{{ $t1('1、url:详情页面固定为/user/form/view/edit，列表页面固定为/user/form/view/list；') }}</p>
+                    <p>{{ $t1('2、formCode:表单编码；') }}</p>
+                    <p>{{ $t1('3、dataId：单据ID,详情页面才需要传；') }}</p>
+                    <p>{{ $t1('4、i18nLang：国际化编码，不传默认中文；') }}</p>
+                    <p>{{ $t1('5、tp:第三方登录秘钥；') }}</p>
+                    <p>{{ $t1('6、access_token：用户信息token；') }}</p>
+                    <p>{{ $t1('7、tp与access_token只需要传其中一个即可；') }}</p>
                   </div>
                 </span>
                 </td>
@@ -156,7 +149,7 @@
             </table>
           </template>
         </baseTabPane>
-        <baseTabPane label="操作日志">
+        <baseTabPane :label="$t1('操作日志')">
           <template #default>
             <formOplogTable :parent-target="_self" ref="oplogTable"></formOplogTable>
           </template>

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="dataId?'编辑表单流程单据':'新增表单流程单据'"
+    :title="dataId?$t1('编辑表单流程单据'):$t1('新增表单流程单据')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="false"
@@ -16,10 +16,10 @@
     <div class="cont">
       <el-form ref="editForm" :model="wfObjConfig" label-width="110px" class="adSearchForm"
                style="width: 362px;height: auto;">
-        <el-form-item label="表单类型编码">
+        <el-form-item :label="$t1('表单类型编码')">
           <span>{{ wfObjConfig.objTypeCode }}</span>
         </el-form-item>
-        <el-form-item label="表单类型名称" :rules="[{ required: true, trigger: 'blur' }]">
+        <el-form-item :label="$t1('表单类型名称')" :rules="[{ required: true, trigger: 'blur' }]">
           <el-input v-model="wfObjConfig.objTypeName" clearable class="all-width"/>
         </el-form-item>
       </el-form>