eoss-mobiles 0.2.44 → 0.2.45

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.45",
   "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-ripple": "^4.1.1",
+    "vuedraggable": "^2.24.3",
     "wujie-vue2": "^1.0.5"
   },
   "peerDependencies": {

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,16 +1,79 @@
 <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, index) of newData"  @click.stop="goView($event, item)" :key="item.id">
+        <div class="van-grid-item__content van-grid-item__content--center van-hairline">
+          
+        <i
+        @touchstart="touchstart(item,index)"
+        @touchend="touchend(item,index)"
+          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>
+        <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"
+        v-for="(item, index) of newData" :key="index"
         :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"
+        v-show="newData && newData.length > 0 && !draggable"
+     
       >
+
+  
         <i
+        @touchstart="touchstart(item,index)"
+        @touchend="touchend(item,index)"
           class="van-icon  van-grid-item__icon"
           :class="
             item.icon.startsWith('http') && item.icon.indexOf('/') != -1
@@ -90,9 +153,11 @@
 </template>
 
 <script>
+import draggable from 'vuedraggable';
 export default {
   name: 'EmGrid',
   inheritAttrs: false,
+  components: { draggable },
   props: {
     data: {
       type: Array,
@@ -137,6 +202,10 @@ export default {
     addMenuIconSize: {
       type: String,
       default: '40px'
+    },
+    draggable:{
+      type:Boolean,
+      default:false
     }
   },
   data() {
@@ -168,11 +237,18 @@ export default {
     }
   },
   methods: {
+    touchstart(val,inexd){
+      console.log('点击了了')
+    },
+    touchend(val,a){
+      console.log('松开了')
+    },
     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
@@ -199,7 +275,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
           );

package/src/index.js

@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.2.44',
+  version: '0.2.45',
   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 {