cloud-web-corejs 1.0.131 → 1.0.133

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

@@ -0,0 +1,311 @@
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView
+          v-if="showEdit"
+          visible-key="showEdit"
+          :_dataId.sync="dataId"
+          :copyId.sync="copyId"
+          :parent-target="_self"
+          @reload="$reloadHandle"
+        ></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid
+            ref="table-m1"
+            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="openEditDialog"
+                    >{{ $t1("新增") }}
+                  </vxe-button>
+                </div>
+                <div class="fr">
+                  <vxe-button
+                    icon="el-icon-brush"
+                    class="button-sty"
+                    @click="resetEvent"
+                    type="text"
+                    status="primary"
+                    plain
+                    >{{ $t1("重置") }}
+                  </vxe-button>
+                  <vxe-button
+                    status="warning"
+                    icon="el-icon-search"
+                    class="button-sty"
+                    @click="searchEvent"
+                  >
+                    {{ $t1("搜索") }}
+                  </vxe-button>
+                </div>
+              </div>
+              <vxe-form
+                ref="form"
+                class="screen-box"
+                title-width="92px"
+                title-align="right"
+                :data="formData"
+                @submit="searchEvent"
+                @reset="searchEvent"
+              >
+                <vxe-form-item title="请求编码:" field="reqCode">
+                  <template v-slot>
+                    <el-input v-model="formData.reqCode" size="small" clearable />
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="请求名称:" field="reqName">
+                  <template v-slot>
+                    <el-input v-model="formData.reqName" size="small" clearable />
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="执行组织编码:" field="exeCompanyCode">
+                  <template v-slot>
+                    <el-input v-model="formData.exeCompanyCode" size="small" clearable />
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="是否启用:" field="enabled">
+                  <template v-slot>
+                    <el-select v-model="formData.enabled" clearable>
+                      <el-option :value="true" label="启用"></el-option>
+                      <el-option :value="false" label="禁用"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from "./edit.vue";
+
+export default {
+  name: "request_setting:list",
+  components: { editView },
+  data() {
+    return {
+      activeName: "second",
+      dataId: 0,
+      copyId: 0,
+      showEdit: false,
+      showAdvancedSearch: false,
+      vxeOption: {},
+      formData: {},
+      advancedFormData: {},
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs["table-m1"].commitProxy("reload");
+    },
+    resetEvent() {
+      this.formData = {};
+      this.advancedFormData = {};
+      this.$refs["table-m1"].commitProxy("reload");
+    },
+    openEditDialog(id) {
+      this.copyId = 0;
+      this.dataId = !id || typeof id == "object" ? 0 : id;
+      this.activeName = "first";
+      this.$openEditView("showEdit");
+    },
+    initTableList() {
+      let that = this;
+      let pushTypeMap = { 0: "异步推送", 1: "同步调用" };
+      let tableOption = {
+        vue: this,
+        tableRef: "table-m1",
+        tableName: "user_requestSetting_list-m1",
+        path: USER_PREFIX + "/request_setting/listPage",
+        param: () => {
+          return {
+            ...this.formData,
+            ...this.advancedFormData,
+          };
+        },
+        columns: [
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          {
+            title: "请求名称",
+            field: "reqName",
+            width: 150,
+            fixed: "left",
+          },
+          {
+            title: "请求编码",
+            field: "reqCode",
+            width: 150,
+            fixed: "left",
+          },
+          {
+            title: "请求Url",
+            field: "url",
+            width: 150,
+          },
+          {
+            title: "请求头",
+            field: "header",
+            width: 150,
+          },
+          {
+            title: "连接超时",
+            field: "connectTimeout",
+            width: 150,
+          },
+          {
+            title: "读取超时",
+            field: "readTimeout",
+            width: 150,
+          },
+          {
+            field: "enabled",
+            title: this.$t1("是否启用"),
+            width: 150,
+            slots: {
+              default: ({ row }) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>启用</span>
+                    </div>,
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>禁用</span>
+                    </div>,
+                  ];
+                }
+              },
+            },
+          },
+          {
+            title: "备注",
+            field: "remark",
+            width: 150,
+          },
+          {
+            title: "执行组织编码",
+            field: "exeCompanyCode",
+            width: 150,
+          },
+          {
+            field: "enabled",
+            title: this.$t1("是否启用"),
+            width: 150,
+            slots: {
+              default: ({ row }) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>启用</span>
+                    </div>,
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>禁用</span>
+                    </div>,
+                  ];
+                }
+              },
+            },
+          },
+          {
+            title: "参数1",
+            field: "param1",
+            width: 150,
+          },
+          {
+            title: "参数2",
+            field: "param2",
+            width: 150,
+          },
+          {
+            title: "参数3",
+            field: "param3",
+            width: 150,
+          },
+          {
+            title: "参数4",
+            field: "param4",
+            width: 150,
+          },
+          {
+            field: "createBy",
+            title: this.$t1("创建人"),
+            width: 150,
+          },
+          {
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
+          },
+          {
+            field: "modifyBy",
+            title: this.$t1("更新人"),
+            width: 150,
+          },
+          {
+            field: "modifyDate",
+            title: this.$t1("更新时间"),
+            width: 150,
+          },
+          {
+            width: 47,
+            fixed: "right",
+            title: "",
+            sortable: false,
+            slots: {
+              default: ({ row }) => {
+                return [
+                  <div>
+                    <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>
+                  </div>,
+                ];
+              },
+            },
+          },
+        ],
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+        this.vxeOption = opts;
+      });
+    },
+  },
+};
+</script>

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 => {

package/src/views/user/project_tag/dialog.vue

@@ -144,19 +144,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

package/src/views/user/project_tag/edit.vue

@@ -46,11 +46,11 @@
             </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
-              <td>{{ projectTag._createBy }}</td>
+              <td>{{ projectTag.createBy }}</td>
               <th>{{ $t1('创建时间') }}</th>
               <td>{{ projectTag.createDate }}</td>
               <th>{{ $t1('更新人') }}</th>
-              <td>{{ projectTag._modifyBy }}</td>
+              <td>{{ projectTag.modifyBy }}</td>
               <th>{{ $t1('更新时间') }}</th>
               <td>{{ projectTag.modifyDate }}</td>
             </tr>

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

@@ -114,7 +114,7 @@ export default {
             width: 250
           },
           {
-            field: '_createBy',
+            field: 'createBy',
             title: this.$t1('创建人'),
             width: 150
           },
@@ -124,7 +124,7 @@ export default {
             width: 150
           },
           {
-            field: '_modifyBy',
+            field: 'modifyBy',
             title: this.$t1('更新人'),
             width: 150
           },