eoss-ui 0.4.39 → 0.4.41

package/packages/theme-chalk/src/editor.scss

@@ -5,10 +5,30 @@
     position: relative;
     display: flex;
     padding: 0 4px;
+    flex-wrap: wrap;
     border-bottom: $--border-base;
+    .es-editor-toolbar-item-box {
+      height: 40px;
+      display: inline-flex;
+      & + .es-editor-toolbar-item-box {
+        .es-editor-toolbar-item {
+          &:first-child {
+            border-left: $--border-base;
+          }
+        }
+      }
+    }
     .es-editor-toolbar-item {
       height: 40px;
       padding: 4px;
+      &.es-last {
+        border-right: $--border-base;
+      }
+      .es-icon-text {
+        & + .el-icon--right {
+          width: auto;
+        }
+      }
     }
     .el-button--default {
       border: 0;
@@ -17,6 +37,9 @@
         color: #333;
         background-color: #f1f1f1;
       }
+      &.es-icon-right {
+        padding-right: 3px;
+      }
     }
   }
   .es-editor-main {

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

@@ -67,7 +67,6 @@
         <es-form
           v-if="form"
           v-bind="form"
-          :zoom="zoom"
           :ref="form.ref ? form.ref : 'esForm'"
           v-on="{ ...$listeners, ...form.events }"
         >
@@ -84,7 +83,6 @@
           size="mini"
           v-bind="{ close: true, ...table }"
           :param="param"
-          :zoom="zoom"
           :ref="table.ref ? table.ref : 'esDataTable'"
           v-on="{ ...$listeners, ...table.events }"
         >

package/packages/upload/src/main.vue

@@ -81,27 +81,31 @@
           ></i>
         </template>
         <template v-else>
-          <i
-            class="el-icon-plus es-uploader-icon"
-            v-if="selectType === 'icon-plus'"
-          ></i>
-          <el-button
-            v-else
-            class="es-upload-button"
-            :class="icon"
-            :type="selectType"
-            :size="btnSize"
-            >{{ text ? text : autoUpload ? '点击上传' : '选择文件' }}</el-button
-          >
-          <el-button
-            class="es-upload-button"
-            v-if="!autoUpload"
-            :type="uploadType"
-            :size="btnSize"
-            @click.stop="handleUpload"
-          >
-            上传文件
-          </el-button>
+          <template v-if="!isDisabled">
+            <i
+              class="el-icon-plus es-uploader-icon"
+              v-if="selectType === 'icon-plus'"
+            ></i>
+            <el-button
+              v-else
+              class="es-upload-button"
+              :class="icon"
+              :type="selectType"
+              :size="btnSize"
+              >{{
+                text ? text : autoUpload ? '点击上传' : '选择文件'
+              }}</el-button
+            >
+            <el-button
+              class="es-upload-button"
+              v-if="!autoUpload"
+              :type="uploadType"
+              :size="btnSize"
+              @click.stop="handleUpload"
+            >
+              上传文件
+            </el-button>
+          </template>
           <el-button
             v-if="showFileList && isDownloads"
             slot="handle"
@@ -440,10 +444,12 @@ export default {
       };
     },
     isRequiredOwnId() {
+      if (this.requiredOwnId !== undefined) {
+        return this.requiredOwnId;
+      }
       if (!this.fileList || !this.fileList.length) {
         return true;
       }
-      return this.requiredOwnId;
     },
     show() {
       if ((this.photo && typeof this.photo === 'string') || this.value) {
@@ -1062,7 +1068,9 @@ export default {
           this.$message.success(response.msg);
         }
       }
-      let se = this.filesTotalSize + Math.ceil((file.size / 1024) * 100) / 100;
+      let se =
+        this.filesTotalSize +
+        (this.resultFile ? Math.ceil((file.size / 1024) * 100) / 100 : 0);
       this.filesTotalSize = se;
       this.onSuccess && this.onSuccess(response, file, fileList);
       this.$emit('success', response, file, fileList);

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.39',
+  version: '0.4.41',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -1364,7 +1364,7 @@ const isFunction = function (obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1377,7 +1377,7 @@ const isFunction = function (obj) {
  * @param {sting} [loginPage] - 第三方登录页面地址
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
-const isLogged = function ({
+const isLogined = function ({
   to,
   from,
   next,
@@ -1423,16 +1423,17 @@ const isLogged = function ({
         data: to.query
       }).then(res => {
         if (res.rCode === 0) {
-          switch (res.results.statusCode) {
+          let { results } = res;
+          switch (results.statusCode) {
             case 0:
               const 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();
@@ -1442,7 +1443,7 @@ const isLogged = function ({
             case 2:
               break;
             case 3:
-              const href = res.results.authorizeUrl.replace(
+              const href = results.authorizeUrl.replace(
                 '{redirectUri}',
                 encodeURIComponent(url)
               );
@@ -1469,6 +1470,34 @@ const isLogged = function ({
                 }
               }
               break;
+        case 4:
+          this.$alert(
+            results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！',
+            '提示',
+            {
+              confirmButtonText: '确定',
+              type: 'error'
+            }
+          )
+            .then(() => {
+              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((e) => {});
+              break;
+            default:
           }
         } else {
           if (token) {
@@ -1504,6 +1533,9 @@ const isLogged = function ({
     }
   }
 };
+const isLogged = function (res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2137,6 +2169,7 @@ export default {
   indexOfObj,
   isFunction,
   isLogged,
+  isLogined,
   isObject,
   jointUrl,
   loadJs,