cloud-web-corejs 1.0.54-dev.24 → 1.0.54-dev.241

package/src/index.js

@@ -150,7 +150,7 @@ import langImport from '@base/components/langImport/index.js';
 Vue.use(langImport);
 
 //vform
-import '@base/components/xform/utils/directive'
+// import '@base/components/xform/utils/directive'
 
 
 import i18n from '@base/lang/index.js'

package/src/layout/components/AppMain.vue

@@ -20,12 +20,15 @@
       ></outLink>
     </template>
     <unreadDialog></unreadDialog>
+    <watermark></watermark>
   </section>
 </template>
 
 <script>
 import outLink from '@base/views/user/outLink/index.vue';
 import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
+import watermark from "./watermark";
+
 
 export default {
   name: 'AppMain',
@@ -43,7 +46,8 @@ export default {
   },
   components: {
     outLink,
-    unreadDialog
+    unreadDialog,
+    watermark
   },
   data() {
     return {

package/src/layout/components/Sidebar/default.vue

@@ -25,6 +25,17 @@
           <i class="iconfont icon-liuchengdaiban" @click="$router.push('/basic/wf/wf_manage/list')"/>
         </el-tooltip>
       </div>
+      <div class="item" v-if="isDev && isBdAdmin">
+        <el-tooltip :enterable="false" effect="dark" :content="$t1('获取提取码')" :placement="direction">
+          <i class="el-icon-setting" @click="showExtractedCodeCreateDialog=true"/>
+        </el-tooltip>
+      </div>
+      <div class="item" v-if=" isBdAdmin">
+        <el-tooltip :enterable="false" effect="dark" :content="$t1('查看提取码')" :placement="direction">
+          <i class="el-icon-tickets" @click="showExtractedCodeQueryDialog=true"/>
+        </el-tooltip>
+      </div>
+
       <div class="item" @click="logout()">
         <el-tooltip :enterable="false" effect="dark" :content="$t1('退出')" :placement="direction">
           <i class="el-icon-switch-button"/>
@@ -130,12 +141,19 @@
 			</span> -->
     </el-dialog>
 
-    <infoIframeDialog v-if="showInfoIframeDialog" :visiable.sync="showInfoIframeDialog"
-                      :dataId="userInfo.id"></infoIframeDialog>
-    <userInfo v-if="showUserInfoDialog" :visiable.sync="showUserInfoDialog" :_dataId="userInfo.id" topValue="128px"
+    <!--    <infoIframeDialog v-if="showInfoIframeDialog" :visiable.sync="showInfoIframeDialog"
+                          :dataId="userInfo.id"></infoIframeDialog>-->
+    <userInfo v-if="!isFormDev && showUserInfoDialog" :visiable.sync="showUserInfoDialog" :_dataId="userInfo.id"
+              topValue="128px"
               @reload="userInfoReload"></userInfo>
-
+    <userFormInfo v-if="isFormDev && showUserInfoDialog" :visiable.sync="showUserInfoDialog" :_dataId="userInfo.id"
+                  topValue="128px"
+                  @reload="userInfoReload"></userFormInfo>
     <onlineTalk></onlineTalk>
+    <extractedCodeCreateDialog v-if="showExtractedCodeCreateDialog" :visiable.sync="showExtractedCodeCreateDialog"
+    ></extractedCodeCreateDialog>
+    <extractedCodeQueryDialog v-if="showExtractedCodeQueryDialog" :visiable.sync="showExtractedCodeQueryDialog"
+    ></extractedCodeQueryDialog>
   </div>
 </template>
 
@@ -143,12 +161,19 @@
 import {mapGetters} from 'vuex';
 import variables from '@/styles/variables.scss';
 import userInfo from '@base/views/user/user/info.vue';
+import userFormInfo from '@base/views/user/user/form_info.vue';
 import onlineTalk from "@base/components/onlineTalk";
 import {
   getToken
 } from '@base/utils/auth';
 import indexUtil from "@base/utils/index.js"
 import langTool from "../langTool.vue";
+import {initPddLog} from "@base/utils/pddLog";
+
+import extractedCodeCreateDialog from "../extractedCode/createDialog.vue";
+import extractedCodeQueryDialog from "../extractedCode/queryDialog.vue";
+import {getBdFlag} from "@base/api/user";
+
 
 export default {
   props: {
@@ -182,11 +207,16 @@ export default {
       menuModules: [],
       firstMenuHeight: 0, // 第一个菜单的高度
       eveyMenuHeight: 48, // 每一个菜单的高度
+      isFormDev: false,
+
+      showExtractedCodeCreateDialog: false,
+      showExtractedCodeQueryDialog: false,
+      isDev: false
     };
   },
-  components: {userInfo, onlineTalk, langTool},
+  components: {userInfo, userFormInfo, onlineTalk, langTool, extractedCodeCreateDialog, extractedCodeQueryDialog},
   computed: {
-    ...mapGetters(['permission_routes', 'sidebar', 'sidebarRouters', 'isBdAdmin']),
+    ...mapGetters(['permission_routes', 'sidebar', 'sidebarRouters', 'isBdAdmin', 'userFlag']),
     activeMenu() {
       const route = this.$route;
       const {meta, path} = route;
@@ -229,8 +259,22 @@ export default {
     if (query && query.flag == 1) {
       this.showCompanyDialog = true;
     }
+    initPddLog();//初始化拼多多日志
+    this.initIsFormDev();
+    this.getBdEnv();
   },
   methods: {
+    getBdEnv() {
+      getBdFlag({
+        success: res => {
+          this.isDev = res.objx == 1
+        }
+      });
+    },
+    initIsFormDev() {
+      let userFlag = this.userFlag
+      this.isFormDev = userFlag == 6 || userFlag == 7 || userFlag == 8;
+    },
     getMenuFlag() {
       return !this.isBdAdmin;
     },

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

@@ -27,12 +27,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 style="margin-right:10px">
+        <span class="el-dropdown-link">
+          <i class="el-icon-more el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="refreshSelectedTag($route)">
+            <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>
@@ -164,7 +177,6 @@ export default {
       this.$baseEventBus.$emit("reflushRouteView", view);
       /* if(this.$route.name=="outLink"){
         let a = this.$baseEventBus.$emit("getAppMain");
-        debugger
         let t = this.$parent.$refs["appMain"].$refs["ref_"+this.$route.path][0];
         t.$baseReload();
       }else{
@@ -192,11 +204,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) {

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

@@ -0,0 +1,92 @@
+<template>
+  <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
+    @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-select v-model="formData.objType" class="all-width">
+            <el-option value="FormTemplate" :label="$t1('表单模板')"></el-option>
+            <el-option value="FormScript" :label="$t1('逻辑脚本')"></el-option>
+            <el-option value="TableTemplate" :label="$t1('数据表')"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t1('唯一标识')">
+          <el-input v-model="formData.sid" clearable class="all-width"/>
+        </el-form-item>
+        <el-form-item :label="$t1('提取码')">
+          <span>{{ extractedCode }}</span>
+        </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>
+        {{ $t2('取 消', 'system.button.cancel2') }}
+      </el-button>
+      <el-button type="primary" @click="dialogConfirm" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1('生成提取码') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  name: "createDialog",
+  data() {
+    return {
+      showDialog: true,
+      formData: {
+        objType: "FormTemplate",
+        sid: null
+      },
+      extractedCode: null
+    }
+  },
+  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)
+    },
+  }
+}
+</script>
+
+
+<style scoped>
+::v-deep .el-select.all-width .el-input{
+  width: 100% !important;
+}
+</style>

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

@@ -0,0 +1,96 @@
+<template>
+  <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
+    :before-close="dialogClose"
+  >
+    <div class="cont">
+      <el-form ref="editCategoryForm" :model="formData" label-width="102px" class="adSearchForm" style="height: auto; width: auto;">
+        <el-form-item :label="$t1('提取码')">
+          <el-input v-model="formData.extractedCode" 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>
+        {{ $t2('取 消', 'system.button.cancel2') }}
+      </el-button>
+      <el-button type="primary" @click="dialogConfirm" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1('确定') }}
+      </el-button>
+    </span>
+    <viewDialog v-if="showViewDialog" :visiable.sync="showViewDialog" @close="dialogClose"
+                :extractedObj="extractedObj"></viewDialog>
+  </el-dialog>
+</template>
+<script>
+import viewDialog from "./viewDialog.vue";
+
+export default {
+  name: "createDialog",
+  components: {
+    viewDialog
+  },
+  data() {
+    return {
+      showDialog: true,
+      formData: {
+        extractedCode: null
+      },
+      showViewDialog: false,
+      extractedObj: {}
+    }
+  },
+  methods: {
+    dialogConfirm() {
+      if (!this.formData.extractedCode) {
+        this.$baseAlert(this.$t1("提取码不能为空"));
+        return
+      }
+      this.$http({
+        aes: true,
+        url: USER_PREFIX + `/form_develop/getExtractedObjData`,
+        method: `post`,
+        data: {
+          stringOne: this.formData.extractedCode
+        },
+        isLoading: true,
+        success: res => {
+          let rows = res.objx || []
+          if (rows.length) {
+            let row = rows[0];
+            let obj = row.obj
+            if (!obj) {
+              this.$baseAlert(this.$t1("提取对象为空"));
+              return
+            }
+            this.extractedObj = row;
+            this.showDialog = false;
+            this.showViewDialog = true;
+          } else {
+            this.$baseAlert(this.$t1("无效提取码"));
+          }
+        }
+      })
+    },
+    dialogClose() {
+      this.showDialog = false;
+      this.$emit('update:visiable', false)
+    },
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,192 @@
+<template>
+  <el-dialog
+    :title="title"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="showWfDialog"
+    :modal="false"
+    custom-class="el-dialog dialog-style designer-dialog indexUse"
+    width="100%"
+    height="100%"
+    top="0px"
+    bottom="0px"
+    :destroy-on-close="true"
+    @close="wfClose"
+  >
+    <div id="containt">
+      <component
+        v-if="showWfContent && wfContent"
+        :is="wfContent"
+        visible-key="showWfContent"
+        v-bind="param"
+        :parent-target="_self"
+        :defaultShowWfContent="true"
+        :_viewType="1"
+        @reload="$reloadHandle"
+        @openDesignDialog="openDesingerDialogByChild"
+      ></component>
+      <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
+                 :destroy-on-close="true"
+                 size="100%" direction="rtl" :before-close="closeFormDesignwinEvent" :append-to-body="false"
+                 class="designer-drawer" :class="[isFullscreen ? 'is-fullscreen' : '']" @close="handleFormDesignClose">
+        <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
+          <el-tab-pane :label="$t1('设计器')" name="first">
+            <designer ref="designer" :formCode.sync="formCode" :readonly="true"
+                      @reflushTemplateList="reflushTemplateList"></designer>
+          </el-tab-pane>
+        </el-tabs>
+        <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
+          <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
+            <i class="iconfont icon-quanping"></i>
+          </el-tooltip>
+
+        </el-button>
+        <el-button class="isFullIcon" v-else @click="handleFullscreen">
+          <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+            <i class="iconfont icon-suoxiao"></i>
+          </el-tooltip>
+        </el-button>
+      </el-drawer>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+
+import indexUtil from "@base/utils";
+import designer from "@base/views/user/form/vform/designer.vue";
+
+export default {
+  name: "wfContentDialog",
+  props: {
+    extractedObj: Object,
+  },
+  components: {designer},
+  data() {
+    return {
+      param: {},
+      wfContent: null,
+      showWfContent: false,
+      showWfDialog: true,
+
+      showDesingerDialog: false,
+      formCode: null,
+      formName: null,
+      isFullscreen: false,
+      formDesTabs: 'first',
+      title: null
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.openWfDialog();
+    })
+  },
+  methods: {
+    wfClose() {
+      this.showWfDialog = false;
+      this.$emit('update:visible', false);
+      this.$emit('close');
+    },
+    openWfDialog() {
+      let extractedObj = this.extractedObj;
+      let objType = extractedObj.objType;
+      let obj = extractedObj.obj;
+      let id = obj.id;
+      let wfDataId = id;
+      let param = {
+        readonly: true
+      };
+
+      let url;
+      if (objType == "FormTemplate") {
+        url = "/bd/setting/form_template/edit.vue"
+        wfDataId = obj.formCode;
+        this.title = this.$t1("查看表单模板");
+      } else if (objType == "FormScript") {
+        if (obj.scriptType == 1) {
+          url = "/bd/setting/form_script/edit1.vue"
+        } else {
+          url = "/bd/setting/form_script/edit.vue"
+        }
+        this.title = this.$t1("查看表单脚本");
+      } else if (objType == "TableTemplate") {
+        url = "/bd/setting/table_model/edit.vue"
+        this.title = this.$t1("查看数据表定义模板");
+      }
+      this.param = Object.assign(param, {
+        _dataId: wfDataId
+      });
+      this.wfContent = require('@base/views' + url).default;
+
+      this.showWfContent = true;
+    },
+
+    handleFormDesignClose() {
+      this.formDesTabs = 'first';
+      this.showFormScriptList = false;
+    },
+    openDesingerDialog(row, callback) {
+      this.formCode = row.formCode;
+      this.formName = row.formName;
+      this.currentFormTemplate = row;
+      this.isFullscreen = false;
+      this.showDesingerDialog = true;
+      this.designerSaveCallback = callback ?? null;
+    },
+    openDesingerDialogByChild({row, callback}) {
+      this.openDesingerDialog(row, callback)
+    },
+    reflushTemplateList() {
+      // this.searchEvent();
+      this.designerSaveCallback && this.designerSaveCallback();
+    },
+    handleFullscreen() {
+      let isFullscreen = this.isFullscreen;
+      if (!isFullscreen) {
+        indexUtil.addClass(document.body, "hideMenu");
+      } else {
+        indexUtil.removeClass(document.body, "hideMenu");
+      }
+      this.isFullscreen = !isFullscreen;
+    },
+    closeFormDesignwinEvent(done) {
+      this.$baseConfirm(this.$t1('请确认"已保存"报表模板，是否继续关闭？')).then(() => {
+        indexUtil.removeClass(document.body, "hideMenu");
+        done && done();
+      });
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+::v-deep .tab-boxOnly > .el-tabs__header {
+  position: absolute;
+  right: 130px;
+  top: 0;
+}
+
+::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+  .detail-wrap .d-cont {
+    height: calc(100vh - 158px) !important
+  }
+
+  .grid-height {
+    height: calc(100vh - 126px) !important
+  }
+}
+
+::v-deep .designer-drawer.is-fullscreen .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+  .detail-wrap .d-cont {
+    height: calc(100vh - 116px) !important
+  }
+
+  .grid-height {
+    height: calc(100vh - 84px) !important
+  }
+}
+</style>

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

@@ -0,0 +1,83 @@
+<template>
+    <div class="watermarkFlag" :style="'background:url('+imgUrl+')'"></div>
+</template>
+<script>
+import {
+  getParameterVauleByCode,
+} from '@base/api/user'
+export default {
+  data() {
+    return {
+      imgUrl: null,
+      isFormDev:false
+    }
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    initIsFormDev() {
+      let userFlag = this.$store.getters.userFlag
+      this.isFormDev = userFlag == 6 || userFlag == 7 || userFlag == 8;
+    },
+    init() {
+      this.initIsFormDev();
+      if(this.isFormDev)return;
+      getParameterVauleByCode({
+        data: {"code": "showWatermark"},
+        success: res => {
+          let value = (!res.objx || !res.objx.value) ? "0" : res.objx.value;
+          if (value == "1") {
+            this.watermarkImg();
+          }
+        }
+      })
+    },
+    watermarkImg() {
+      let that = this
+      const testName = this.$store.getters.nickName
+      var nameL = ''
+      if (testName.match(/[^\x00-\xff]/ig) != null){
+        nameL  = testName.length
+      }else{
+        nameL  = testName.length / 2
+      }
+      // 通过canvas将文本生成图片
+      const canvas = document.createElement('canvas')
+      canvas.width = nameL * 32 * 2
+      canvas.height = nameL * 32
+      const ctx = canvas.getContext('2d')
+
+      ctx.font = '18px PingFangSC'
+      ctx.textAlign = 'center'
+      ctx.fillStyle = '#EEEEEE'
+      // 设置倾斜角度
+      ctx.rotate(-30 * Math.PI / 180)
+      // 调整偏移量，让文本完整显示
+      ctx.translate(-50, 30)
+      ctx.fillText(testName, 100, 58)
+      // 将canvas转为base64图片
+      const url = canvas.toDataURL()
+      that.imgUrl = url
+      console.log(that.imgUrl)
+    }
+  }
+}
+</script>
+<style scoped>
+.watermarkFlag {
+  /* 设置全屏宽高，覆盖于页面上方 */
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 100vh;
+  width: 100vw;
+  opacity: 0.8;
+  /* 生成的图片是有一张，开启repeat自动填充 */
+  background: repeat;
+  pointer-events: none;
+  /* 核心部分，决定水印层与内容部分的结合方式 */
+  mix-blend-mode: multiply;
+  z-index: 9999999;
+}
+</style>

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;