eoss-ui 0.5.81-beta27 → 0.5.81-beta29

package/lib/wxlogin.js

@@ -152,6 +152,7 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {String} [publicKey] - sm2加密公钥
  * @param {Array} [secret] - 要加密的字段属性名称，默认所有
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
+ * @param {Array} [oldmode] - 老接口转新数据结构
  **/
 // 请求
 // const pendingRequest = new Map();
@@ -184,8 +185,8 @@ var ajax = function ajax(_ref) {
       loading = _ref.loading,
       publicKey = _ref.publicKey,
       secret = _ref.secret,
-      _ref$encodes = _ref.encodes,
-      encodes = _ref$encodes === undefined ? ['cd'] : _ref$encodes;
+      encodes = _ref.encodes,
+      oldmode = _ref.oldmode;
 
   var header = headers || {};
   if (!method) {
@@ -486,6 +487,9 @@ var ajax = function ajax(_ref) {
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
+  if (oldmode && !header['api-response-mode']) {
+    header['api-response-mode'] = true;
+  }
   return http({
     method: method,
     url: url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.81-beta27",
+  "version": "0.5.81-beta29",
   "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.3.20",
+    "eoss-element": "^0.3.21",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/handle-user/src/main.vue

@@ -14,8 +14,9 @@
         <el-dropdown
           trigger="click"
           v-else
-          @command="handleChange"
           placement="bottom-start"
+          @command="handleChange"
+          @visible-change="handleVisibleChange"
         >
           <div class="es-user-job es-pointer" :title="job.name">
             {{ job.name }}<i class="es-icon-tri-down"></i>
@@ -124,6 +125,9 @@ export default {
           });
         this.$emit('change', item);
       }
+    },
+    handleVisibleChange(res) {
+      this.$emit('visible-change', res);
     }
   }
 };

package/packages/handler/src/main.vue

@@ -12,6 +12,7 @@
         :data="item"
         :userModel="userModel"
         :job-scrollbar="jobScrollbar"
+        @visible-change="handleVisibleChange"
         @click="handleClick"
         @change="handleChange"
       ></es-handle-user>
@@ -362,6 +363,9 @@ export default {
             });
         })
         .catch((e) => {});
+    },
+    handleVisibleChange(res) {
+      this.$emit('visible-change', res);
     }
   }
 };

package/packages/main/src/default/index.vue

@@ -41,6 +41,7 @@
         :notice="notice"
         :data="handleData"
         :max-height="_maxHeight"
+        @visible-change="handleVisibleChange"
         @change="handleJobChange"
         @select="
           (res) => {
@@ -120,7 +121,7 @@
             "
           ></es-menu>
         </div>
-        <div class="es-body">
+        <div class="es-body" :class="{ 'es-body-wrapper': showJobs }">
           <div
             class="es-body-main"
             v-loading="pageLoading"
@@ -574,6 +575,7 @@ export default {
   },
   data() {
     return {
+      showJobs: false,
       layout: this.scene.toLowerCase(),
       themeJSON: {
         logo: { comp: '', data: {} },
@@ -1315,7 +1317,10 @@ export default {
               this.tabsId = tab.id;
               this.handleJump(tab.url, tab.urlopenmode, tab);
             }
-          } else {
+          } else if (
+            this.tabs[0].urlopenmode !== 1 &&
+            this.tabs[0].urlopenmode !== 2
+          ) {
             this.tabsId = this.tabs[0].id;
             this.handleJump(
               this.tabs[0].url,
@@ -1324,7 +1329,7 @@ export default {
             );
           }
         }
-      } else {
+      } else if (obj.urlopenmode !== 1 && obj.urlopenmode !== 2) {
         this.tabs = [];
         this.handleJump(obj.url, obj.urlopenmode, obj);
       }
@@ -1483,6 +1488,9 @@ export default {
       let _url = params._baseUrl ? params._baseUrl : './primary.html';
       return util.urlJoinParams({ url: _url, param: obj });
     },
+    handleVisibleChange(res) {
+      this.showJobs = res;
+    },
     //应用导航交互
     handleSelect(res, type, open) {
       const { node, fourthTabs } = res;

package/packages/main/src/simplicity/index.vue

@@ -1131,7 +1131,7 @@ export default {
         obj.fourthTabs[openIdex]
       ) {
         return this.getFirst(obj.fourthTabs[openIdex]);
-      } else if (obj.url) {
+      } else if (obj.url && obj.urlopenmode !== 1 && obj.urlopenmode !== 2) {
         return obj;
       }
     },