eoss-mobiles 0.1.21 → 0.1.23

package/lib/pagination.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/pagination/src/main.vue?vue&type=template&id=611fc168&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/pagination/src/main.vue?vue&type=template&id=c6074322&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -255,7 +255,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/pagination/src/main.vue?vue&type=template&id=611fc168&
+// CONCATENATED MODULE: ./packages/pagination/src/main.vue?vue&type=template&id=c6074322&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/pagination/src/main.vue?vue&type=script&lang=js&
 //
@@ -272,11 +272,16 @@ render._withStripped = true
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EmPagination',
-  props: ['value'],
+  props: {
+    pageNum: {
+      type: Number,
+      default: 1
+    }
+  },
   computed: {
     newValue: {
       get: function get() {
-        return this.value;
+        return this.pageNum;
       },
       set: function set(val) {
         return val;

package/lib/table.js

@@ -1904,6 +1904,14 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       type: String,
       default: ''
     },
+    labelKey: {
+      type: String,
+      default: 'title'
+    },
+    valueKey: {
+      type: String,
+      default: 'field'
+    },
     // 默认选中,类型为Boolean时默认全(不)选
     checked: {
       type: [Boolean, Array],
@@ -1986,10 +1994,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (this.list) {
           return this.list;
         }
-        if (this.page && this.data && this.data.length && this.config.totalCount < this.data.length + 1) {
-          this.config.totalCount = this.data.length - this.lose;
+        if (this.page && this.data && this.data.length && this.config['total-items'] < this.data.length + 1) {
+          this.config['total-items'] = this.data.length - this.lose;
           return this.data.filter(function (item, index) {
-            return index > (_this.config.pageNum - 1) * _this.config.pageSize - 1 && index < _this.config.pageNum * _this.config.pageSize;
+            return index > (_this.config.pageNum - 1) * _this.config['items-per-page'] - 1 && index < _this.config.pageNum * _this.config['items-per-page'];
           });
         }
 
@@ -2042,7 +2050,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       });
       var reqData = util["a" /* default */].extend({}, this.param, {
         pageNum: this.config.pageNum,
-        pageSize: this.config.pageSize
+        pageSize: this.config['items-per-page']
       });
       if (where) {
         reqData = util["a" /* default */].extend({}, reqData, where);
@@ -2057,7 +2065,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (res.rCode === 0 || res.status === 'success') {
           var results = _this3.parseData !== undefined ? _this3.parseData(res.results || res.data || res) : res.results || res.data;
           _this3.list = results.data || results.records || results.list || [];
-          _this3.config.totalCount = results.count || results.total || results.totalCount;
+          _this3.config['total-items'] = results.count || results.total || results['total-items'];
         } else {
           _this3.list = [];
         }
@@ -2105,7 +2113,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           } else {
             _this5.theadData = results.theadData || [];
             _this5.list = results.data || results.records || [];
-            _this5.config.totalCount = results.count || results.total || results.totalCount;
+            _this5.config['total-items'] = results.count || results.total || results['total-items'];
           }
         } else {
           _this5.theadData = [];
@@ -2288,7 +2296,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       if (handle.action) {
         var isConfirm = handle.confirm || true;
         if (isConfirm) {
-          var msg = handle.field ? row[handle.field] : '';
+          var msg = handle[this.valueKey] ? row[handle[this.valueKey]] : '';
           this.$dialog.confirm({
             message: '\u786E\u5B9A\u8981' + handle.text + msg + '\u5417',
             title: '提示',
@@ -2311,7 +2319,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         } else if (handle.event === 'add' || handle.event === 'edit' || handle.event === 'look') {
           var changes = {
             event: handle.event,
-            title: handle.title || handle.text,
+            title: handle[this.labelKey] || handle.text,
             values: handle.event === 'add' ? {} : rows,
             readonly: handle.event === 'look',
             actionType: handle.actionType ? handle.actionType : handle.event === 'add' ? 'save' : 'update'
@@ -2377,7 +2385,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (handle.exportXls) {
           var text = '操作';
           if (this.thead[this.thead.length - 1] && this.thead[this.thead.length - 1].type === 'handle') {
-            text = this.thead[this.thead.length - 1].title;
+            text = this.thead[this.thead.length - 1][this.labelKey];
           }
           thead = thead.map(function (item) {
             return item.filter(function (ele) {
@@ -2416,8 +2424,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             props: {
               name: _this10.name,
               item: item,
-              prop: item.field,
-              label: item.title,
+              prop: item[_this10.valueKey],
+              label: item[_this10.labelKey],
               width: item.width,
               index: index + 1000,
               readonly: _this10.readonly,
@@ -2520,8 +2528,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         dom.push(h('em-table-column', {
           props: {
             name: _this11.name,
-            prop: items.field,
-            label: items.title,
+            prop: items[_this11.valueKey],
+            label: items[_this11.labelKey],
             item: items,
             width: items.width,
             index: indexs,
@@ -2562,9 +2570,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       tableContents.push(h('em-pagination', {
         attrs: {
           // ...this.config,
-          value: this.config.pageNum,
-          'items-per-page': this.config.pageSize,
-          'total-items': this.config.totalCount
+          pageNum: this.config.pageNum,
+          'items-per-page': this.config['items-per-page'],
+          'total-items': this.config['total-items']
         },
         class: 'em-table-page',
         style: { 'text-align': this.page.position || 'center' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

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

@@ -435,7 +435,7 @@ export default {
         caOpinion: undefined, //加密意见
         isReturnRejectNode: undefined, //是否提交驳回节点
         isSerialSubmit: undefined, //串行默认提交
-        loginType: undefined, //登录方式
+        loginType: 2, //登录方式
         nodeOpinionTemplate: undefined, //意见模板
         businessSubCenterCode: undefined, //业务中心编码
         nextRoleId: undefined, // 下步办理角色id
@@ -674,6 +674,7 @@ export default {
       _that.form.isSubFlow = taskExamineInfo.isSubFlow;
       _that.form.nodeId = taskExamineInfo.nodeId ;
       _that.form.nextNodeId = _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
+      console.log(_that.form,'_that.form')
       request({
         url: _that.baseUrl ? _that.baseUrl + taskHandleHtml : taskHandleHtml,
         params: {
@@ -871,7 +872,6 @@ export default {
                     ) {
                       that.form.nextNodeId =undefined;
                       that.form.nextNodeName = undefined;
-                      console.log(that.form.nextNodeId,'that.form.nextNodeId')
                     } else {
                       that.nodeList = that.taskOperations[0].taskNodeList;
                       let info = [];
@@ -909,7 +909,6 @@ export default {
                         }
                       });
                        if(info.length == 0 && that.nodeList.length !=0) info =[that.nodeList[0]]
-                       console.log(info,'infoinfo')
                       if (info.length > 0) {
                         that.form.nextNodeId = info[0].nodeId;
                         that.form.nextNodeName = info[0].nodeName;
@@ -918,12 +917,10 @@ export default {
                       // that.form.nextNodeName = that.nodeList[0].nodeName;
                     }
                   }
-                  console.log(that.taskOperations, that.form, 'asdsdsa');
                   if (item.key == 9) {
                     that.isReject = true;
                   }
                 }
-                console.log(that.form, 'that.form');
               });
               if (!isSelected) {
                 that.form.nextOperate = that.taskOperations[0].key;

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

@@ -43,7 +43,6 @@ import { taskRejectHtml, toTaskRejectHtml } from '../../../../src/config/api';
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
-import util from '../../../../src/utils/util';
 export default {
   name: 'Reject',
   props: {
@@ -61,7 +60,8 @@ export default {
       form: {
         opinion: undefined, // 审批意见
         notificationMsg: undefined, //系统消息
-        nextNodeId: undefined
+        nextNodeId: undefined,
+        loginType: 2, //登录方式
       },
       processObj: {
         taskExamine: { nodeName: undefined },

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

@@ -243,7 +243,7 @@ export default {
         nodeId: this.form.nodeId,
         userId: sessionStorage.getItem('userId'),
         notificationMsg: this.form.notificationMsg,
-        loginType: 'a' //登录方式
+        loginType: 2 //登录方式
       };
       if (this.beforeSubmit) {
         this.beforeSubmit(info);

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

@@ -292,6 +292,7 @@ export default {
           notificationMsgType: this.form.notificationMsgType,
           notificationMsg: this.form.notificationMsg,
           isImageOpinion: 0,
+          loginType: 2,
           taskAction: this.type
         }
       };
@@ -368,6 +369,7 @@ export default {
           choiceOrgId,
           businessName,
           processDefinitionId,
+          loginType: 2,
           handleExplain: this.form.handleExplain,
           currentOrgProcessKey: processDefinitionId,
           noticeType: this.form.notificationMsgType,

package/packages/pagination/src/main.vue

@@ -12,11 +12,16 @@
 <script>
 export default {
   name: 'EmPagination',
-  props: ['value'],
+  props: {
+    pageNum:{
+      type:Number,
+      default:1
+    },
+  },
   computed: {
     newValue: {
       get() {
-        return this.value;
+        return this.pageNum;
       },
       set(val) {
         return val;

package/packages/table/src/main.vue

@@ -67,6 +67,14 @@ export default {
       type: String,
       default: ''
     },
+    labelKey: {
+      type: String,
+      default: 'title'
+    },
+    valueKey: {
+      type: String,
+      default: 'field'
+    },
     // 默认选中,类型为Boolean时默认全(不)选
     checked: {
       type: [Boolean, Array],
@@ -147,13 +155,13 @@ export default {
           this.page &&
           this.data &&
           this.data.length &&
-          this.config.totalCount < this.data.length + 1
+          this.config['total-items'] < this.data.length + 1
         ) {
-          this.config.totalCount = this.data.length - this.lose;
+          this.config['total-items'] = this.data.length - this.lose;
           return this.data.filter((item, index) => {
             return (
-              index > (this.config.pageNum - 1) * this.config.pageSize - 1 &&
-              index < this.config.pageNum * this.config.pageSize
+              index > (this.config.pageNum - 1) * this.config['items-per-page'] - 1 &&
+              index < this.config.pageNum * this.config['items-per-page']
             );
           });
         }
@@ -203,7 +211,7 @@ export default {
       });
       let reqData = util.extend({}, this.param, {
         pageNum: this.config.pageNum,
-        pageSize: this.config.pageSize
+        pageSize: this.config['items-per-page']
       });
       if (where) {
         reqData = util.extend({}, reqData, where);
@@ -223,8 +231,8 @@ export default {
                 ? this.parseData(res.results || res.data || res)
                 : res.results || res.data;
             this.list = results.data || results.records || results.list || [];
-            this.config.totalCount =
-              results.count || results.total || results.totalCount;
+            this.config['total-items'] =
+              results.count || results.total || results['total-items'];
           } else {
             this.list = [];
           }
@@ -271,8 +279,8 @@ export default {
             } else {
               this.theadData = results.theadData || [];
               this.list = results.data || results.records || [];
-              this.config.totalCount =
-                results.count || results.total || results.totalCount;
+              this.config['total-items'] =
+                results.count || results.total || results['total-items'];
             }
           } else {
             this.theadData = [];
@@ -469,7 +477,7 @@ export default {
       if (handle.action) {
         let isConfirm = handle.confirm || true;
         if (isConfirm) {
-          let msg = handle.field ? row[handle.field] : '';
+          let msg = handle[this.valueKey] ? row[handle[this.valueKey]] : '';
           this.$dialog
             .confirm({
               message: `确定要${handle.text}${msg}吗`,
@@ -500,7 +508,7 @@ export default {
         ) {
           let changes = {
             event: handle.event,
-            title: handle.title || handle.text,
+            title: handle[this.labelKey] || handle.text,
             values: handle.event === 'add' ? {} : rows,
             readonly: handle.event === 'look',
             actionType: handle.actionType
@@ -577,7 +585,7 @@ export default {
             this.thead[this.thead.length - 1] &&
             this.thead[this.thead.length - 1].type === 'handle'
           ) {
-            text = this.thead[this.thead.length - 1].title;
+            text = this.thead[this.thead.length - 1][this.labelKey];
           }
           thead = thead.map(item => {
             return item.filter(ele => {
@@ -617,8 +625,8 @@ export default {
                 props: {
                   name: this.name,
                   item: item,
-                  prop: item.field,
-                  label: item.title,
+                  prop: item[this.valueKey],
+                  label: item[this.labelKey],
                   width: item.width,
                   index: index + 1000,
                   readonly: this.readonly,
@@ -741,8 +749,8 @@ export default {
             {
               props: {
                 name: this.name,
-                prop: items.field,
-                label: items.title,
+                prop: items[this.valueKey],
+                label: items[this.labelKey],
                 item: items,
                 width: items.width,
                 index: indexs,
@@ -794,9 +802,9 @@ export default {
         h('em-pagination', {
           attrs: {
             // ...this.config,
-            value: this.config.pageNum,
-            'items-per-page': this.config.pageSize,
-            'total-items': this.config.totalCount
+            pageNum: this.config.pageNum,
+            'items-per-page': this.config['items-per-page'],
+            'total-items': this.config['total-items']
           },
           class: 'em-table-page',
           style: { 'text-align': this.page.position || 'center' },

package/src/index.js

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