eoss-ui 0.5.75 → 0.5.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.75",
+  "version": "0.5.76",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.100",
+    "eoss-element": "^0.2.102",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/data-table/src/main.vue

@@ -447,7 +447,8 @@ export default {
         pageSize: 20,
         totalCount: 0
       },
-      wheres: {},
+      searchWhere: {},
+      advanceWhere: {},
       tableHeight: 'auto',
       styles: {},
       selected: null,
@@ -460,6 +461,9 @@ export default {
     };
   },
   computed: {
+    wheres() {
+      return { ...this.searchWhere, ...this.advanceWhere };
+    },
     params() {
       return {
         ...(this.param || {}),
@@ -1408,7 +1412,7 @@ export default {
       this.$emit('next', res);
     },
     hanleSearch(data) {
-      this.wheres =
+      this.searchWhere =
         this.response !== undefined
           ? this.response({
               type: 'search',
@@ -1418,37 +1422,34 @@ export default {
       if (this.url && this.executeSearch) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('search', this.wheres);
+      this.$emit('search', this.searchWhere);
     },
     hanleReset() {
+      this.searchWhere = {};
+      this.advanceWhere = {};
       if (this.url) {
-        this.wheres = {};
         this.getTableData();
       }
       this.$emit('reset', this.params);
     },
     hanleSubmit({ data, show }) {
-      let where =
+      this.advanceWhere =
         this.response !== undefined
           ? this.response({
               type: 'filter',
               data: JSON.parse(JSON.stringify(data))
             })
           : data;
-      this.wheres = {
-        ...this.wheres,
-        ...where
-      };
       if (this.url && this.executeFilter) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('submit', { data: where, where: this.wheres, show });
+      this.$emit('submit', {
+        data: this.advanceWhere,
+        where: this.wheres,
+        show
+      });
     },
     hanleCancel() {
-      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
-      //   this.wheres = {};
-      //   this.getTableData();
-      // }
       this.$emit('cancel', this.params);
     },
     handleTabs({ item, index }) {

package/packages/flow-list/src/main.vue

@@ -8,7 +8,10 @@
         (item.type == 'splitReading' &&
           splitReadingData &&
           splitReadingData.length > 0) ||
-        (item.type == 'preset' && presetData && presetData.length > 0 && currentUserHasPresetInfoAuth) ||
+        (item.type == 'preset' &&
+          presetData &&
+          presetData.length > 0 &&
+          currentUserHasPresetInfoAuth) ||
         (item.type != 'splitReading' && item.type != 'preset')
       "
     >
@@ -128,7 +131,7 @@ export default {
       pressTableList: [],
       currentPage: 1,
       pageSize: 20,
-      currentUserHasPresetInfoAuth:false,
+      currentUserHasPresetInfoAuth: false,
       pressThead: [
         {
           title: '催办节点',
@@ -321,7 +324,7 @@ export default {
             label: '经办部门',
             field: 'deptid',
             align: 'center',
-            key:'jbbm',
+            key: 'jbbm',
             showOverflowTooltip: true,
             width: 150
           },
@@ -329,7 +332,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
-            key:'bz',
+            key: 'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -337,7 +340,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
-            key:'blr',
+            key: 'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -346,13 +349,13 @@ export default {
             field: 'deptName',
             align: 'center',
             showOverflowTooltip: true,
-            key:'blrbm',
+            key: 'blrbm',
             width: 110
           },
           {
             label: '状态',
             field: 'pendstate',
-            key:'zt',
+            key: 'zt',
             align: 'center',
             showOverflowTooltip: true,
             width: 80,
@@ -375,20 +378,25 @@ export default {
             field: 'doresult',
             align: 'center',
             showOverflowTooltip: true,
-            key:'blyj',
+            key: 'blyj',
             render: (h, params) => {
-              return h(
-                'span',
-                {},
-                params.row.doresult || params.row.handleInfo
-              );
+              return h('span', {}, [
+                params.row.doresult
+                  ? params.row.doresult + (params.row.handleInfo ? '&' : '')
+                  : '',
+                h(
+                  'span',
+                  { style: { color: '#A5A5A5', marginLeft: '2px' } },
+                  params.row.handleInfo || ''
+                )
+              ]);
             }
           },
           {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
-            key:'yq',
+            key: 'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -401,7 +409,7 @@ export default {
           },
           {
             label: '附件',
-            key:'fj',
+            key: 'fj',
             field: 'hasAdjunct',
             align: 'center',
             showOverflowTooltip: true,
@@ -423,14 +431,16 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
-            key:'sj',
+            key: 'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
               return h(
                 'span',
                 {},
-               params.row.doetime ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm') : ''
+                params.row.doetime
+                  ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm')
+                  : ''
               );
             }
           },
@@ -438,7 +448,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
-            key:'dbr',
+            key: 'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -447,7 +457,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
-            key:'cb',
+            key: 'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -484,7 +494,7 @@ export default {
           {
             label: '经办部门',
             field: 'deptid',
-            key:'jbbm',
+            key: 'jbbm',
             align: 'center',
             showOverflowTooltip: true,
             width: 150
@@ -493,7 +503,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
-            key:'bz',
+            key: 'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -501,7 +511,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
-            key:'blr',
+            key: 'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -509,7 +519,7 @@ export default {
             label: '状态',
             field: 'pendstate',
             align: 'center',
-            key:'zt',
+            key: 'zt',
             showOverflowTooltip: true,
             width: 80,
             render: (h, params) => {
@@ -530,21 +540,26 @@ export default {
             label: '办理意见',
             field: 'doresult',
             align: 'center',
-            key:'blyj',
+            key: 'blyj',
             showOverflowTooltip: true,
             render: (h, params) => {
-              return h(
-                'span',
-                {},
-                params.row.doresult || params.row.handleInfo
-              );
+              return h('span', {}, [
+                params.row.doresult
+                  ? params.row.doresult + (params.row.handleInfo ? '&' : '')
+                  : '',
+                h(
+                  'span',
+                  { style: { color: '#A5A5A5', marginLeft: '2px' } },
+                  params.row.handleInfo || ''
+                )
+              ]);
             }
           },
           {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
-            key:'yq',
+            key: 'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -559,7 +574,7 @@ export default {
             label: '附件',
             field: 'hasAdjunct',
             align: 'center',
-            key:'fj',
+            key: 'fj',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -579,14 +594,16 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
-            key:'sj',
+            key: 'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
               return h(
                 'span',
                 {},
-                params.row.doetime ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm') : ''
+                params.row.doetime
+                  ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm')
+                  : ''
               );
             }
           },
@@ -594,7 +611,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
-            key:'dbr',
+            key: 'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -603,7 +620,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
-            key:'cb',
+            key: 'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -988,11 +1005,11 @@ export default {
             this.isShort = isShort;
             this.taskReadName = taskReadName;
             this.flowData = wfHistoryList;
-            this.flowData.map(x => {
-              if(!x.deptid){
-                x.deptid = x.deptName
+            this.flowData.map((x) => {
+              if (!x.deptid) {
+                x.deptid = x.deptName;
               }
-            })
+            });
             this.splitReadingData = fyHistoryList;
             this.modify = modify;
             this.show = true;
@@ -1111,13 +1128,18 @@ export default {
           const {
             status,
             message,
-            data: { presetInfoList, presetInfoListHiddenColumns, canDelete,currentUserHasPresetInfoAuth }
+            data: {
+              presetInfoList,
+              presetInfoListHiddenColumns,
+              canDelete,
+              currentUserHasPresetInfoAuth
+            }
           } = res;
           this.loading.close();
           if (status == 'success') {
             presetInfoList && (this.presetData = presetInfoList);
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
-            this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth
+            this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
             this.canDelete = canDelete;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');

package/packages/login/src/main.vue

@@ -12,19 +12,25 @@
       element-loading-text="登录中..."
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.65)"
-      :class="{ 'es-simple': mode == 'simple' }"
+      :class="{
+        'es-simple': mode == 'simple',
+        'es-adaptive': !isScale
+      }"
       :style="transform"
     >
       <img v-if="loginNameImg" class="es-login-name" :src="loginNameImg" />
-      <div class="es-login-main" :style="getBackground(loginMainImg)">
-        <div v-if="loginTitleImg" class="es-login-title-image">
-          <img class="es-login-title-img" :src="loginTitleImg" />
-        </div>
+      <div
+        class="es-login-main"
+        :style="getBackground(loginMainImg)"
+        :class="{
+          'es-switchs': switchs > 2
+        }"
+      >
         <div
           v-if="switchs > 1"
           :class="{
             'es-login-switch': switchs == 2,
-            'es-login-switchs': switchs > 2
+            'es-login-switchs': switchs > 2 || (switchs == 2 && loginTitleImg)
           }"
         >
           <i
@@ -40,9 +46,16 @@
             ]"
           ></i>
         </div>
+        <div v-if="loginTitleImg" class="es-login-title-image">
+          <img class="es-login-title-img" :src="loginTitleImg" />
+        </div>
         <div class="es-login-form-box">
           <template v-if="isShow(active) && (active == 0 || active == 12)">
-            <el-form ref="login" class="es-login-form" :model="formData">
+            <el-form
+              :ref="'login' + active"
+              class="es-login-form"
+              :model="formData"
+            >
               <template v-if="!loginTitleImg">
                 <slot name="login-title" :type="active">
                   <div class="es-login-title">
@@ -128,7 +141,7 @@
                       >{{ btnText }}</el-button
                     >
                     <img
-                      v-show="imgCode && active == 0"
+                      v-show="imgCode && (active == '0' || active == '12')"
                       class="es-img-code"
                       :src="imageCode"
                       @click.stop="getImgCode"
@@ -189,12 +202,13 @@
               <es-qr-code
                 :content="identifyingId"
                 :logo="qrimg"
+                auto
                 v-if="active == 3 && identifyingId"
               ></es-qr-code>
               <div class="es-wx-qrcode-box" v-if="active == 9">
                 <es-wxlogin
                   href="data:text/css;base64,LmltcG93ZXJCb3ggLnFyY29kZSB7CiAgICB3aWR0aDogMTAwJSAhaW1wb3J0YW50OwogICAgYm94LXNpemluZzogYm9yZGVyLWJveCAhaW1wb3J0YW50OwogICAgbWFyZ2luOiAwICFpbXBvcnRhbnQ7Cn0KCi5pbXBvd2VyQm94IC5pbmZvLAouaW1wb3dlckJveCAudGl0bGUgewogICAgZGlzcGxheTogbm9uZSAhaW1wb3J0YW50Owp9"
-                  height="300px"
+                  auto
                   :appid="wechatAppid"
                   :scope="wechatScope"
                   :redirect_uri="redirectUri"
@@ -204,7 +218,7 @@
           </template>
           <template v-if="isShow(active) && (active == 6 || active == 11)">
             <el-form
-              ref="login"
+              :ref="'login' + active"
               class="es-login-form es-login-verify"
               :model="formData"
             >
@@ -568,10 +582,7 @@ export default {
       type: Number,
       default: 1500
     },
-    isScale: {
-      type: Boolean,
-      default: true
-    }
+    isScale: Boolean
   },
   computed: {
     transform() {
@@ -961,8 +972,6 @@ export default {
       }
     },
     switchLogin(res) {
-      //this.$refs.login && this.$refs.login.resetFields();
-      this.$refs.login && this.$refs.login.clearValidate();
       if (res != 1) {
         this.active = res.type;
         this.title = res.name;
@@ -971,6 +980,10 @@ export default {
       }
       this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
+      this.$nextTick(() => {
+        let ref = 'login' + this.active;
+        this.$refs[ref] && this.$refs[ref].clearValidate();
+      });
     },
     isShow(res) {
       return this.loginModel.indexOf(res) > -1;
@@ -1031,7 +1044,9 @@ export default {
       this.setup = res.setup;
       this.sysName = res.subsystemName;
       this.downloadSetup = res.downloadSetup;
-      document.title = res.subsystemName;
+      if (res.subsystemName) {
+        document.title = res.subsystemName;
+      }
       this.app = res.appName || res.subsystemName;
       if (res.qrimg || res.qrImg) {
         this.qrimg = res.qrimg || res.qrImg;

package/packages/qr-code/src/main.vue

@@ -1,25 +1,27 @@
 <template>
   <div class="es-qrcode-box" id="qrcode" ref="qrcode">
-    <img
-      class="es-qrcode-img"
-      :width="_width"
-      :height="_height"
-      ref="qrcodeImg"
-      alt="二维码图片"
-    />
-    <!-- <img
+    <template v-if="mwidth && mheight">
+      <img
+        class="es-qrcode-img"
+        :width="mwidth"
+        :height="mheight"
+        ref="qrcodeImg"
+        alt="二维码图片"
+      />
+      <!-- <img
       v-if="logo"
       class="es-qrcode-logo"
       ref="qrcodeLogo"
       :src="logo"
       alt="二维码logo"
     /> -->
-    <canvas
-      :width="_width"
-      :height="_height"
-      class="canvas"
-      ref="canvas"
-    ></canvas>
+      <canvas
+        :width="mwidth"
+        :height="mheight"
+        class="canvas"
+        ref="canvas"
+      ></canvas>
+    </template>
   </div>
 </template>
 
@@ -35,8 +37,14 @@ export default {
     },
     logo: String,
     text: String,
-    width: Number,
-    height: Number,
+    width: {
+      type: Number,
+      default: 300
+    },
+    height: {
+      type: Number,
+      default: 300
+    },
     auto: Boolean,
     option: {
       type: Object,
@@ -51,22 +59,12 @@ export default {
       }
     }
   },
-  computed: {
-    _width() {
-      if (this.auto) {
-        return this.$refs.qrcode.offsetWidth;
-      }
-      return this.width ? this.width : 300;
-    },
-    _height() {
-      if (this.auto) {
-        return this.$refs.qrcode.offsetHeight;
-      }
-      return this.height ? this.height : 300;
-    }
-  },
+  computed: {},
   data() {
-    return {};
+    return {
+      mwidth: 0,
+      mheight: 0
+    };
   },
   watch: {
     logo: function (val) {
@@ -85,6 +83,19 @@ export default {
   },
   created() {},
   mounted() {
+    if (this.auto) {
+      let h =
+        this.$refs.qrcode.offsetHeight -
+        parseInt(util.getStyle(this.$refs.qrcode, 'padding-top'), 10) -
+        parseInt(util.getStyle(this.$refs.qrcode, 'padding-bottom'), 10);
+      if (h > 0) {
+        this.mwidth = h;
+        this.mheight = h;
+      }
+    } else {
+      this.mwidth = this.width;
+      this.mheight = this.height;
+    }
     this.$nextTick(() => {
       this.createQRCode();
     });
@@ -95,8 +106,8 @@ export default {
       //let qrcodeLogo = this.$refs.qrcodeLogo;
       let canvas = this.$refs.canvas;
       let option = util.extend({}, this.option, {
-        width: this._width,
-        height: this._height
+        width: this.mwidth,
+        height: this.mheight
       });
       if (!qrcodeImg) {
         return false;
@@ -108,12 +119,12 @@ export default {
           let ctx = canvas.getContext('2d');
           setTimeout(() => {
             //获取图片
-            ctx.drawImage(qrcodeImg, 0, 0, this._width, this._height);
+            ctx.drawImage(qrcodeImg, 0, 0, this.mwidth, this.mheight);
             if (this.logo && this.logo.indexOf('.') > -1) {
               let logo = new Image();
               logo.src = this.logo;
               //设置logo大小
-              let logoPosition = (this._width - 46) / 2; //logo相对于canvas居中定位
+              let logoPosition = (this.mwidth - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
               /* ctx.fillStyle = "#fff";
 							ctx.beginPath();
@@ -138,8 +149,8 @@ export default {
               let fpadd = 10; //规定内间距
               ctx.font = 'bold 16px Arial';
               let tw = ctx.measureText(this.text).width; //文字真实宽度
-              let ftop = (this._height - 16) / 2; //根据字体大小计算文字top
-              let fleft = (this._width - tw) / 2; //根据字体大小计算文字left
+              let ftop = (this.mheight - 16) / 2; //根据字体大小计算文字top
+              let fleft = (this.mwidth - tw) / 2; //根据字体大小计算文字left
               let tp = 16 / 2; //字体边距为字体大小的一半可以自己设置
               ctx.fillStyle = '#fff';
               ctx.fillRect(fleft - tp / 2, ftop - tp / 2, tw + tp, 16 + tp);