eoss-mobiles 0.1.78 → 0.1.80

package/lib/selector.js

@@ -3431,8 +3431,8 @@ var selector_tree_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var selector_tree = (selector_tree_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=template&id=43641679&
-var selector_fieldvue_type_template_id_43641679_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=template&id=723827d0&
+var selector_fieldvue_type_template_id_723827d0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3530,7 +3530,7 @@ var selector_fieldvue_type_template_id_43641679_render = function () {
                         _vm._v(
                           "\n            " +
                             _vm._s(
-                              r[_vm.labelKey].length > 10
+                              r[_vm.labelKey] && r[_vm.labelKey].length > 10
                                 ? r[_vm.labelKey].slice(0, 10) + "..."
                                 : r[_vm.labelKey]
                             ) +
@@ -3591,11 +3591,11 @@ var selector_fieldvue_type_template_id_43641679_render = function () {
     1
   )
 }
-var selector_fieldvue_type_template_id_43641679_staticRenderFns = []
-selector_fieldvue_type_template_id_43641679_render._withStripped = true
+var selector_fieldvue_type_template_id_723827d0_staticRenderFns = []
+selector_fieldvue_type_template_id_723827d0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=43641679&
+// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=723827d0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=script&lang=js&
 //
@@ -3847,8 +3847,8 @@ selector_fieldvue_type_template_id_43641679_render._withStripped = true
 
 var selector_field_component = Object(componentNormalizer["a" /* default */])(
   src_selector_fieldvue_type_script_lang_js_,
-  selector_fieldvue_type_template_id_43641679_render,
-  selector_fieldvue_type_template_id_43641679_staticRenderFns,
+  selector_fieldvue_type_template_id_723827d0_render,
+  selector_fieldvue_type_template_id_723827d0_staticRenderFns,
   false,
   null,
   null,

package/lib/table-column.js

@@ -1543,7 +1543,7 @@ module.exports = require("element-ui");
 // 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/table-column/src/main.vue?vue&type=template&id=7eca6cd2&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table-column/src/main.vue?vue&type=template&id=1ced7a5e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -1699,6 +1699,7 @@ var render = function () {
                                                       modifiers: { lazy: true },
                                                     },
                                                   ],
+                                                  ref: "emInput",
                                                   staticClass:
                                                     "el-input__inner",
                                                   attrs: {
@@ -1822,6 +1823,7 @@ var render = function () {
                                         "em-input",
                                         _vm._b(
                                           {
+                                            ref: "emInput",
                                             staticClass: "em-table-input",
                                             attrs: {
                                               label: _vm.item.title,
@@ -2196,7 +2198,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/table-column/src/main.vue?vue&type=template&id=7eca6cd2&
+// CONCATENATED MODULE: ./packages/table-column/src/main.vue?vue&type=template&id=1ced7a5e&
 
 // EXTERNAL MODULE: external "element-ui"
 var external_element_ui_ = __webpack_require__(9);
@@ -2805,6 +2807,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 //
 //
 //
+//
+//
 
 
 
@@ -2850,6 +2854,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
   },
   methods: (_methods = {
+    handleFailed: function handleFailed(val) {
+      console.log(this.$refs.emInput, 'Failed');
+      console.log(this.$refs, 'Failed');
+    },
     getValue: function getValue(row) {
       var str = void 0;
       var _item = this.item,

package/lib/table.js

@@ -1928,8 +1928,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       selected: null,
       pageChange: false,
       tableHeight: 'auto',
+      validateSuccess: true,
       options: {},
       theadData: [],
+      errForm: [],
       list: null,
       wheres: {},
       config: {
@@ -2014,23 +2016,49 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     }
   },
   methods: {
+    validValue: function validValue(val) {
+      val && this.$toast(val);
+      this.validateSuccess = !val;
+    },
+    validate: function validate() {
+      var _this2 = this;
+
+      var success = true;
+      var _that = this;
+      if (_that.form) {
+        _that.theads.map(function (item) {
+          if (item.rules && item.rules.required) {
+            _this2.datas.map(function (x) {
+              if (!x[item.field] && !item.rules.validator) {
+                _that.$toast(item.rules.message);
+                success = false;
+              } else if (item.rules.validator) {
+                item.rules.validator(x[item.field], _that.validValue);
+                success = _that.validateSuccess;
+              }
+            });
+          }
+        });
+      }
+      return success;
+    },
     toggleAllSelection: function toggleAllSelection() {
       this.$refs.oaTable.toggleAllSelection();
     },
     toggleRowSelection: function toggleRowSelection(newVal) {
-      var _this2 = this;
+      var _this3 = this;
 
       newVal.forEach(function (row) {
-        _this2.$refs.oaTable.toggleRowSelection(row, true);
+        _this3.$refs.oaTable.toggleRowSelection(row, true);
       });
     },
     checkSelect: function checkSelect(newVal) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (!this.isFirsetCheck && newVal) {
         if (util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
-            _this3.$refs.oaTable.toggleRowSelection(row, true);
+            _this4.$refs.oaTable.toggleRowSelection(row, true);
           });
         } else if (newVal === true) {
           this.toggleAllSelection();
@@ -2039,7 +2067,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       }
     },
     getTableData: function getTableData(res) {
-      var _this4 = this;
+      var _this5 = this;
 
       var where = void 0;
       var first = void 0;
@@ -2075,32 +2103,32 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         data: reqData
       }).then(function (res) {
         if (res.rCode === 0 || res.status === 'success') {
-          var results = _this4.parseData !== undefined ? _this4.parseData(res.results || res.data || res) : res.results || res.data;
-          _this4.list = results.data || results.records || results.list || [];
-          _this4.config.totalCount = results.count || results.total || results.totalCount;
+          var results = _this5.parseData !== undefined ? _this5.parseData(res.results || res.data || res) : res.results || res.data;
+          _this5.list = results.data || results.records || results.list || [];
+          _this5.config.totalCount = results.count || results.total || results.totalCount;
         } else {
-          _this4.list = [];
+          _this5.list = [];
         }
-        _this4.$toast.clear();
-        _this4.$emit('success', res);
+        _this5.$toast.clear();
+        _this5.$emit('success', res);
       }).catch(function (err) {
-        _this4.$toast.clear();
+        _this5.$toast.clear();
         if (err && err.code && [64, 65, 67].indexOf(err.code) > -1) {
           return;
         }
         if (util["a" /* default */].getObjectType(err) === 'string') {
-          _this4.$toast(err);
+          _this5.$toast(err);
         } else {
-          _this4.$toast(err.message || '数据加载失败，请联系管理员！');
+          _this5.$toast(err.message || '数据加载失败，请联系管理员！');
         }
       });
     },
     currentChange: function currentChange(res) {
-      var _this5 = this;
+      var _this6 = this;
 
       this.pageChange = true;
       setTimeout(function () {
-        _this5.pageChange = false;
+        _this6.pageChange = false;
       }, 10);
       this.config.pageNum = res;
       this.$emit('page-current-change', res);
@@ -2109,7 +2137,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       }
     },
     getTheads: function getTheads() {
-      var _this6 = this;
+      var _this7 = this;
 
       util["a" /* default */].ajax({
         url: this.thead,
@@ -2121,24 +2149,24 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (res.rCode === 0) {
           var results = res.results;
           if (Array.isArray(results)) {
-            _this6.theadData = results;
+            _this7.theadData = results;
           } else {
-            _this6.theadData = results.theadData || [];
-            _this6.list = results.data || results.records || [];
-            _this6.config.totalCount = results.count || results.total || results.totalCount;
+            _this7.theadData = results.theadData || [];
+            _this7.list = results.data || results.records || [];
+            _this7.config.totalCount = results.count || results.total || results.totalCount;
           }
         } else {
-          _this6.theadData = [];
+          _this7.theadData = [];
         }
-        _this6.$emit('success', res);
+        _this7.$emit('success', res);
       }).catch(function (err) {
         if (err && err.code && [64, 65, 67].indexOf(err.code) > -1) {
           return;
         }
         if (util["a" /* default */].getObjectType(err) === 'string') {
-          _this6.$message.error(err);
+          _this7.$message.error(err);
         } else {
-          _this6.$message.error(err.message || '数据加载失败，请联系管理员！');
+          _this7.$message.error(err.message || '数据加载失败，请联系管理员！');
         }
       });
     },
@@ -2152,51 +2180,51 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       this.$emit('focus', data, this.datas);
     },
     formChange: function formChange(data) {
-      var _this7 = this;
+      var _this8 = this;
 
       if (this.pageChange) return;
       if (data.type) {
         this.pageChange = true;
         setTimeout(function () {
-          _this7.pageChange = false;
+          _this8.pageChange = false;
         }, 20);
       }
       this.$emit('edit', data, this.datas);
     },
     resetHeight: function resetHeight() {
-      var _this8 = this;
+      var _this9 = this;
 
       this.$nextTick(function () {
-        if (_this8.full && !_this8.height && !_this8.maxHeight) {
-          var height = _this8.$el.parentNode.offsetHeight - parseInt(util["a" /* default */].getStyle(_this8.$el.parentNode, 'paddingTop'), 10) - parseInt(util["a" /* default */].getStyle(_this8.$el.parentNode, 'paddingBottom'), 10);
-          for (var i = 0; i < _this8.$el.parentNode.childNodes.length; i++) {
-            var ele = _this8.$el.parentNode.childNodes[i];
-            if (ele !== _this8.$el) {
+        if (_this9.full && !_this9.height && !_this9.maxHeight) {
+          var height = _this9.$el.parentNode.offsetHeight - parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'paddingTop'), 10) - parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'paddingBottom'), 10);
+          for (var i = 0; i < _this9.$el.parentNode.childNodes.length; i++) {
+            var ele = _this9.$el.parentNode.childNodes[i];
+            if (ele !== _this9.$el) {
               height -= ele.offsetHeight === undefined ? 0 : ele.offsetHeight;
             }
           }
-          for (var _i = 0; _i < _this8.$el.childNodes.length; _i++) {
-            var _ele = _this8.$el.childNodes[_i];
-            if (_ele !== _this8.$refs.esTableContent) {
+          for (var _i = 0; _i < _this9.$el.childNodes.length; _i++) {
+            var _ele = _this9.$el.childNodes[_i];
+            if (_ele !== _this9.$refs.esTableContent) {
               height -= _ele.offsetHeight === undefined ? 0 : _ele.offsetHeight;
             }
           }
-          _this8.styles = { height: height + 'px' };
-          var loadingDom = _this8.$refs.esTableContent.querySelector('.el-loading-mask');
-          for (var _i2 = 0; _i2 < _this8.$refs.esTableContent.childNodes.length; _i2++) {
-            var _ele2 = _this8.$refs.esTableContent.childNodes[_i2];
-            if (_ele2 !== _this8.$refs.oaTable.$el && (!loadingDom || _ele2 !== loadingDom)) {
+          _this9.styles = { height: height + 'px' };
+          var loadingDom = _this9.$refs.esTableContent.querySelector('.el-loading-mask');
+          for (var _i2 = 0; _i2 < _this9.$refs.esTableContent.childNodes.length; _i2++) {
+            var _ele2 = _this9.$refs.esTableContent.childNodes[_i2];
+            if (_ele2 !== _this9.$refs.oaTable.$el && (!loadingDom || _ele2 !== loadingDom)) {
               height -= _ele2.offsetHeight === undefined ? 0 : _ele2.offsetHeight;
             }
           }
-          var pt = parseInt(util["a" /* default */].getStyle(_this8.$refs.esTableContent, 'paddingTop'), 10);
-          var pb = parseInt(util["a" /* default */].getStyle(_this8.$refs.esTableContent, 'paddingBottom'), 10);
-          _this8.tableHeight = height - pt - pb + (_this8.page ? 2 : 1) + 'px';
+          var pt = parseInt(util["a" /* default */].getStyle(_this9.$refs.esTableContent, 'paddingTop'), 10);
+          var pb = parseInt(util["a" /* default */].getStyle(_this9.$refs.esTableContent, 'paddingBottom'), 10);
+          _this9.tableHeight = height - pt - pb + (_this9.page ? 2 : 1) + 'px';
         }
       });
     },
     handleAjax: function handleAjax(handle, row) {
-      var _this9 = this;
+      var _this10 = this;
 
       this.$toast.loading({
         message: '加载中...',
@@ -2258,9 +2286,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         method: handle.method,
         format: handle.format
       }).then(function (res) {
-        _this9.$toast.clear();
+        _this10.$toast.clear();
         if (res.rCode === 0) {
-          _this9.$message({
+          _this10.$message({
             message: handle.text + '\u6210\u529F',
             duration: 2000,
             type: 'success',
@@ -2268,17 +2296,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
               var first = Object.prototype.hasOwnProperty.call(handle, 'first') ? handle.first : false;
               var reload = handle.reload || true;
               if (reload) {
-                _this9.reload({}, first);
+                _this10.reload({}, first);
               }
             }
           });
         } else {
-          _this9.$toast(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
+          _this10.$toast(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
         }
       }).catch(function () {});
     },
     handleClick: function handleClick(res) {
-      var _this10 = this;
+      var _this11 = this;
 
       var row = res.row,
           handle = res.handle;
@@ -2316,7 +2344,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this10.handleAjax(handle, rows);
+            _this11.handleAjax(handle, rows);
           }).catch(function () {});
         } else {
           this.handleAjax(handle, rows);
@@ -2423,34 +2451,35 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       this.$emit('row-click', row, column, event);
     },
     getChildrens: function getChildrens(h, items) {
-      var _this11 = this;
+      var _this12 = this;
 
       var doms = [];
       items.childHead.forEach(function (item, index) {
         if (!item.hide) {
           var childs = [];
           if (item.childHead && item.childHead.length) {
-            childs = _this11.getChildrens(h, item);
+            childs = _this12.getChildrens(h, item);
           }
           doms.push(h('em-table-column', {
+            ref: 'emTableColum',
             props: {
-              name: _this11.name,
+              name: _this12.name,
               item: item,
-              prop: item[_this11.valueKey],
-              label: item[_this11.labelKey],
+              prop: item[_this12.valueKey],
+              label: item[_this12.labelKey],
               width: item.width,
               index: index + 1000,
-              readonly: _this11.readonly,
-              optionData: _this11.optionDatas,
-              form: _this11.form,
-              minWidth: _this11.minWidth
+              readonly: _this12.readonly,
+              optionData: _this12.optionDatas,
+              form: _this12.form,
+              minWidth: _this12.minWidth
             },
             on: {
-              handleClick: _this11.handleClick,
-              formBlur: _this11.formBlur,
-              formFocus: _this11.formFocus,
-              tableColumns: _this11.getTableColumns,
-              formChange: _this11.formChange
+              handleClick: _this12.handleClick,
+              formBlur: _this12.formBlur,
+              formFocus: _this12.formFocus,
+              tableColumns: _this12.getTableColumns,
+              formChange: _this12.formChange
             }
           }, childs));
         }
@@ -2471,7 +2500,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     }
   },
   render: function render(h) {
-    var _this12 = this;
+    var _this13 = this;
 
     var tag = 'div';
     var dom = [];
@@ -2510,6 +2539,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       if (items.type && (items.type === 'selection' || items.type === 'index')) {
         if (items.type === 'index') {
           dom.push(h('em-table-column', {
+            ref: 'emTableColum',
             props: util["a" /* default */].extend({}, {
               type: 'index',
               label: '序号',
@@ -2522,6 +2552,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }));
         } else {
           dom.push(h('em-table-column', {
+            ref: 'emTableColum',
             props: util["a" /* default */].extend({}, {
               type: 'selection',
               width: '55',
@@ -2535,27 +2566,28 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       } else if (!items.hide) {
         var tds = [];
         if (items.childHead && items.childHead.length) {
-          tds = _this12.getChildrens(h, items);
+          tds = _this13.getChildrens(h, items);
         }
         dom.push(h('em-table-column', {
+          ref: 'emTableColum',
           props: {
-            name: _this12.name,
-            prop: items[_this12.valueKey],
-            label: items[_this12.labelKey],
+            name: _this13.name,
+            prop: items[_this13.valueKey],
+            label: items[_this13.labelKey],
             item: items,
             width: items.width,
             index: indexs,
-            readonly: _this12.readonly,
-            optionData: _this12.optionDatas,
-            form: _this12.form,
-            minWidth: _this12.minWidth
+            readonly: _this13.readonly,
+            optionData: _this13.optionDatas,
+            form: _this13.form,
+            minWidth: _this13.minWidth
           },
           on: {
-            handleClick: _this12.handleClick,
-            formBlur: _this12.formBlur,
-            formFocus: _this12.formFocus,
-            tableColumns: _this12.getTableColumns,
-            formChange: _this12.formChange
+            handleClick: _this13.handleClick,
+            formBlur: _this13.formBlur,
+            formFocus: _this13.formFocus,
+            tableColumns: _this13.getTableColumns,
+            formChange: _this13.formChange
           },
           key: indexs
         }, tds));

package/package.json

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

package/packages/form/src/main.vue

@@ -1,11 +1,11 @@
 <template>
-  <!-- <van-row class="em-form">
-    <van-col
-      v-for="(item, index) in contents"
-      :key="index"
-      :span="(item.col && item.col * 2) || 24"
-    > -->
-  <van-form class="em-form" ref="emForm" v-bind="$attrs" v-on="$listeners">
+  <van-form
+    class="em-form"
+    ref="emForm"
+    v-bind="$attrs"
+    @failed="handleFailed"
+    @submit="handleSubmit"
+  >
     <div v-for="(item, index) in newContent" :key="index">
       <em-input
         v-if="
@@ -139,8 +139,9 @@
       <em-table
         v-else-if="item.type == 'table'"
         class="em-form-table"
+        ref="emFormTable"
         v-bind="{ ...$attrs, ...item }"
-        :data="model[item.name] || []"
+        :data="model[item.name]"
         :thead="item.tHead"
         :style="`margin:${item.margin || 10}px 0px`"
         :form="
@@ -178,8 +179,6 @@
         >{{ item.text }}</em-button
       >
     </div>
-    <!-- </van-col>
-  </van-row> -->
   </van-form>
 </template>
 
@@ -247,27 +246,42 @@ export default {
     // this.setBtnType()
   },
   methods: {
-    // setBtnType() {
-    //   let tableList = this.contents.filter(x => x.type == 'table');
-    //   if (tableList.length > 0) {
-    //     tableList.map(x => {
-    //       if (x.type == 'handle' && x.events) {
-    //         x.events.map(y => {
-    //           y['native-type'] = 'button';
-    //         });
-    //       }
-    //     });
-    //   }
-    //   this.contents
-    // },
+    handleFailed(values) {
+      this.$refs.emFormTable.map(item => {
+        item.validate();
+      });
+      this.$emit('failed', { errors: values.errors, values: this.model });
+    },
+    handleSubmit() {
+      let errForm = false;
+      this.$refs.emFormTable.map(item => {
+        if(!item.validate()){
+          errForm = true
+        }
+      });
+      if (errForm) {
+        this.$emit('failed', { errors: [], values: this.model });
+      } else {
+        this.$emit('submit', this.model);
+      }
+    },
     handleChange(key, value) {
       this.$emit('change', key, value);
     },
     handleBtnClick(val) {
       this.$emit('table-btn-click', val);
     },
-    validate() {
-      this.$refs.emForm.validate();
+    validate(name) {
+      this.$refs.emForm.validate(name);
+    },
+    submit(){
+      this.$refs.emForm.submit();
+    },
+    resetValidation(name){
+      this.$refs.emForm.resetValidation(name)
+    },
+    scrollToField(name,alignToTop){
+      this.$refs.emForm.scrollToField(name,alignToTop)
     },
     handleClick(val) {
       this.$emit('click', { values: this.model, btn: val });

package/packages/selector/src/selector-field.vue

@@ -40,7 +40,7 @@
           <div class="select-list" v-if="newSelectList.length > 0">
             <div v-for="(r, i) in newSelectList" :key="i" class="item">
               {{
-                r[labelKey].length > 10
+               r[labelKey] && r[labelKey].length > 10
                   ? r[labelKey].slice(0, 10) + '...'
                   : r[labelKey]
               }}