cloud-web-corejs 1.0.54-dev.229 → 1.0.54-dev.230

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

@@ -7,7 +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";
+import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils";
 
 let modules = {};
 modules = {
@@ -93,6 +93,9 @@ modules = {
     },
     currentMenuKindName() {
       return this.currentFormType?.name || null
+    },
+    otherFlag() {
+      return this.currentFormType?.menuKindCode == "other"
     }
   },
   methods: {
@@ -124,9 +127,10 @@ modules = {
         tagCodes = this.checkTags.map(item => item.tagCode);
       }
       let currentFormType = this.currentFormType || {}
+      let menuKindCode = currentFormType.menuKindCode && !this.otherFlag ? currentFormType.menuKindCode : null;
       return {
         ...this.formData,
-        menuKindCode: currentFormType.menuKindCode || null,
+        menuKindCode,
         tagCodes
       };
     },
@@ -135,7 +139,13 @@ modules = {
         vue: this,
         tableRef: 'table-m1',
         tableName: 'bd_table_model_list-m1',
-        path: USER_PREFIX + '/szTaMb/listPage',
+        path: () => {
+          let url = USER_PREFIX + '/szTaMb/listPage';
+          if (this.otherFlag) {
+            url = USER_PREFIX + '/szTaMb/listOtherPage';
+          }
+          return url;
+        },
         param: () => {
           return this.getSearchParam();
         },
@@ -178,6 +188,20 @@ modules = {
               }
             }
           },
+          {
+            title: this.$t1("是否启用"),
+            field: "enabled",
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return getJsxStatus(null, this.$t1("启用"));
+                } else {
+                  return getJsxStatus("s-3", this.$t1("禁用"));
+                }
+              },
+            },
+          },
           {title: this.$t1('表编码'), field: 'taCode', width: 150},
           {field: 'serviceName', title: this.$t1('服务名'), width: 150},
           {title: this.$t1('唯一标识'), field: 'sid', width: 280},
@@ -232,6 +256,16 @@ modules = {
           {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: "enabled",
+            type: "select",
+            common: true,
+            itemOption: [
+              {label: this.$t1("启用"), value: true},
+              {label: this.$t1("禁用"), value: false},
+            ],
+          },
           {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
           {title: this.$t1('创建人'), field: "createBy", type: "input", common: false},
           {title: this.$t1('更新人'), field: "modifyBy", type: "input", common: false},
@@ -288,6 +322,12 @@ modules = {
             value.leaf = !value.hasChild;
           });
           if (node.level === 0) {
+            rows.push({
+              id: "other",
+              menuKindCode: "other",
+              name: "其他分类",
+              leaf: true
+            })
             if (rows.length > 0) {
               this.$nextTick(() => {
                 let firstNode = node.childNodes[0];
@@ -359,7 +399,7 @@ modules = {
             width: 300,
             showOverflow: false,
             slots: {
-              default: ({ row }, h) => {
+              default: ({row}, h) => {
                 let impReturnMsg = row.impReturnMsg;
                 let items = impReturnMsg
                   .split(";")

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

@@ -0,0 +1,193 @@
+import userDialog from "@base/views/user/user/dialog.vue";
+import {getJsxBtn} from "@base/views/bd/setting/utils/index";
+import {getBdEnv} from "@base/api/user";
+
+let modules = {};
+modules = {
+  props: {
+    currentMenuKind: Object,
+    sid:String
+  },
+  components: {
+    userDialog
+  },
+  computed: {
+
+  },
+  async mounted() {
+    // await this.initBdEnv();
+    this.initTableList();
+  },
+  data() {
+    let that = this;
+    return {
+      showDialog: true,
+      activeName: 'second',
+      value10: '',
+      dataId: '',
+      showEdit: false,
+      formData: {
+        sid: null,
+        szTaMbAuthDTOs:[]
+      },
+      vxeOption: {},
+      showUserDialog: false,
+      showPositionDialog: false,
+      showSaleOrgDialog: false,
+      operateIndex: 0,
+      showViewDialog: false,
+
+      tableData: [],
+      showUserRowDialog: false,
+      showUserAddDialog: false,
+      currentRow: null,
+      isDev: true
+
+    };
+  },
+  methods: {
+    getFieldDisabled() {
+
+    },
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    initBdEnv() {
+      return getBdEnv({
+        success: res => {
+          this.isDev = res.objx == "dev"
+        }
+      });
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_sz_ta_mb_auth-list-m1',
+        config: {
+          height: "auto"
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('用户'),
+            field: 'nickName',
+            width: 250
+          },
+          {
+            width: 100,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex, $table}) => {
+                return getJsxBtn({
+                  iconName: "el-icon-delete",
+                  content: this.$t1('删除'),
+                  onclick: () => {
+                    this.tableData.splice(rowIndex, 1)
+                  }
+                });
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      this.initData();
+    },
+    initData() {
+      let sid = this.sid;
+      this.$http({
+        // aes: true,
+        url: USER_PREFIX + '/sz_ta_mb_auth/list',
+        method: `post`,
+        data: {
+          sid,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: res1 => {
+          let rows = res1.objx || [];
+          this.tableData = rows;
+          /*this.formData = {
+            sid,
+            szTaMbAuthDTOs: rows
+          };*/
+
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false)
+    },
+    dialogConfirm(){
+      this.$emit('confirm')
+      this.dialogClose()
+    },
+    openUserAddDialog(row, rowIndex) {
+      this.showUserAddDialog = true;
+    },
+    confirmtUserAddDialog(rows) {
+      if (rows.length) {
+        const tableData = this.tableData;
+        const map = {};
+        tableData.filter(item => !!item.userId).forEach(function (item) {
+          map[item.userId] = 1;
+        });
+        let items = [];
+
+        rows.forEach((row, index) => {
+          let item = this.createRow();
+          item.userId = row.id;
+          item.nickName = row.nickName;
+          if (!map[item.userId]) {
+            items.push(item);
+          }
+        });
+        this.tableData.push(...items);
+      }
+    },
+    saveData() {
+      this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+        var url = USER_PREFIX + `/sz_ta_mb_auth/save`;
+        this.$http({
+          // aes: true,
+          url: url,
+          method: `post`,
+          data: {
+            sid:this.sid,
+            szTaMbAuthDTOs: this.tableData
+          },
+          isLoading: true,
+          success: res => {
+            this.$message({
+              message: res.content,
+              type: 'success',
+              duration: 500,
+              onClose: t => {
+                this.dialogConfirm()
+              }
+            });
+          }
+        });
+      });
+    },
+    createRow() {
+      let row = {
+        nickName: null,
+        userId: null,
+        editAuth: 1
+      }
+      return row;
+    }
+  }
+}
+export default modules

package/src/views/bd/setting/table_model/otherAuthDialog.vue

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-dialog
+      :title="$t1('数据表分派')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+      width="500px"
+      @close="dialogClose"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont">
+        <div class="grid-height" style="height: 500px">
+          <vxe-grid
+            class="is-pointer"
+            ref="table-m1"
+            :data="tableData"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openUserAddDialog">
+                    {{ $t1('新增用户') }}
+                  </vxe-button>
+                </div>
+              </div>
+            </template>
+            <template #user="{row,rowIndex}">
+              <el-input
+                class="search-input"
+                v-model="row.nickName"
+                clearable
+                @clear="
+                  row.userId = null;
+                "
+                v-if="!row._isParent"
+                v-el-readonly
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search" @click="openUserRowDialog(row,rowIndex)"></i>
+              </el-input>
+              <template v-else>{{ row.nickName }}</template>
+            </template>
+            <template #switch="{row,column,rowIndex}">
+              <el-switch v-model="row[column.field]" :key="column.field+rowIndex" :active-value="1"
+                         :inactive-value="0" :disabled="column.params.disabled"></el-switch>
+            </template>
+          </vxe-grid>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+			<el-button type="primary" plain class="button-sty" @click="dialogClose">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t1('取 消') }}
+			</el-button>
+			<el-button type="primary" @click="saveData" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span>
+    </el-dialog>
+    <userDialog v-if="showUserAddDialog" :visiable.sync="showUserAddDialog" @confirm="confirmtUserAddDialog"
+                multi="true" :param="{flag:8}"/>
+  </div>
+</template>
+
+<script>
+import mixin from "./mixins/otherAuthDialog";
+
+export default {
+  mixins: [mixin]
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/views/user/fieldTranslation/editDialog.vue

@@ -29,10 +29,10 @@
                         :rules="[{ required: false, trigger: 'blur' }]" class="block">
             <el-input type="textarea" :rows="2" v-model="fieldTranslation[item.translationField]" clearable/>
           </el-form-item>
-          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
+<!--          <el-form-item :label="$t1('多语言标签')" prop="translation1" :rules="[{ required: false, trigger: 'blur' }]"
                         class="block">
             <langTagView v-model="fieldTranslation.fieldTranslationTagDTOs" :readonly="!isDev"></langTagView>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item :label="$t1('创建时间')" prop="createDate" :rules="[{ required: false, trigger: 'blur' }]">
             <span>{{ fieldTranslation.createDate }}</span>
           </el-form-item>
@@ -53,23 +53,23 @@
       </el-button>
     </span>
     </el-dialog>
-    <langTagDialog v-if="showLangTagDialog"
+<!--    <langTagDialog v-if="showLangTagDialog"
                    :visiable.sync="showLangTagDialog"
                    @confirm="confirmLangTagDialog"
                    :multi="true"
                    :rows="fieldTranslationTagDTOs"
-                   fieldKey="tagCode"></langTagDialog>
+                   fieldKey="tagCode"></langTagDialog>-->
   </div>
 </template>
 
 <script>
 import {getBdFlag} from "@base/api/user";
-import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
-import langTagView from "@base/components/langTag/view.vue";
+/*import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+import langTagView from "@base/components/langTag/view.vue";*/
 
 
 export default {
-  components: {langTagDialog, langTagView},
+  components: {/*langTagDialog, langTagView*/},
   props: {
     _dataId: [String, Number],
     currentDataType: Object

package/src/views/user/fieldTranslation/list.vue

@@ -46,8 +46,8 @@
                     <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
                                 v-if="isDev">{{ $t1('导出发布') }}
                     </vxe-button>
-                    <langTagAddButton :option="addProjectTagOption" v-if="isDev"></langTagAddButton>
-                    <langTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></langTagDeleteButton>
+                    <!--                    <langTagAddButton :option="addProjectTagOption" v-if="isDev"></langTagAddButton>
+                                        <langTagDeleteButton :option="deleteProjectTagOption" v-if="isDev"></langTagDeleteButton>-->
                   </template>
                   <template #buttonRight>
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
@@ -64,29 +64,29 @@
                       </template>
                     </vxe-form-item>
                   </template>
-                  <template #tag>
-                    <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
-                      <template v-slot>
-                        <el-input
-                          class="search-input"
-                          max="200"
-                          :value="getTabNames()"
-                          @clear="
-                            checkTags = [];
-                          "
-                          v-el-readonly
-                          clearable
-                        >
-                          <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
-                        </el-input>
-                      </template>
-                    </vxe-form-item>
-                  </template>
+                  <!--                  <template #tag>
+                                      <vxe-form-item :title="$t1('多语言标签')+':'" field="tag">
+                                        <template v-slot>
+                                          <el-input
+                                            class="search-input"
+                                            max="200"
+                                            :value="getTabNames()"
+                                            @clear="
+                                              checkTags = [];
+                                            "
+                                            v-el-readonly
+                                            clearable
+                                          >
+                                            <i slot="suffix" class="el-input__icon el-icon-search" @click="openLangTagDialog3"></i>
+                                          </el-input>
+                                        </template>
+                                      </vxe-form-item>
+                                    </template>-->
                 </tableForm>
               </template>
-              <template #tag="{row}">
-                <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
-              </template>
+              <!--              <template #tag="{row}">
+                              <langTagView v-model="row.fieldTranslationTagDTOs" :readonly="true"></langTagView>
+                            </template>-->
             </vxe-grid>
           </div>
         </div>
@@ -95,11 +95,11 @@
     <fieldTranslationEditDialog v-if="showFieldTranslationEditDialog" :visiable.sync="showFieldTranslationEditDialog"
                                 :_dataId.sync="dataId" :currentDataType="currentDataType"
                                 @confirm="confirmFieldTranslationEditDialog"></fieldTranslationEditDialog>
-    <langTagDialog v-if="showLangTagDialog3"
+<!--    <langTagDialog v-if="showLangTagDialog3"
                    :visiable.sync="showLangTagDialog3"
                    @confirm="confirmLangTagDialog3"
                    :rows="checkTags"
-                   :multi="true"></langTagDialog>
+                   :multi="true"></langTagDialog>-->
   </div>
 </template>
 
@@ -108,16 +108,16 @@ import fieldTranslationEditDialog from "../../../views/user/fieldTranslation/edi
 import {treeScollx} from '@base/utils/global.js';
 import {getBdFlag} from "@base/api/user";
 import tableForm from "@base/components/table/tableForm.vue";
-import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
+/*import langTagDialog from "../../../views/user/lang_tag/dialog.vue";
 import langTagAddButton from "@base/components/langTag/addButton.vue";
 import langTagDeleteButton from "@base/components/langTag/deleteButton.vue";
-import langTagView from "@base/components/langTag/view.vue";
+import langTagView from "@base/components/langTag/view.vue";*/
 
 export default {
   name: 'fieldTranslation:list',
   components: {
-    langTagView,
-    langTagDialog, tableForm, fieldTranslationEditDialog, langTagAddButton, langTagDeleteButton
+    tableForm, fieldTranslationEditDialog/*, langTagView,
+    langTagDialog, langTagAddButton, langTagDeleteButton*/
   },
   data() {
     return {
@@ -284,7 +284,7 @@ export default {
               }
             }
           },
-          {
+          /*{
             title: this.$t1('多语言标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
                 if (row.fieldTranslationTagDTOs) {
@@ -292,7 +292,7 @@ export default {
                 }
               }
             }
-          },
+          },*/
           {
             field: 'modifyDate',
             title: this.$t1('更新时间'),
@@ -337,7 +337,7 @@ export default {
           },
           {title: this.$t1('字段编码'), field: "fieldCode", type: "input", common: true},
           {title: this.$t1('中文'), field: "translation1", type: "input", common: true},
-          {title: this.$t1('多语言标签'), field: "tag", type: "input", common: true, slot: "tag"},
+          // {title: this.$t1('多语言标签'), field: "tag", type: "input", common: true, slot: "tag"},
         ]
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {