eoss-ui 0.4.40 → 0.4.42

package/lib/wxlogin.js

@@ -1403,7 +1403,7 @@ var isFunction = function isFunction(obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1416,7 +1416,9 @@ var isFunction = function isFunction(obj) {
  * @param {sting} [loginPage] - 第三方登录页面地址
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
-var isLogged = function isLogged(_ref8) {
+var isLogined = function isLogined(_ref8) {
+  var _this = this;
+
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1460,16 +1462,18 @@ var isLogged = function isLogged(_ref8) {
         data: to.query
       }).then(function (res) {
         if (res.rCode === 0) {
-          switch (res.results.statusCode) {
+          var results = res.results;
+
+          switch (results.statusCode) {
             case 0:
               var storage = getStorage('storage');
               setStorage({
                 type: storage,
                 key: {
-                  ssId: res.results.ssId,
-                  token: res.results.token,
-                  Authorization: res.results.token,
-                  deviceUnique: res.results.deviceUnique
+                  ssId: results.ssId,
+                  token: results.token,
+                  Authorization: results.token,
+                  deviceUnique: results.deviceUnique
                 }
               });
               next();
@@ -1479,7 +1483,7 @@ var isLogged = function isLogged(_ref8) {
             case 2:
               break;
             case 3:
-              var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {
                   case 'self':
@@ -1503,6 +1507,25 @@ var isLogged = function isLogged(_ref8) {
                 }
               }
               break;
+            case 4:
+              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+                confirmButtonText: '确定',
+                type: 'error'
+              }).then(function () {
+                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                window.location.href = delUrlParam({ key: 'code' });
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              }).catch(function (e) {});
+              break;
+            default:
           }
         } else {
           if (token) {
@@ -1531,6 +1554,9 @@ var isLogged = function isLogged(_ref8) {
     }
   }
 };
+var isLogged = function isLogged(res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2182,6 +2208,7 @@ var watermark = function watermark(option) {
   indexOfObj: indexOfObj,
   isFunction: isFunction,
   isLogged: isLogged,
+  isLogined: isLogined,
   isObject: isObject,
   jointUrl: jointUrl,
   loadJs: loadJs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.40",
+  "version": "0.4.42",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -61,6 +61,8 @@
     "qrcode": "^1.5.1",
     "qs": "^6.11.2",
     "runtime-import": "^2.2.1",
+    "slate": "^0.100.0",
+    "slate-history": "^0.100.0",
     "sm-crypto": "^0.3.11",
     "sockjs-client": "^1.6.1",
     "stompjs": "^2.3.3",

package/packages/button-group/src/main.vue

@@ -2,7 +2,7 @@
   <el-button-group class="es-button-group">
     <template v-for="(item, index) in btns">
       <es-button
-        v-if="item && !item.hide && index < length"
+        v-if="item && !item.hide"
         :stop="stop"
         v-bind="item"
         :key="index"
@@ -18,7 +18,7 @@
         :trigger="trigger"
       >
         <el-button :size="size">
-          <i class="es-icon-more"></i>
+          <i class="es-icon-omit"></i>
         </el-button>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item
@@ -63,7 +63,7 @@ export default {
       return this.getBtns();
     },
     other() {
-      return this.btns.length > this.length
+      return this.length > 0 && this.btns.length > this.length
         ? this.btns.splice(this.length - 1, this.btns.length)
         : [];
     }

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

@@ -478,6 +478,12 @@
       <!-- 按钮区域 -->
       <es-button-group
         v-if="item.type === 'handle' && !scope.row.hideHandle"
+        v-bind="
+          exclAttribute({
+            data: item,
+            attrs: ['contents', 'events', 'type', 'width', 'template', 'title']
+          })
+        "
         stop
         :contents="item.contents || item.events"
         :data="scope.row"

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

@@ -218,6 +218,9 @@ export default {
     },
     injector: {
       default: ''
+    },
+    scale: {
+      default: ''
     }
   },
   props: {
@@ -502,6 +505,15 @@ export default {
     }
   },
   watch: {
+    scale: {
+      deep: true,
+      handler(val) {
+        console.log(val, 999);
+        if (this.tableHeight != 'auto' && this.display) {
+          this.resetHeight();
+        }
+      }
+    },
     zoom: {
       handler(val) {
         if (this.tableHeight != 'auto' && this.display) {

package/packages/dialog/src/main.vue

@@ -31,7 +31,6 @@
                 attrs: ['events', 'visible', 'type', 'model']
               })
             "
-            :zoom="zoom"
             :model.sync="item.model"
             v-on="{ ...item.events }"
           ></es-form>
@@ -44,7 +43,6 @@
                 attrs: ['events', 'visible', 'type']
               })
             "
-            :zoom="zoom"
             v-on="item.events"
           >
             <template v-if="item.dialog" slot="dialog">
@@ -88,7 +86,6 @@
                 attrs: ['events', 'visible', 'type']
               })
             "
-            :zoom="zoom"
             v-on="{ ...item.events }"
           ></es-tree-group>
           <es-flow-group
@@ -112,7 +109,6 @@
                 attrs: ['events', 'visible', 'type']
               })
             "
-            :zoom="zoom"
             v-on="{ ...item.events }"
           ></es-tabs>
           <es-dialog
@@ -163,7 +159,6 @@
               attrs: ['events', 'visible', 'type', 'model']
             })
           "
-          :zoom="zoom"
           :model.sync="contents.model"
           v-on="{ ...contents.events }"
         ></es-form>
@@ -175,7 +170,6 @@
               attrs: ['events', 'visible', 'type']
             })
           "
-          :zoom="zoom"
           v-on="contents.events"
         >
           <template v-if="contents.dialog" slot="dialog">
@@ -218,7 +212,6 @@
               attrs: ['events', 'visible', 'type']
             })
           "
-          :zoom="zoom"
           v-on="{ ...contents.events }"
         ></es-tree-group>
         <es-flow-group
@@ -229,7 +222,6 @@
               attrs: ['events', 'visible', 'type']
             })
           "
-          :zoom="zoom"
           v-on="{ ...contents.events }"
         ></es-flow-group>
         <es-tabs
@@ -241,7 +233,6 @@
               attrs: ['events', 'visible', 'type']
             })
           "
-          :zoom="zoom"
           v-on="{ ...contents.events }"
         ></es-tabs>
         <iframe
@@ -281,7 +272,7 @@ export default {
   provide() {
     return {
       esDialog: this,
-      scale: this.zoom
+      scale: this.scales
     };
   },
   inject: {
@@ -380,7 +371,7 @@ export default {
       wd: '',
       ht: '',
       zoom: 1,
-      scale: {}
+      scales: { zoom: 1 }
     };
   },
   created() {
@@ -469,6 +460,7 @@ export default {
     },
     handleScale(res) {
       this.zoom = res;
+      this.$set(this.scales, 'zoom', res);
       this.$emit('scale', res);
     }
   }

package/packages/editor/src/editor.vue

@@ -0,0 +1,25 @@
+<template>
+  <el-scrollbar class="es-editor-main-box" :style="_style" ref="scrollbar">
+    <div class="es-editor-main es-editor-contents" v-html="value"></div>
+  </el-scrollbar>
+</template>
+<script>
+export default {
+  name: 'Editors',
+  props: {
+    value: String,
+    height: [String, Number]
+  },
+  computed: {
+    _style() {
+      let height = this.height ? parseInt(this.height, 10) + 'px' : '500px';
+      return { height };
+    }
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {}
+};
+</script>

package/packages/editor/src/main.vue

@@ -7,7 +7,10 @@
       v-html="model"
     ></div>
     <template v-else>
-      <Toolbars v-if="cs"></Toolbars>
+      <template v-if="cs">
+        <Toolbars></Toolbars>
+        <Editors v-model="model"></Editors>
+      </template>
       <template v-else>
         <Toolbar
           class="es-editor-toolbar"
@@ -30,10 +33,11 @@
 <script>
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 import Toolbars from './toolbar.vue';
+import Editors from './editor.vue';
 export default {
   name: 'EsEditor',
   inheritAttrs: false,
-  components: { Editor, Toolbar, Toolbars },
+  components: { Editor, Toolbar, Toolbars, Editors },
   inject: {
     elForm: {
       default: ''

package/packages/editor/src/minx.js

@@ -12,7 +12,7 @@ export default {
         [
           {
             tips: '粗体',
-            path: ['M894.6 907.1H605.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C752.7 180.4 711.3 315.8 711.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z m-472 0H133.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C280.7 180.4 239.3 315.8 239.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z']
+            path: ['M707.872 484.64A254.88 254.88 0 0 0 768 320c0-141.152-114.848-256-256-256H192v896h384c141.152 0 256-114.848 256-256a256.096 256.096 0 0 0-124.128-219.36zM384 192h101.504c55.968 0 101.504 57.408 101.504 128s-45.536 128-101.504 128H384V192z m159.008 640H384v-256h159.008c58.464 0 106.016 57.408 106.016 128s-47.552 128-106.016 128z']
           },
           {
             tips: '下划线',
@@ -28,7 +28,7 @@ export default {
           },
           {
             path: ['M204.8 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z', 'M505.6 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z', 'M806.4 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z'],
-            type: 'tag',
+            type: 'tag2',
             dropdown: [
               {
                 tips: '删除线',
@@ -58,20 +58,25 @@ export default {
             ]
           },
           {
-            colors: true,
-            tips: '文字颜色'
+            colors: {
+              tips: '文字颜色'
+            },
+            popover: true,
+            path: ['M64 864h896v96H64zM360.58 576h302.85l81.53 224h102.16L579.24 64H444.77L176.89 800h102.16l81.53-224zM512 159.96L628.49 480H395.52L512 159.96z']
           },
           {
-            colors: true,
-            tips: '背景颜色',
-            title: '清除背景色',
+            colors: {
+              tips: '背景颜色',
+              title: '清除背景色'
+            },
+            popover: true,
             path: ['M510.030769 315.076923l84.676923 196.923077h-177.230769l76.8-196.923077h15.753846zM945.230769 157.538462v708.923076c0 43.323077-35.446154 78.769231-78.769231 78.769231H157.538462c-43.323077 0-78.769231-35.446154-78.769231-78.769231V157.538462c0-43.323077 35.446154-78.769231 78.769231-78.769231h708.923076c43.323077 0 78.769231 35.446154 78.769231 78.769231z m-108.307692 643.938461L600.615385 216.615385c-5.907692-11.815385-15.753846-19.692308-29.538462-19.692308h-139.815385c-11.815385 0-23.630769 7.876923-27.56923 19.692308l-216.615385 584.861538c-3.938462 11.815385 3.938462 25.6 17.723077 25.6h80.738462c11.815385 0 23.630769-9.846154 27.56923-21.661538l63.015385-175.261539h263.876923l68.923077 175.261539c3.938462 11.815385 15.753846 21.661538 27.569231 21.661538h80.738461c13.784615 0 23.630769-13.784615 19.692308-25.6z']
           }
         ],
         [
           { tips: '字号', value: this.fontSize, trigger: 'click', dropdown: this._fontSizes, type: 'fontSize' },
           { tips: '字体', value: this.fontFamily, trigger: 'click', dropdown: this._fontFamilys, type: 'fontFamily' },
-          { tips: '字体', value: this.lineHeight, trigger: 'click', dropdown: this._lineHeights, type: 'lineHeight' }
+          { tips: '行高', value: this.lineHeight, trigger: 'click', dropdown: this._lineHeights, type: 'lineHeight' }
         ],
         [
           {
@@ -127,6 +132,7 @@ export default {
         [
           {
             emojis: true,
+            popover: true,
             tips: '表情',
             path: ['M512 1024C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z m0-102.4c226.742857 0 409.6-182.857143 409.6-409.6S738.742857 102.4 512 102.4 102.4 285.257143 102.4 512s182.857143 409.6 409.6 409.6z m-204.8-358.4h409.6c0 113.371429-91.428571 204.8-204.8 204.8s-204.8-91.428571-204.8-204.8z m0-102.4c-43.885714 0-76.8-32.914286-76.8-76.8s32.914286-76.8 76.8-76.8 76.8 32.914286 76.8 76.8-32.914286 76.8-76.8 76.8z m409.6 0c-43.885714 0-76.8-32.914286-76.8-76.8s32.914286-76.8 76.8-76.8c43.885714 0 76.8 32.914286 76.8 76.8s-32.914286 76.8-76.8 76.8z']
           },
@@ -166,10 +172,12 @@ export default {
           {
             table: true,
             tips: '插入表格',
+            popover: true,
             path: ['M0 64v896h1024V64H0z m384 576v-192h256v192h-256z m256 64v192h-256v-192h256z m0-512v192h-256V192h256zM320 192v192H64V192h256z m-256 256h256v192H64v-192z m640 0h256v192h-256v-192z m0-64V192h256v192h-256zM64 704h256v192H64v-192z m640 192v-192h256v192h-256z']
           },
           {
             tips: '代码块',
+            viewBox: '0 0 1280 1024',
             path: ['M832 736l96 96 320-320L928 192l-96 96 224 224zM448 288l-96-96L32 512l320 320 96-96-224-224zM701.312 150.528l69.472 18.944-192 704.032-69.472-18.944 192-704.032z']
           },
           {