eoss-mobiles 0.2.44 → 0.2.46

package/lib/uploader.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 24);
+/******/ 	return __webpack_require__(__webpack_require__.s = 25);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 24:
+/***/ 25:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/utils/axios.js

@@ -30,14 +30,14 @@ var ajax = function ajax(url) {
     baseURL: apiUrl,
     timeout: 60000,
     headers: {
-      // clientKey: 'csjk'
+      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
     },
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
     if ((params.params || params) instanceof FormData === false) {
       if (type === 'post' && !format) {
-        config.params = _qs2.default.stringify(params.params || params);
+        config.data = _qs2.default.stringify(params.params || params);
         if (!config.headers['content-type'] && !headers['Content-Type']) {
           config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
         }
@@ -88,6 +88,7 @@ var ajax = function ajax(url) {
     if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
       delete config.headers.deviceId;
     }
+
     return config;
   }, function (error) {
     return Promise.error(error);
@@ -192,7 +193,6 @@ var base = {
     }, headers, format);
   },
   post: function post(url, params, headers, format) {
-    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || _util2.default.getStorage('userId');
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.44",
+  "version": "0.2.46",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [
@@ -69,6 +69,8 @@
     "v-tap": "3.0.3",
     "video.js": "^8.0.4",
     "vue-esign": "^1.0.5",
+    "vue-touch": "^2.0.0-beta.4",
+    "vuedraggable": "^2.24.3",
     "wujie-vue2": "^1.0.5"
   },
   "peerDependencies": {

package/packages/flow/src/components/Handle.vue

@@ -21,7 +21,9 @@
           :isOpinionRequired="isOpinionRequired"
           :disabled="isBanInputOpinion != 0"
           :baseUrl="baseUrl"
-          :isForceDisplayDefaultOptionForPrefix="isForceDisplayDefaultOptionForPrefix"
+          :isForceDisplayDefaultOptionForPrefix="
+            isForceDisplayDefaultOptionForPrefix
+          "
           :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
@@ -444,7 +446,7 @@ import Opinion from './Opinion.vue';
 import Reject from './Reject.vue';
 import Message from './Message.vue';
 import FlowMix from '../flowMix';
-import $ from '../../../../src/utils/util'
+import $ from '../../../../src/utils/util';
 export default {
   name: 'Handle',
   inheritAttrs: false,
@@ -467,9 +469,9 @@ export default {
       type: [String, Number],
       default: 0
     },
-    isAllCheck:{
-      type:Boolean,
-      default:false
+    isAllCheck: {
+      type: Boolean,
+      default: false
     },
     esign: {
       type: Boolean,
@@ -493,7 +495,7 @@ export default {
       objType: 'enterprise', //树点击对象
       selectType: 'employee', // 树 选择类型
       isNextBox: true, // 是否展开隐藏下步操作
-      isForceDisplayDefaultOptionForPrefix:false,
+      isForceDisplayDefaultOptionForPrefix: false,
       isOtherUnit: true, //是否是外单位
       isShowNode: false,
       subProcessInfo: '',
@@ -738,7 +740,7 @@ export default {
         },
         type: 'post',
         params: formData,
-        format:false
+        format: false
       })
         .then(res => {
           const { status, message } = res;
@@ -907,13 +909,22 @@ export default {
           : taskHandleHtml,
         type: 'post',
         params: formData,
-        format:false
-
+        format: false
       }).then(res => {
         this.$toast.clear();
-        if (res.status == 'success') {
-          this.$toast('操作成功');
-          this.$parent.$emit('success');
+        if (res.status == 'success' || res.status == 'readDealBackProcessing') {
+          if (res.status == 'readDealBackProcessing') {
+            this.$toast(
+              '由于阅办人数较多，任务后台执行中，稍后系统将为您推送阅办任务执行结果，请注意查收！'
+            );
+            setTimeout(() => {
+              this.$toast.clear();
+              this.$parent.$emit('success');
+            }, 1500);
+          } else {
+            this.$toast('操作成功');
+            this.$parent.$emit('success');
+          }
         } else {
           this.$emit('error');
           this.$toast(res.message);
@@ -1301,7 +1312,9 @@ export default {
               // that.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
               that.isBanInputOpinion =
                 nodeInfoMap.nodeExtAttr.isBanInputOpinion;
-              that.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
+              that.isForceDisplayDefaultOptionForPrefix =
+                nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix ==
+                1;
             }
             that.choiceOrgId = choiceOrgId;
             that.choiceDeptId = choiceDeptId;
@@ -1424,8 +1437,8 @@ export default {
           //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
           if (this.nodeType === 1 || this.nodeType === 2) {
             this.isMainSubProcess === true
-                  ? (this.isNodeShowProcess = true)
-                  : (this.isNodeShowProcess = false);
+              ? (this.isNodeShowProcess = true)
+              : (this.isNodeShowProcess = false);
             this.isMainSubProcess === true
               ? (this.isMainSubProcess = true)
               : (this.isMainSubProcess = false);
@@ -1438,7 +1451,7 @@ export default {
             this.isHideCurrentOrg = false;
             this.isHideOtherOrg = false;
             this.isMainSubProcess = false;
-            this.isNodeShowProcess = false
+            this.isNodeShowProcess = false;
             this.isNextUser = true;
             // this.isMainSubProcess === true
             //   ? (this.isMainSubProcess = true)

package/packages/flow/src/components/StartFlow.vue

@@ -295,14 +295,14 @@ export default {
         return;
       }
       let formData = new FormData();
-      if (this.form.isImageOpinion == 1) {
-        formData.append('file', this.file);
-      }
-      for (let key in info) {
-        if (info[key] !== '' && info[key] !== undefined) {
-          formData.append(key, info[key]);
-        }
-      }
+      // if (this.form.isImageOpinion == 1) {
+      //   formData.append('file', this.file);
+      // }
+      // for (let key in info) {
+      //   if (info[key] !== '' && info[key] !== undefined) {
+      //     formData.append(key, info[key]);
+      //   }
+      // }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -314,7 +314,7 @@ export default {
       request({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + registerNew : registerNew,
         type: 'post',
-        params: formData,
+        params: info,
         format:false
       }).then(res => {
         this.$toast.clear();

package/packages/grid/src/main.vue

@@ -1,64 +1,189 @@
 <template>
   <div class="em-grid" @click="showHide = false">
     <van-grid v-bind="$attrs" v-on="$listeners" :column-num="columnNum">
-      <van-grid-item
+      <draggable
+        v-if="draggable"
+        v-model="newData"
+        style="width: 100%;"
+        class="menu-list-draggable"
+      >
+        <transition-group class="menu-list-draggable-item" style="width: 100%;">
+          <div
+            :style="`display: inline-block;width:${100 / columnNum}%`"
+            class="van-grid-item"
+            v-for="item of newData"
+            @mousedown.stop="onMouseDown(item)"
+            @mouseup.stop="onMouseUp($event, item)"
+            :key="item.id"
+          >
+            <div
+              class="van-grid-item__content van-grid-item__content--center van-hairline"
+            >
+              <i
+                class="van-icon  van-grid-item__icon"
+                :class="
+                  item.icon.startsWith('http') && item.icon.indexOf('/') != -1
+                    ? ''
+                    : `van-icon-${item.icon}`
+                "
+                :style="{
+                  fontSize:
+                    item.iconSize || $attrs['icon-size']
+                      ? item.iconSize || $attrs['icon-size']
+                      : ''
+                }"
+              >
+                <img
+                  v-if="
+                    item.icon.startsWith('http') || item.icon.indexOf('/') != -1
+                  "
+                  class="van-icon__image"
+                  :src="item.icon"
+                  :style="{
+                    width:
+                      item.iconSize || $attrs['icon-size']
+                        ? item.iconSize || $attrs['icon-size']
+                        : '',
+                    height:
+                      item.iconSize || $attrs['icon-size']
+                        ? item.iconSize || $attrs['icon-size']
+                        : ''
+                  }"
+                />
+                <div
+                  v-show="item.dot"
+                  :style="{ background: item.dotColor || '' }"
+                  class="van-info van-info--dot"
+                ></div>
+                <div
+                  class="van-info"
+                  :style="{ background: badgeColor || '' }"
+                  v-show="item.badge"
+                >
+                  {{
+                    maxBadge &&
+                    !isNaN(item.badge) &&
+                    Number(maxBadge) < Number(item.badge)
+                      ? maxBadge + '+'
+                      : item.badge
+                  }}
+                </div>
+              </i>
+              <em-popover
+                v-model="item.showPopover"
+                :placement="placement"
+                :theme="popoverTheme"
+                @select="popoverSelect"
+                :actions="popoverActions"
+              ></em-popover>
+              <span class="van-grid-item__text">{{ item.text }}</span>
+              <van-icon
+                v-if="showHide && item.menuType != 'add'"
+                @click.stop="handleHide(item)"
+                name="clear"
+                size="20px"
+                class="em-grid-del"
+              />
+              <div v-if="item.showMenu" class="em-grid-select-box">
+                <van-icon size="30px" color="#fff" name="success" />
+              </div>
+            </div>
+          </div>
+        </transition-group>
+      </draggable>
+      <!-- <van-grid-item
         v-bind="item"
-        :class="{ 'em-grid-ellipsis': textEllipsis }"
-        :style="`width:${100 / columnNum}%;`"
-        @click.stop="goView($event, item)"
-        v-show="newData && newData.length > 0"
         v-for="(item, index) of newData"
         :key="index"
+        :class="{ 'em-grid-ellipsis': textEllipsis }"
+        :style="`width:${100 / columnNum}%;`"
+        @mousedown.stop="onMouseDown(item)"
+        @mouseup.stop="onMouseUp($event, item)"
+        v-show="newData && newData.length > 0 && !draggable"
+      > -->
+      <div
+        :style="`display: inline-block;width:${100 / columnNum}%`"
+        class="van-grid-item"
+        v-for="item of newData"
+        @mousedown.stop="onMouseDown(item)"
+        @mouseup.stop="onMouseUp($event, item)"
+        v-show="newData && newData.length > 0 && !draggable"
+        :key="item.id"
       >
-        <i
-          class="van-icon  van-grid-item__icon"
-          :class="
-            item.icon.startsWith('http') && item.icon.indexOf('/') != -1
-              ? ''
-              : `van-icon-${item.icon}`
-          "
-          :style="{ fontSize: item.iconSize || $attrs['icon-size'] ? item.iconSize || $attrs['icon-size'] : '' }"
+        <div
+          class="van-grid-item__content van-grid-item__content--center van-hairline"
         >
-          <img
-            v-if="item.icon.startsWith('http') || item.icon.indexOf('/') != -1"
-            class="van-icon__image"
-            :src="item.icon"
+          <i
+            class="van-icon  van-grid-item__icon"
+            :class="
+              item.icon.startsWith('http') && item.icon.indexOf('/') != -1
+                ? ''
+                : `van-icon-${item.icon}`
+            "
             :style="{
-              width: item.iconSize || $attrs['icon-size'] ? item.iconSize || $attrs['icon-size']: '',
-              height: item.iconSize || $attrs['icon-size'] ? item.iconSize || $attrs['icon-size'] : ''
+              fontSize:
+                item.iconSize || $attrs['icon-size']
+                  ? item.iconSize || $attrs['icon-size']
+                  : ''
             }"
-          />
-          <div
-            v-show="item.dot"
-            :style="{ background: item.dotColor || '' }"
-            class="van-info van-info--dot"
-          ></div>
-          <div
-            class="van-info"
-            :style="{ background: badgeColor || '' }"
-            v-show="item.badge"
           >
-            {{
-              maxBadge &&
-              !isNaN(item.badge) &&
-              Number(maxBadge) < Number(item.badge)
-                ? maxBadge + '+'
-                : item.badge
-            }}
+            <img
+              v-if="
+                item.icon.startsWith('http') || item.icon.indexOf('/') != -1
+              "
+              class="van-icon__image"
+              :src="item.icon"
+              :style="{
+                width:
+                  item.iconSize || $attrs['icon-size']
+                    ? item.iconSize || $attrs['icon-size']
+                    : '',
+                height:
+                  item.iconSize || $attrs['icon-size']
+                    ? item.iconSize || $attrs['icon-size']
+                    : ''
+              }"
+            />
+            <div
+              v-show="item.dot"
+              :style="{ background: item.dotColor || '' }"
+              class="van-info van-info--dot"
+            ></div>
+            <div
+              class="van-info"
+              :style="{ background: badgeColor || '' }"
+              v-show="item.badge"
+            >
+              {{
+                maxBadge &&
+                !isNaN(item.badge) &&
+                Number(maxBadge) < Number(item.badge)
+                  ? maxBadge + '+'
+                  : item.badge
+              }}
+            </div>
+          </i>
+          <em-popover
+            v-model="item.showPopover"
+            :placement="placement"
+            @select="popoverSelect($event,item)"
+            :theme="popoverTheme"
+            :actions="popoverActions"
+          ></em-popover>
+          <span class="van-grid-item__text">{{ item.text }}</span>
+          <van-icon
+            v-if="showHide && item.menuType != 'add'"
+            @click.stop="handleHide(item)"
+            name="clear"
+            size="20px"
+            class="em-grid-del"
+          />
+          <div v-if="item.showMenu" class="em-grid-select-box">
+            <van-icon size="30px" color="#fff" name="success" />
           </div>
-        </i>
-        <span class="van-grid-item__text">{{ item.text }}</span>
-        <van-icon
-          v-if="showHide && item.menuType != 'add'"
-          @click.stop="handleHide(item)"
-          name="clear"
-          size="20px"
-          class="em-grid-del"
-        />
-        <div v-if="item.showMenu" class="em-grid-select-box">
-          <van-icon size="30px" color="#fff" name="success" />
         </div>
-      </van-grid-item>
+      </div>
+      <!-- </van-grid-item> -->
       <slot v-show="newData && newData.length == 0" />
     </van-grid>
     <em-popup style="width:80%;height:50%" v-if="show" v-model="show">
@@ -90,9 +215,11 @@
 </template>
 
 <script>
+import draggable from 'vuedraggable';
 export default {
   name: 'EmGrid',
   inheritAttrs: false,
+  components: { draggable },
   props: {
     data: {
       type: Array,
@@ -137,15 +264,36 @@ export default {
     addMenuIconSize: {
       type: String,
       default: '40px'
-    }
+    },
+    draggable: {
+      type: Boolean,
+      default: false
+    },
+    popoverActions: {
+      type: Array,
+      default: () => [{ text: '隐藏菜单',type:'hideMenu' }]
+    },
+    isTouch: {
+      type: Boolean,
+      default: false
+    },
+    placement:{
+      type:String,
+      default:'top'
+    },
+    popoverTheme:{
+      type:String,
+      default:'dark'
+    }   
   },
   data() {
     return {
-      lastTapTime: 0,
       timer: null,
       showHide: false,
+      isLongPress: false,
       newData: [],
       show: false,
+      showPopover: false,
       selectMenuArr: [],
       hideMenuList: []
     };
@@ -168,19 +316,51 @@ export default {
     }
   },
   methods: {
+    popoverSelect(val, item) {
+      if(val.type == 'hideMenu'){
+        this.handleHide(item)
+      }else{
+        this.$emit('touchSelect',{action:val,data:item})
+      }
+    },
+    onMouseDown(item) {
+      // this.showPopover = true
+      if (this.draggable || !this.isTouch) return;
+      this.isLongPress = false;
+      this.timer = setTimeout(() => {
+        if (this.isLongPress === false) {
+          this.isLongPress = true;
+          this.lastTapTime = new Date().getTime();
+          this.$set(item, 'showPopover', true);
+        }
+      }, 500);
+    },
+    onMouseUp($event, item) {
+      if (this.isLongPress === false) {
+        this.lastTapTime = new Date().getTime();
+        this.$set(item, 'showPopover', false);
+        this.goView($event, item);
+        // 执行相应的操作
+      }
+      this.isLongPress = false;
+      clearTimeout(this.timer);
+    },
     hideDelIcon() {
       this.showHide = false;
     },
     handleShowMenu() {
-      let str = this.selectMenuArr.join(',');
+      let str = this.selectMenuArr;
+      // let str = this.selectMenuArr.join(',');
       if (Array.isArray(this.hideMenu)) {
         let hideArr = this.hideMenuList.filter(
           x => str.indexOf(x[this.hideMenuKey]) == -1
         );
         this.$emit('hide', hideArr);
       } else {
-        let hide = this.hideMenuList.filter(x => str.indexOf(x[this.hideMenuKey]) == -1 );
-        hide = hide.map(x => x[this.hideMenuKey])
+        let hide = this.hideMenuList.filter(
+          x => str.indexOf(x[this.hideMenuKey]) == -1
+        );
+        hide = hide.map(x => x[this.hideMenuKey]);
         this.$emit('hide', hide.join(','));
       }
       this.selectMenuArr = [];
@@ -199,7 +379,8 @@ export default {
     defaultHide(val) {
       if (this.isHideMenu && val != undefined) {
         if (Array.isArray(val)) {
-          let menuKey = val.map(x => x.id).join(',');
+          let menuKey = val.map(x => x.id);
+          // let menuKey = val.map(x => x.id).join(',');
           this.newData = this.data.filter(
             x => menuKey.indexOf(x[this.hideMenuKey]) == -1
           );
@@ -254,23 +435,26 @@ export default {
         this.show = true;
         return;
       }
-      const currentTime = new Date().getTime();
-      const tapLength = currentTime - this.lastTapTime;
-      this.lastTapTime = currentTime;
+      // const currentTime = new Date().getTime();
+      // const tapLength = currentTime - this.lastTapTime;
+      // this.lastTapTime = currentTime;
+      // if (tapLength > 300) {
+      //   return;
+      // }
       if (this.isHideMenu) {
-        if (tapLength < 300) {
-          this.handleDoubleClick(val);
-          clearTimeout(this.timer);
-          return;
-        }
-        if (this.showHide) {
-          this.showHide = false;
-          return;
-        }
-        this.timer = setTimeout(() => {
-          this.$emit('click', val, event);
-          this.targetStop && event.stopPropagation();
-        }, 300);
+        // if (tapLength < 300) {
+        //   this.handleDoubleClick(val);
+        //   clearTimeout(this.timer);
+        //   return;
+        // }
+        // if (this.showHide) {
+        //   this.showHide = false;
+        //   return;
+        // }
+        // this.timer = setTimeout(() => {
+        this.$emit('click', val, event);
+        this.targetStop && event.stopPropagation();
+        // }, 300);
       } else {
         this.$emit('click', val, event);
         this.targetStop && event.stopPropagation();

package/packages/picker/src/main.vue

@@ -328,6 +328,7 @@ export default {
   },
   methods: {
     handleClick(val) {
+       if (this.disabled || this.readonly) return;
       if (this.linkTag) {
         this.$emit('tagClick', val);
       } else {

package/src/index.js

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

package/src/utils/axios.js

@@ -9,7 +9,7 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
     baseURL: apiUrl,
     timeout: 60000,
     headers: {
-      // clientKey: 'csjk'
+      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
     },
     withCredentials: false
   });
@@ -17,7 +17,7 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
     config => {
       if ((params.params || params) instanceof FormData === false) {
         if (type === 'post' && !format) {
-          config.params = qs.stringify(params.params || params);
+          config.data = qs.stringify(params.params || params);
           if (!config.headers['content-type'] && !headers['Content-Type']) {
             config.headers['content-type'] =
               'application/x-www-form-urlencoded;charset=UTF-8';
@@ -77,6 +77,7 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
       ) {
         delete config.headers.deviceId;
       }
+
       return config;
     },
     error => {
@@ -189,7 +190,6 @@ const base = {
     );
   },
   post: (url, params, headers, format) => {
-    console.log(params, 'params');
     if (params.params) {
       params.params.userId = params.params.userId || $.getStorage('userId');
     } else {