cloud-web-corejs-haier 1.0.4 → 1.0.6

package/src/layout/components/TagsView/index.vue

@@ -15,7 +15,8 @@
         <i class="el-icon-s-home" v-if="tag.name =='home'"></i>
         {{ getMenuName(tag) }}
 
-        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
+        <span v-if="!!tag.meta.user_affix" class="el-icon-close is-disabled"/>
+        <span v-else-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
       </router-link>
     </scroll-pane>
     <div class="tags-operBox">
@@ -27,12 +28,25 @@
         <i class="el-icon-arrow-right" ayadmin-event="rightPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollRight()"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
+      <el-dropdown >
+        <span class="el-dropdown-link" style="padding-right:10px;padding-left:4px;">
+          <i class="el-icon-more el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="refreshSelectedTag($route)" :disabled="getIsLock()">
+            <i class="el-icon-refresh"/><span>{{ $t1('刷新') }}</span>
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="closeAllTags(selectedTag)">
+            <i class="el-icon-close"/><span>{{ $t1('全部关闭') }}</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <!-- <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
         <i class="el-icon-refresh" @click="refreshSelectedTag($route)"/>
       </el-tooltip>
       <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('全部关闭')" placement="bottom">
         <i class="el-icon-close" @click="closeAllTags(selectedTag)"/>
-      </el-tooltip>
+      </el-tooltip> -->
     </div>
     <!-- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
@@ -86,8 +100,8 @@ export default {
   methods: {
     getMenuName(item) {
       let locale = this.$i18n?.locale;
-      let zhTitle = (item.meta ? item.meta.title : '');
-      let enTitle = (item.meta ? item.meta.enTitle : '');
+      let zhTitle = item.meta?.title || "";
+      let enTitle = item.meta?.enTitle || '';
       let title;
       if (locale == "en") {
         title = enTitle || zhTitle;
@@ -178,6 +192,7 @@ export default {
       } */
     },
     closeSelectedTag(view) {
+      if(view.meta.user_affix)return
       this.$store.dispatch('tagsView/delView', view).then(({visitedViews}) => {
         if (this.isActive(view)) {
           this.toLastView(visitedViews, view)
@@ -191,11 +206,13 @@ export default {
       })
     },
     closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
+      this.$baseConfirm(this.$t1('您确定要全部关闭吗？')).then(() => {
+        this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
+          if (this.affixTags.some(tag => tag.path === view.path)) {
+            return
+          }
+          this.toLastView(visitedViews, view)
+        })
       })
     },
     toLastView(visitedViews, view) {
@@ -235,7 +252,13 @@ export default {
     },
     handleScroll() {
       this.closeMenu()
-    }
+    },
+    getIsLock() {
+      let path = this.$route.path;
+      let visitedViews = this.$store.state.tagsView.visitedViews
+      let currentItem = visitedViews.find(item => item.path == path)
+      return !!currentItem?.meta?.user_affix;
+    },
   }
 }
 </script>
@@ -249,6 +272,9 @@ export default {
 </style>
 <style lang="scss">
 //reset element css of el-icon-close
+span.el-icon-close.is-disabled{
+  cursor: not-allowed;
+}
 .tags-view-wrapper {
   .tags-view-item {
     .el-icon-close {

package/src/layout/components/createCompany/createCompanyDialog.vue

@@ -0,0 +1,157 @@
+<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_8"
+      width="350px"
+      v-el-drag-dialog
+      v-el-dialog-center
+      :before-close="dialogClose"
+    >
+      <div class="cont">
+        <el-form
+          ref="editCategoryForm"
+          :model="formData"
+          label-width="102px"
+          class="adSearchForm"
+          style="min-height: 150px; width: auto"
+        >
+          <el-form-item :label="$t1('企业类型')">
+            <el-radio-group v-model="formData.gender">
+              <el-radio :label="1">{{ $t1("海外营销") }}</el-radio
+              ><br />
+              <el-radio :label="2">{{ $t1("国内营销") }}</el-radio
+              ><br />
+              <el-radio :label="3">{{ $t1("产品平台") }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t1('编码')">
+            <el-input v-model="formData.sid" clearable class="all-width" />
+          </el-form-item>
+        </el-form>
+      </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="openCreateCompanyJsonDialog" class="button-sty">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确定") }}
+        </el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="新建企业JSON维护"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      :visible.sync="showCreateCompanyJsonDialog"
+      :modal="false"
+      custom-class="dialog-style tips-dialog tips-1 "
+      width="800px"
+      @close="dialogClose"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont" style="height: 700px">
+        <code-editor
+          mode="json"
+          :readonly="!1"
+          v-model="companyJson"
+          height="414px;"
+        ></code-editor>
+      </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="confirmCreateCompanyJsonDialog"
+          class="button-sty"
+        >
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确 定") }}
+        </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      showDialog: true,
+      formData: {
+        objType: "FormTemplate",
+        sid: null,
+      },
+      extractedCode: null,
+      companyJson: null,
+      showCreateCompanyJsonDialog: false,
+    };
+  },
+  methods: {
+    dialogConfirm() {
+      this.extractedCode = null;
+      if (!this.formData.sid) {
+        this.$baseAlert("唯一标识不能为空");
+        return;
+      }
+      this.$http({
+        aes: true,
+        url: USER_PREFIX + `/form_develop/getExtractedCodeData`,
+        method: `post`,
+        data: this.formData,
+        isLoading: true,
+        success: (res) => {
+          let rows = res.objx || [];
+          if (rows.length) {
+            let row = rows[0];
+            this.extractedCode = row.extractedCode;
+          }
+        },
+      });
+    },
+    dialogClose() {
+      this.showDialog = false;
+      this.$emit("update:visiable", false);
+    },
+    openCreateCompanyJsonDialog() {
+      this.showDialog = false;
+      this.companyJson = "";
+      this.showCreateCompanyJsonDialog = true;
+    },
+    confirmCreateCompanyJsonDialog(data) {
+      /* this.$http({
+        aes: true,
+        url: USER_PREFIX + `/form_develop/getExtractedCodeData`,
+        method: `post`,
+        data: this.formData,
+        isLoading: true,
+        success: (res) => {
+          this.$message({
+            message: res.content,
+            type: "success"
+          });
+          this.dialogClose();
+        },
+      }); */
+    },
+  },
+};
+</script>
+
+<style scoped>
+::v-deep .el-select.all-width .el-input {
+  width: 100% !important;
+}
+</style>

package/src/layout/components/extractedCode/viewDialog.vue

@@ -25,6 +25,7 @@
         :_viewType="1"
         @reload="$reloadHandle"
         @openDesignDialog="openDesingerDialogByChild"
+        :extractedObj="extractedObj"
       ></component>
       <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
                  :destroy-on-close="true"

package/src/layout/defaultLayout.vue

@@ -92,7 +92,7 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
-
+  overflow: hidden;
   &.mobile.openSidebar {
     position: fixed;
     top: 0;

package/src/layout/index.vue

@@ -6,12 +6,10 @@
 import defaultLayout from "@base/layout/defaultLayout.vue";
 
 export default {
-  name: 'Layout',
+  name: "Layout",
   components: {
-    defaultLayout
+    defaultLayout,
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
-
+<style lang="scss" scoped></style>

package/src/mixins/table/index.js

@@ -0,0 +1,151 @@
+
+let module = {
+  install (vxetable, options) {
+    let Table = vxetable.Table;
+    // return
+
+
+
+    Table.mixins.push({
+      methods: {
+        /**
+     * 全局按下事件处理
+     */
+     handleGlobalMousedownEvent : (evnt) => {
+      let $xeTable = this
+      const { editStore, ctxMenuStore, filterStore, customStore } = reactData
+      const { mouseConfig, editRules } = props
+      const el = refElem.value
+      const editOpts = computeEditOpts.value
+      const validOpts = computeValidOpts.value
+      const areaOpts = computeAreaOpts.value
+      const { actived } = editStore
+      const $validTooltip = refValidTooltip.value
+      const tableFilter = refTableFilter.value
+      const tableCustom = refTableCustom.value
+      const tableMenu = refTableMenu.value
+      // 筛选
+      if (tableFilter) {
+        if (getEventTargetNode(evnt, el, 'vxe-cell--filter').flag) {
+          // 如果点击了筛选按钮
+        } else if (getEventTargetNode(evnt, tableFilter.getRefMaps().refElem.value).flag) {
+          // 如果点击筛选容器
+        } else {
+          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
+            tablePrivateMethods.preventEvent(evnt, 'event.clearFilter', filterStore.args, tableMethods.closeFilter)
+          }
+        }
+      }
+      // 自定义列
+      if (tableCustom) {
+        if (customStore.btnEl === evnt.target || getEventTargetNode(evnt, document.body, 'vxe-toolbar-custom-target').flag) {
+          // 如果点击了自定义列按钮
+        } else if (getEventTargetNode(evnt, tableCustom.getRefMaps().refElem.value).flag) {
+          // 如果点击自定义列容器
+        } else {
+          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
+            tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
+              if ($xeTable.closeCustom) {
+                $xeTable.closeCustom()
+              }
+            })
+          }
+        }
+      }
+
+      // 如果已激活了编辑状态
+      if (actived.row) {
+        if (!(editOpts.autoClear === false)) {
+          // 如果是激活状态，点击了单元格之外
+          const cell = actived.args.cell
+          if ((!cell || !getEventTargetNode(evnt, cell).flag)) {
+            if ($validTooltip && getEventTargetNode(evnt, $validTooltip.$el as HTMLDivElement).flag) {
+              // 如果是激活状态，且点击了校验提示框
+            } else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
+              // 如果是激活状态，点击了单元格之外
+              if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
+                // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
+                tablePrivateMethods.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
+                  let isClear
+                  if (editOpts.mode === 'row') {
+                    const rowTargetNode = getEventTargetNode(evnt, el, 'vxe-body--row')
+                    const rowNodeRest = rowTargetNode.flag ? tableMethods.getRowNode(rowTargetNode.targetElem) : null
+                    // row 方式，如果点击了不同行
+                    isClear = rowNodeRest ? !$xeTable.eqRow(rowNodeRest.item, actived.args.row) : false
+                  } else {
+                    // cell 方式，如果是非编辑列
+                    isClear = !getEventTargetNode(evnt, el, 'col--edit').flag
+                  }
+                  // 如果点击表头行，则清除激活状态
+                  if (!isClear) {
+                    isClear = getEventTargetNode(evnt, el, 'vxe-header--row').flag
+                  }
+                  // 如果点击表尾行，则清除激活状态
+                  if (!isClear) {
+                    isClear = getEventTargetNode(evnt, el, 'vxe-footer--row').flag
+                  }
+                  // 如果固定了高度且点击了行之外的空白处，则清除激活状态
+                  if (!isClear && props.height && !reactData.overflowY) {
+                    const bodyWrapperElem = evnt.target as HTMLDivElement
+                    if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
+                      isClear = evnt.offsetY < bodyWrapperElem.clientHeight
+                    }
+                  }
+                  if (
+                    isClear ||
+                      // 如果点击了当前表格之外
+                      !getEventTargetNode(evnt, el).flag
+                  ) {
+                    setTimeout(() => {
+                      $xeTable.handleClearEdit(evnt).then(() => {
+                        // 如果存在校验，点击了表格之外则清除
+                        if (!internalData.isActivated && editRules && validOpts.autoClear) {
+                          reactData.validErrorMaps = {}
+                        }
+                      })
+                    })
+                  }
+                })
+              }
+            }
+          }
+        }
+      } else if (mouseConfig) {
+        if (!getEventTargetNode(evnt, el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
+          if ($xeTable.clearSelected) {
+            $xeTable.clearSelected()
+          }
+          if (areaOpts.autoClear) {
+            if ($xeTable.getCellAreas) {
+              const cellAreas = $xeTable.getCellAreas()
+              if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+                tablePrivateMethods.preventEvent(evnt, 'event.clearAreas', {}, () => {
+                  $xeTable.clearCellAreas()
+                  $xeTable.clearCopyCellArea()
+                  dispatchEvent('clear-cell-area-selection', { cellAreas }, evnt)
+                })
+              }
+            }
+          }
+        }
+      }
+      // 如果配置了快捷菜单且，点击了其他地方则关闭
+      if ($xeTable.closeMenu) {
+        if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) {
+          $xeTable.closeMenu()
+        }
+      }
+      const isActivated = getEventTargetNode(evnt, $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : el).flag
+      // 如果存在校验，点击了表格之外则清除
+      if (!isActivated && editRules && validOpts.autoClear) {
+        reactData.validErrorMaps = {}
+      }
+      // 最后激活的表格
+      internalData.isActivated = isActivated
+    }
+      }
+    })
+  }
+}
+
+export default module