cloud-web-corejs 1.0.31 → 1.0.32

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -6,6 +6,7 @@ import itemSzTaMbDialog from "@base/views/bd/setting/table_model/dialog.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import zdDialog from "@base/views/bd/setting/table_model/zdDialog.vue";
 import {getBdFlag} from "@base/api/user";
+import {getJsxBtn} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -84,7 +85,7 @@ modules = {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$http({
-          aes:true,
+          aes: true,
           url: USER_PREFIX + `/szTaMb/get`,
           method: `post`,
           data: {
@@ -101,7 +102,7 @@ modules = {
               this.szTaMb = szTaMb;
 
               this.getCreatedTableColumns();
-              this.getMenuKindAuth(this.szTaMb.menuKindCode);
+              // this.getMenuKindAuth(this.szTaMb.menuKindCode);
             } else {
               callback(res)
             }
@@ -122,11 +123,11 @@ modules = {
     updateStatus(status) {
       let text;
       if (status === 3) {
-        text = '您确定要作废吗？';
+        text = this.$t1('您确定要作废吗？');
       }
       this.$baseConfirm(text).then(() => {
         this.$http({
-          aes:true,
+          aes: true,
           url: USER_PREFIX + `/szTaMb/updateStatus`,
           method: `post`,
           data: {
@@ -152,7 +153,7 @@ modules = {
         if (valid) {
           const szTaZdMbDTOs = this.$refs['table-szTaZdMb'].getTableData().fullData;
           if (szTaZdMbDTOs.length === 0) {
-            this.$baseAlert('明细不能为空！');
+            this.$baseAlert(this.$t1('明细不能为空！'));
             return false;
           }
           this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;
@@ -171,7 +172,7 @@ modules = {
 
       var url = USER_PREFIX + (this.isEdit ? `/szTaMb/update` : `/szTaMb/save`);
       this.$http({
-          aes:true,
+        aes: true,
         url: url,
         method: `post`,
         data: formData,
@@ -213,12 +214,13 @@ modules = {
         columns: [
           {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
           {
-            title: '实体字段名称',
+            title: this.$t1('实体字段名称'),
             field: 'zdEn',
             width: 150,
             fixed: 'left',
             slots: {
-              default: ({row, rowIndex, $table}) => {
+              default: "zdEn"
+              /*default: ({row, rowIndex, $table}) => {
                 let disabled = !!row.systems || !!row.relationZd;
                 if (!disabled) {
                   return [
@@ -233,12 +235,12 @@ modules = {
                     <div style={style}>{row.zdEn}</div>
                   ]
                 }
-              }
+              }*/
             }
           },
-          {title: '数据库表字段名', field: 'taZdMc', width: 150, fixed: 'left',},
+          {title: this.$t1('数据库表字段名'), field: 'taZdMc', width: 150, fixed: 'left',},
           {
-            title: '数据库表字段是否已创建',
+            title: this.$t1('数据库表字段是否已创建'),
             field: 'isFieldCreated',
             width: 200,
             slots: {
@@ -250,69 +252,40 @@ modules = {
             }
           },
           {
-            title: '字段描述',
+            title: this.$t1('字段描述'),
             field: 'zdCh',
             width: 150,
             slots: {
-              default: ({row, rowIndex, $table}) => {
+              default: 'zdCh'
+              /*default: ({row, rowIndex, $table}) => {
                 return [
                   <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdCh'}
                                 rules={[{required: true, trigger: ['blur', 'change']}]}>
                     <el-input v-model={row.zdCh} clearable disabled={!!row.systems}/>
                   </el-form-item>
                 ];
-              }
+              }*/
             }
           },
           {
-            title: '字段类型', field: 'zdType', width: 150,
+            title: this.$t1('字段类型'), field: 'zdType', width: 150,
             slots: {
               default: 'zdType'
             }
           },
           {
-            title: '关联字段', field: 'referenceZd', width: 250,
+            title: this.$t1('关联字段'), field: 'referenceZd', width: 250,
             slots: {
               default: 'referenceZd'
             }
           },
-          // {
-          //   title: '对应表名',
-          //   field: 'dybm',
-          //   width: 150,
-          //   slots: {
-          //     default: ({row, rowIndex, $table}) => {
-          //       return [
-          //         <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.dybm'}
-          //                       rules={[{required: row.taType=='Reference', trigger: ['blur', 'change']}]}>
-          //
-          //           <el-input v-show={row.taType=='Reference'}
-          //             class="search-input"
-          //             max="200"
-          //             v-model={row.dybm}
-          //             onclear={() => {
-          //               row.dybm = '';
-          //               this.$forceUpdate();
-          //             }}
-          //           v-el-readonly
-          //           clearable
-          //         >
-          //           <i v-show={this.szTaMb.id==null} slot="suffix" class="el-input__icon el-icon-search" onClick={() => {
-          //             this.zdEnIndex = rowIndex;
-          //             this.showItemSzTaMbDialog = true;
-          //           }} />
-          //     </el-input>
-          //         </el-form-item>
-          //       ];
-          //     }
-          //   }
-          // },
           {
-            title: '字段类型对应的默认值',
+            title: this.$t1('字段类型对应的默认值'),
             field: 'zdTypeValues',
             width: 150,
             slots: {
-              default: ({row, rowIndex, $table}) => {
+              default: 'zdTypeValues'
+              /*default: ({row, rowIndex, $table}) => {
                 let disabled = !!row.systems || !!row.relationZd;
                 return [
                   <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.zdTypeValues'}
@@ -320,20 +293,21 @@ modules = {
                     <el-input v-model={row.zdTypeValues} clearable disabled={disabled}/>
                   </el-form-item>
                 ];
-              }
+              }*/
             }
           },
           {
-            title: '是否必填项',
+            title: this.$t1('是否必填项'),
             field: 'required',
             width: 140,
             slots: {
-              default: ({row, $table, rowIndex}) => {
+              default: "required"
+              /*default: ({row, $table, rowIndex}) => {
                 let disabled = !!row.systems || !!row.relationZd;
                 return [
                   <el-checkbox v-model={row.required} disabled={disabled}/>
                 ];
-              }
+              }*/
             }
           },
           {
@@ -341,34 +315,37 @@ modules = {
             field: 'enabled',
             width: 120,
             slots: {
-              default: ({row, $table, rowIndex}) => {
+              default: "enabled"
+              /*default: ({row, $table, rowIndex}) => {
                 let disabled = !!row.systems || !!row.relationZd;
                 return [
                   <el-checkbox v-model={row.enabled} disabled={disabled}/>
                 ];
-              }
+              }*/
             }
           },
 
           {
-            title: '是否自动生成编码',
+            title: this.$t1('是否自动生成编码'),
             field: 'generateCode',
             width: 180,
             slots: {
-              default: ({row, $table, rowIndex}) => {
+              default:"generateCode"
+              /*default: ({row, $table, rowIndex}) => {
                 let disabled = !!row.systems || !!row.relationZd;
                 return [
                   <el-checkbox v-model={row.generateCode} disabled={disabled}/>
                 ];
-              }
+              }*/
             }
           },
           {
-            title: '编码类型',
+            title: this.$t1('编码类型'),
             field: 'codeType',
             width: 150,
             slots: {
-              default: ({row, rowIndex, $table}) => {
+              default: "codeType"
+              /*default: ({row, rowIndex, $table}) => {
                 let disabled = !!row.systems || !!row.relationZd;
                 return [
                   <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.codeType'}
@@ -376,7 +353,7 @@ modules = {
                     <el-input v-model={row.codeType} clearable disabled={disabled}/>
                   </el-form-item>
                 ];
-              }
+              }*/
             }
           },
           {
@@ -384,7 +361,8 @@ modules = {
             field: 'orders',
             width: 150,
             slots: {
-              default: ({row, rowIndex, $table}) => {
+              default: "orders"
+              /*default: ({row, rowIndex, $table}) => {
                 return [
                   <el-form-item prop={'szTaZdMbDTOs.' + rowIndex + '.orders'}
                                 rules={[{required: false, trigger: ['blur', 'change']}]}>
@@ -393,7 +371,7 @@ modules = {
                     }}/>
                   </el-form-item>
                 ];
-              }
+              }*/
             }
           },
           {
@@ -409,21 +387,13 @@ modules = {
                 // let style = !row.relationZd ? "margin-left:20px" : "";
                 if (!row.systems && !hasCreated && !row.relationZd) {
                   //非内置，未创建字段，非关联表带出来的字段
-                  return [
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        // this.szTaMb.szTaZdMbDTOs.splice(rowIndex, 1);
-                        this.deleteItem(row, rowIndex);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content="删除" placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-delete"/>
-                      </el-tooltip>
-                    </a>
-                  ];
+                  return getJsxBtn({
+                    iconName: "el-icon-delete",
+                    content: this.$t1('删除'),
+                    onclick: () => {
+                      this.deleteItem(row, rowIndex);
+                    }
+                  });
                 }
               }
             }
@@ -435,7 +405,7 @@ modules = {
       });
       if (this.dataId) {
         this.$http({
-          aes:true,
+          aes: true,
           url: USER_PREFIX + `/szTaMb/getSzTaZdMbs`,
           method: `post`,
           data: {
@@ -493,7 +463,7 @@ modules = {
       this.getData((res0) => {
         let szTaMb = res0.objx;
         this.$http({
-          aes:true,
+          aes: true,
           url: USER_PREFIX + `/szTaMb/getSzTaZdMbs`,
           method: `post`,
           data: {
@@ -509,11 +479,11 @@ modules = {
       });
     },
     createModifyTable() {
-      let text = '您确定要创建/更新数据表吗？';
+      let text = this.$t1('您确定要创建/更新数据表吗？');
       this.$baseConfirm(text).then(() => {
         this.getNewData((data) => {
           this.$http({
-          aes:true,
+            aes: true,
             url: "/" + this.szTaMb.serviceName + `/dbTable/createUpdateTable`,
             method: `post`,
             data: data,
@@ -690,7 +660,7 @@ modules = {
     getCreatedTableColumns() {
       if (!this.szTaMb.taBm) return;
       this.$http({
-          aes:true,
+        aes: true,
         url: "/" + this.szTaMb.serviceName + "/dbTable/getTableColumns",
         method: `post`,
         data: {
@@ -709,7 +679,7 @@ modules = {
     },
     getTreeDefaultZds() {
       this.$http({
-          aes:true,
+        aes: true,
         url: USER_PREFIX + `/szTaMb/getTreeDefaultZds`,
         method: `post`,
         data: {},

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

@@ -7,6 +7,7 @@ import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 import {treeScollx} from "@base/utils/global";
 import {getBdFlag} from "@base/api/user";
+import {getJsxBtn} from "@base/views/bd/setting/utils";
 
 let modules = {};
 modules = {
@@ -140,36 +141,36 @@ modules = {
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: '实体名称', field: 'taEn', width: 150, fixed: 'left'},
-          {title: '数据库表名', field: 'taBm', width: 150},
-          {title: '表描述', field: 'taCh', width: 150},
+          {title: this.$t1('实体名称'), field: 'taEn', width: 150, fixed: 'left'},
+          {title: this.$t1('数据库表名'), field: 'taBm', width: 150},
+          {title: this.$t1('表描述'), field: 'taCh', width: 150},
           {
-            title: '表类型', field: 'taType', width: 150,
+            title: this.$t1('表类型'), field: 'taType', width: 150,
             slots: {
               default: ({row}) => {
-                return row.taType == 0 ? '主表' : '明细表'
+                return row.taType == 0 ? this.$t1('主表') : this.$t1('明细表')
               }
             }
           },
           {
-            title: '是否树结构', field: 'taRule', width: 150,
+            title: this.$t1('是否树结构'), field: 'taRule', width: 150,
             slots: {
               default: ({row}) => {
-                return row.taRule == 1 ? '是' : '否'
+                return row.taRule == 1 ? this.$t1('是') : this.$t1('否')
               }
             }
           },
           {
-            title: '数据范围', field: 'dataRange', width: 150,
+            title: this.$t1('数据范围'), field: 'dataRange', width: 150,
             slots: {
               default: ({row}) => {
-                return row.dataRange == 1 ? '集团' : '当前企业'
+                return row.dataRange == 1 ? this.$t1('集团') : this.$t1('当前企业')
               }
             }
           },
-          {title: '表单分类', field: 'menuKindName', width: 150},
+          {title: this.$t1('表单分类'), field: 'menuKindName', width: 150},
           {
-            title: '项目标签', field: 'tag', width: 250, slots: {default: "tag"}, params: {
+            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.szTaMbTagDTOs) {
                   return row.szTaMbTagDTOs.map(item => item.tagName).join(",")
@@ -177,7 +178,7 @@ modules = {
               }
             }
           },
-          {title: '表编码', field: 'taCode', width: 150},
+          {title: this.$t1('表编码'), field: 'taCode', width: 150},
           {title: this.$t1('创建人'), field: 'createBy', width: 150},
           {title: this.$t1('创建时间'), field: 'createDate', width: 150},
           {title: this.$t1('更新人'), field: 'modifyBy', width: 150},
@@ -189,53 +190,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>
-                    <a
-                      href="javascript:void(0);"
-                      onClick={() => {
-                        this.openDesingerDialog(row);
-                      }}
-                      className="a-link"
-                    >
-                      <el-tooltip enterable={false} effect="dark" content="表单设计" placement="top"
-                                  popper-class="tooltip-skin">
-                        <i className="iconfont icon-liuchengguanli-shejiqi_liucheng"/>
-                      </el-tooltip>
-                    </a>
-                    <a
-                      href="javascript:void(0);"
-                      className="a-link"
-                      onClick={() => {
-                        this.openTmHistoryDialog(row);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content="历史" placement="top"
-                                  popper-class="tooltip-skin">
-                        <i className="el-icon-s-order"/>
-                      </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,
@@ -243,10 +211,10 @@ modules = {
             defaultValueEnabled: false,
             slot: "menuKindName"
           },
-          {title: "实体名称", field: "taEn", type: "input", common: true},
-          {title: "数据库表名", field: "taBm", type: "input", common: true},
-          {title: "表描述", field: "taCh", type: "input", common: true},
-          {title: "项目标签", field: "tag", type: "input", common: true, slot: "tag"},
+          {title: this.$t1('实体名称'), field: "taEn", type: "input", common: true},
+          {title: this.$t1('数据库表名'), field: "taBm", type: "input", common: true},
+          {title: this.$t1('表描述'), field: "taCh", type: "input", common: true},
+          {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ],
         config: {
           proxyConfig: {
@@ -269,7 +237,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/table_model/mixins/zdDialog.js

@@ -28,17 +28,15 @@ modules = {
       let that = this;
 
       let zdTypeMap = {
-        Boolean: "布尔",
-        Integer: "整数",
-        Decimal: "精度小数",
-        Money: "金额",
-        Text: "文本",
-        TextArea: "长文本",
-        Option: "单选项",
-        AreaSelect: "地区选择",
-        DateTime: "日期时间",
-        File: "文件",
-        Reference: "关联表"
+        Boolean: this.$t1('布尔'),
+        Integer: this.$t1('整数'),
+        Long: this.$t1('长整数'),
+        Decimal: this.$t1('精度小数'),
+        Money: this.$t1('金额'),
+        Text: this.$t1('文本'),
+        TextArea: this.$t1('长文本'),
+        DateTime: this.$t1('日期时间'),
+        Reference: this.$t1('关联表')
       }
 
       let tableOption = {
@@ -58,29 +56,29 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: '实体字段名称',
+            title: this.$t1('实体字段名称'),
             field: 'zdEn',
             width: 150
           },
           {
-            title: '数据库表字段名',
+            title: this.$t1('数据库表字段名'),
             field: 'taZdMc',
             width: 150
           },
           {
-            title: '字段描述',
+            title: this.$t1('字段描述'),
             field: 'zdCh',
             width: 150
           },
           {
-            title: '字段类型', field: 'zdType', width: 150, slots: {
+            title: this.$t1('字段类型'), field: 'zdType', width: 150, slots: {
               default: ({row, rowIndex, $table}) => {
                 return zdTypeMap[row.zdType];
               }
             }
           },
           {
-            title: '关联字段',
+            title: this.$t1('关联字段'),
             field: 'referenceZd',
             width: 150
           },

package/src/views/bd/setting/table_model/zdDialog.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"
@@ -27,25 +27,27 @@
           <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="taEn">
+            <vxe-form-item :title="$t1('表名称') + ':'" field="taEn">
               <template v-slot>
                 <el-input v-model="formData.taEn" size="small" clearable></el-input>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="数据库表名:" field="taBm">
+            <vxe-form-item :title="$t1('数据库表名') + ':'" field="taBm">
               <template v-slot>
                 <el-input v-model="formData.taBm" size="small" clearable></el-input>
               </template>
             </vxe-form-item>
-            <vxe-form-item title="表描述:" field="taCh">
+            <vxe-form-item :title="$t1('表描述') + ':'" field="taCh">
               <template v-slot>
                 <el-input v-model="formData.taCh" size="small" clearable></el-input>
               </template>

package/src/views/bd/setting/utils/index.js

@@ -0,0 +1,60 @@
+export function getJsxStatus(className, content) {
+  let statusClass = "txt-status";
+  if (className) statusClass = statusClass + ' ' + className;
+  let h = window.$vueRoot.$createElement;
+  let node = h('div', {staticClass: statusClass}, content)
+  return [node];
+}
+
+export function getJsxBtn({iconName, content, showContent,show, onclick}) {
+  if(show===false){
+    return [];
+  }
+  let h = window.$vueRoot.$createElement;
+  let contentNodes = [h("i", {staticClass: iconName})]
+  if (showContent) {
+    contentNodes.push(h('span', {}, content));
+  }
+  return [h("a", {
+    staticClass: "a-link",
+    on: {
+      click: (event) => {
+        onclick && onclick(event);
+      }
+    }
+  }, [
+    h("el-tooltip", {
+      attrs: {
+        enterable: false,
+        effect: "dark",
+        content: content,
+        placement: "top",
+        "popper-class": "tooltip-skin"
+      }
+    }, [
+      h("div", {}, contentNodes)
+    ])
+  ])]
+}
+
+export function getJsxLink({content, onclick}) {
+  let h = window.$vueRoot.$createElement;
+  return [h("a", {
+    on: {
+      click: (event) => {
+        onclick && onclick(event);
+      }
+    }
+  }, content)]
+}
+
+export function getJsxBtnList(list) {
+  let arr = [];
+  list.forEach(item => {
+    arr.push(...getJsxBtn(item));
+  })
+  let h = window.$vueRoot.$createElement;
+  return [
+    h('div', {}, arr)
+  ];
+}