cloud-web-corejs 1.0.250 → 1.0.252

package/src/views/user/form/vform/formFieldMapping.js

@@ -129,10 +129,9 @@ export const formFieldMapping = {
   },
 
   'AreaSelect': {
-    type: 'cascader',
+    type: 'area-select',
     options: {
-      areaDataEnabled: true,  //是否加载省市区数据
-      areaDataType: 2, //0不开启，1加载省市数据，2加载省市区数据
+      areaDataType: 2,
     }
   },
 

package/src/views/user/form/vform/render.vue

@@ -59,6 +59,14 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    dataTableSearch() {
+      let gridRef = this.$refs.vFormRef.getGridWidgetRef()
+      if(!gridRef)return
+      let options = gridRef.widget.options;
+      if(options.searchOnSwitchTab && options.isQueryTable){
+        gridRef.searchEvent();
+      }
+    },
     initReportCode() {
       let code = this.$attrs.formCode;
       if (!code) {

package/src/views/user/system_notice/infoDialog.vue

@@ -12,7 +12,19 @@
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
+    :fullscreen="isFullscreen"
+    ref="dialog"
   >
+    <el-button class="isFullIcon" v-if="!isFullscreen" @click="changeFullscreen(true)">
+      <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="changeFullscreen(false)">
+      <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+        <i class="iconfont icon-suoxiao"></i>
+      </el-tooltip>
+    </el-button>
     <div class="n-list">
       <div class="item" v-for="(item, index) in page.records" :key="index" :class="{ on: currentIndex == index }"
            @click="checkLine(item, index)">
@@ -69,6 +81,7 @@ export default {
     var that = this;
     return {
       showDialog: true,
+      isFullscreen: true,
       falseValue: false,
       selectMulti: true,
       page: {
@@ -89,6 +102,23 @@ export default {
     }
   },
   methods: {
+    changeFullscreen(val) {
+      this.isFullscreen = val;
+      // 退出全屏后，el-dialog-center 指令只在 bind 时设置过 margin-top，
+      // 需要在此重新计算，使弹框恢复垂直居中
+      this.$nextTick(() => {
+        let wrapper = this.$refs.dialog && this.$refs.dialog.$el;
+        let dialogEl = wrapper && wrapper.querySelector('.el-dialog');
+        if (!dialogEl) return;
+        if (val) {
+          dialogEl.style['margin-top'] = '';
+        } else {
+          let autoTop = (document.body.offsetHeight - dialogEl.offsetHeight) / 2;
+          if (autoTop < 0) autoTop = 0;
+          dialogEl.style['margin-top'] = autoTop + 'px';
+        }
+      });
+    },
     dialogClose() {
       this.$emit('update:visiable', false);
     },
@@ -140,7 +170,7 @@ export default {
       this.currentRow = item;
       this.handleRead(index)
     },
-    handleRead(index, callback) {
+    handleRead(index, callback) {
       if(this.page.records.length <= index)return
       let row = this.page.records[index];
       if (row.readed !== 1) {
@@ -177,4 +207,33 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+::v-deep .dialog-style.news-box {
+  .isFullIcon {
+    position: absolute;
+    top: 0;
+    right: 58px;
+    height: 42px;
+    padding: 0 14px;
+    border: none !important;
+    background: none !important;
+    box-shadow: none !important;
+    color: #464646;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    > span {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      line-height: 1;
+    }
+    .iconfont {
+      font-size: 18px;
+      line-height: 1;
+      position: relative;
+      top: 1px;
+    }
+  }
+}
+</style>