eoss-mobiles 0.1.88 → 0.1.91

package/CHANGELOG.md

@@ -1,7 +1,10 @@
 ## 更新日志
 
-### 0.1.84
+### 0.1.90
 
+- 2023-12-08
+  - fix:<br/>1. input 组件新增属性required-position必填图标展示的位置<br/>2. form 组件优化验证表格<br/>2. table 组件样式优化
+  - 版本号:0.1.90
 - 2023-12-05
   - fix:<br/>1. input 组件新增属性show-password是否显示切换密码图标<br/>2. form 组件优化验证表格<br/>3. flow 组件优化
   - 版本号:0.1.84

package/lib/eoss-mobile.common.js

@@ -4273,8 +4273,8 @@ selector_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var selector = (selector_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=4bdc96b0&
-var mainvue_type_template_id_4bdc96b0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=653b46a0&
+var mainvue_type_template_id_653b46a0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4290,6 +4290,14 @@ var mainvue_type_template_id_4bdc96b0_render = function () {
               class: {
                 "hide-label": _vm.hideLabel,
                 "input-wrap": _vm.labelPosition == "top",
+                "required-right": _vm.requiredPosition == "right",
+                isRequired:
+                  (_vm.required ||
+                    (Array.isArray(_vm.rules)
+                      ? _vm.rules[0].required
+                      : _vm.rules.required)) &&
+                  _vm.requiredPosition != "right",
+                "is-left-icon": _vm.$attrs["left-icon"],
               },
               attrs: {
                 autocomplete: "new-password",
@@ -4312,7 +4320,8 @@ var mainvue_type_template_id_4bdc96b0_render = function () {
                       : _vm.rules.required) &&
                     _vm.isBlur) ||
                   _vm.$attrs.error,
-                "right-icon": _vm.$attrs.rightIcon || _vm.getRightIcon,
+                "right-icon": _vm.$attrs["right-icon"] || _vm.getRightIcon,
+                "label-align": _vm.labelAlign,
                 type: _vm.newType,
                 rules: Array.isArray(_vm.rules) ? _vm.rules : [],
               },
@@ -4337,6 +4346,24 @@ var mainvue_type_template_id_4bdc96b0_render = function () {
           _vm.$listeners
         ),
         [
+          !_vm.$slots.label
+            ? _c("template", { slot: "label" }, [
+                _c(
+                  "span",
+                  {
+                    class: {
+                      "em-cell--required":
+                        (_vm.required ||
+                          (Array.isArray(_vm.rules)
+                            ? _vm.rules[0].required
+                            : _vm.rules.required)) &&
+                        _vm.requiredPosition == "right",
+                    },
+                  },
+                  [_vm._v(_vm._s(_vm.label))]
+                ),
+              ])
+            : _vm._e(),
           _vm._l(_vm.$slots, function (index, name) {
             return _c("template", { slot: name }, [_vm._t(name)], 2)
           }),
@@ -4347,11 +4374,11 @@ var mainvue_type_template_id_4bdc96b0_render = function () {
     1
   )
 }
-var mainvue_type_template_id_4bdc96b0_staticRenderFns = []
-mainvue_type_template_id_4bdc96b0_render._withStripped = true
+var mainvue_type_template_id_653b46a0_staticRenderFns = []
+mainvue_type_template_id_653b46a0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=4bdc96b0&
+// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=653b46a0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=script&lang=js&
 //
@@ -4391,6 +4418,18 @@ mainvue_type_template_id_4bdc96b0_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ var field_src_mainvue_type_script_lang_js_ = ({
   name: 'EmInput',
@@ -4400,6 +4439,14 @@ mainvue_type_template_id_4bdc96b0_render._withStripped = true
       type: [String, Array, Number],
       default: ''
     },
+    label: {
+      type: String,
+      default: ''
+    },
+    labelAlign: {
+      type: String,
+      default: 'left'
+    },
     required: {
       type: Boolean,
       default: false
@@ -4437,6 +4484,10 @@ mainvue_type_template_id_4bdc96b0_render._withStripped = true
     type: {
       type: String,
       default: 'text'
+    },
+    requiredPosition: {
+      type: String,
+      default: 'left'
     }
   },
   data: function data() {
@@ -4449,7 +4500,6 @@ mainvue_type_template_id_4bdc96b0_render._withStripped = true
   },
 
   computed: {
-
     getRightIcon: {
       get: function get() {
         var icon = undefined;
@@ -4477,6 +4527,7 @@ mainvue_type_template_id_4bdc96b0_render._withStripped = true
     }
   },
   mounted: function mounted() {
+    console.log(this.$slots, 's');
     this.newType = this.type;
     this.newPlaceholder = this.$attrs.placeholder;
     this.newErrorMessage = this.errorMessage;
@@ -4547,8 +4598,8 @@ mainvue_type_template_id_4bdc96b0_render._withStripped = true
 
 var field_src_main_component = normalizeComponent(
   packages_field_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_4bdc96b0_render,
-  mainvue_type_template_id_4bdc96b0_staticRenderFns,
+  mainvue_type_template_id_653b46a0_render,
+  mainvue_type_template_id_653b46a0_staticRenderFns,
   false,
   null,
   null,
@@ -7601,6 +7652,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       selected: null,
       pageChange: false,
       tableHeight: 'auto',
+      tableClientHeight: '',
       validateSuccess: true,
       options: {},
       theadData: [],
@@ -7654,9 +7706,14 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     }
   },
   mounted: function mounted() {
+    var _this = this;
+
     // this.resetHeight();
     this.getTableData();
     this.checkSelect(this.checked);
+    this.$nextTick(function () {
+      _this.tableClientHeight = _this.$refs.emTable.clientHeight;
+    });
   },
 
   computed: {
@@ -7669,7 +7726,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
     datas: {
       get: function get() {
-        var _this = this;
+        var _this2 = this;
 
         if (this.list) {
           return this.list;
@@ -7677,7 +7734,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         if (this.page && this.data && this.data.length && this.config.totalCount < this.data.length + 1) {
           this.config.totalCount = 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 > (_this2.config.pageNum - 1) * _this2.config.pageSize - 1 && index < _this2.config.pageNum * _this2.config.pageSize;
           });
         }
 
@@ -7694,14 +7751,14 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.validateSuccess = !val;
     },
     validate: function validate() {
-      var _this2 = this;
+      var _this3 = 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) {
+            _this3.datas.map(function (x) {
               if (!x[item.field] && !item.rules.validator) {
                 _that.$toast(item.rules.message);
                 success = false;
@@ -7719,19 +7776,19 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.$refs.oaTable.toggleAllSelection();
     },
     toggleRowSelection: function toggleRowSelection(newVal) {
-      var _this3 = this;
+      var _this4 = this;
 
       newVal.forEach(function (row) {
-        _this3.$refs.oaTable.toggleRowSelection(row, true);
+        _this4.$refs.oaTable.toggleRowSelection(row, true);
       });
     },
     checkSelect: function checkSelect(newVal) {
-      var _this4 = this;
+      var _this5 = this;
 
       if (!this.isFirsetCheck && newVal) {
         if (util.getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
-            _this4.$refs.oaTable.toggleRowSelection(row, true);
+            _this5.$refs.oaTable.toggleRowSelection(row, true);
           });
         } else if (newVal === true) {
           this.toggleAllSelection();
@@ -7740,7 +7797,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
     },
     getTableData: function getTableData(res) {
-      var _this5 = this;
+      var _this6 = this;
 
       var where = void 0;
       var first = void 0;
@@ -7776,32 +7833,32 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         data: reqData
       }).then(function (res) {
         if (res.rCode === 0 || res.status === 'success') {
-          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;
+          var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
+          _this6.list = results.data || results.records || results.list || [];
+          _this6.config.totalCount = results.count || results.total || results.totalCount;
         } else {
-          _this5.list = [];
+          _this6.list = [];
         }
-        _this5.$toast.clear();
-        _this5.$emit('success', res);
+        _this6.$toast.clear();
+        _this6.$emit('success', res);
       }).catch(function (err) {
-        _this5.$toast.clear();
+        _this6.$toast.clear();
         if (err && err.code && [64, 65, 67].indexOf(err.code) > -1) {
           return;
         }
         if (util.getObjectType(err) === 'string') {
-          _this5.$toast(err);
+          _this6.$toast(err);
         } else {
-          _this5.$toast(err.message || '数据加载失败，请联系管理员！');
+          _this6.$toast(err.message || '数据加载失败，请联系管理员！');
         }
       });
     },
     currentChange: function currentChange(res) {
-      var _this6 = this;
+      var _this7 = this;
 
       this.pageChange = true;
       setTimeout(function () {
-        _this6.pageChange = false;
+        _this7.pageChange = false;
       }, 10);
       this.config.pageNum = res;
       this.$emit('page-current-change', res);
@@ -7810,7 +7867,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
     },
     getTheads: function getTheads() {
-      var _this7 = this;
+      var _this8 = this;
 
       util.ajax({
         url: this.thead,
@@ -7822,24 +7879,24 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         if (res.rCode === 0) {
           var results = res.results;
           if (Array.isArray(results)) {
-            _this7.theadData = results;
+            _this8.theadData = results;
           } else {
-            _this7.theadData = results.theadData || [];
-            _this7.list = results.data || results.records || [];
-            _this7.config.totalCount = results.count || results.total || results.totalCount;
+            _this8.theadData = results.theadData || [];
+            _this8.list = results.data || results.records || [];
+            _this8.config.totalCount = results.count || results.total || results.totalCount;
           }
         } else {
-          _this7.theadData = [];
+          _this8.theadData = [];
         }
-        _this7.$emit('success', res);
+        _this8.$emit('success', res);
       }).catch(function (err) {
         if (err && err.code && [64, 65, 67].indexOf(err.code) > -1) {
           return;
         }
         if (util.getObjectType(err) === 'string') {
-          _this7.$message.error(err);
+          _this8.$message.error(err);
         } else {
-          _this7.$message.error(err.message || '数据加载失败，请联系管理员！');
+          _this8.$message.error(err.message || '数据加载失败，请联系管理员！');
         }
       });
     },
@@ -7853,51 +7910,51 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.$emit('focus', data, this.datas);
     },
     formChange: function formChange(data) {
-      var _this8 = this;
+      var _this9 = this;
 
       if (this.pageChange) return;
       if (data.type) {
         this.pageChange = true;
         setTimeout(function () {
-          _this8.pageChange = false;
+          _this9.pageChange = false;
         }, 20);
       }
       this.$emit('edit', data, this.datas);
     },
     resetHeight: function resetHeight() {
-      var _this9 = this;
+      var _this10 = this;
 
       this.$nextTick(function () {
-        if (_this9.full && !_this9.height && !_this9.maxHeight) {
-          var height = _this9.$el.parentNode.offsetHeight - parseInt(util.getStyle(_this9.$el.parentNode, 'paddingTop'), 10) - parseInt(util.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) {
+        if (_this10.full && !_this10.height && !_this10.maxHeight) {
+          var height = _this10.$el.parentNode.offsetHeight - parseInt(util.getStyle(_this10.$el.parentNode, 'paddingTop'), 10) - parseInt(util.getStyle(_this10.$el.parentNode, 'paddingBottom'), 10);
+          for (var i = 0; i < _this10.$el.parentNode.childNodes.length; i++) {
+            var ele = _this10.$el.parentNode.childNodes[i];
+            if (ele !== _this10.$el) {
               height -= ele.offsetHeight === undefined ? 0 : ele.offsetHeight;
             }
           }
-          for (var _i = 0; _i < _this9.$el.childNodes.length; _i++) {
-            var _ele = _this9.$el.childNodes[_i];
-            if (_ele !== _this9.$refs.esTableContent) {
+          for (var _i = 0; _i < _this10.$el.childNodes.length; _i++) {
+            var _ele = _this10.$el.childNodes[_i];
+            if (_ele !== _this10.$refs.esTableContent) {
               height -= _ele.offsetHeight === undefined ? 0 : _ele.offsetHeight;
             }
           }
-          _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)) {
+          _this10.styles = { height: height + 'px' };
+          var loadingDom = _this10.$refs.esTableContent.querySelector('.el-loading-mask');
+          for (var _i2 = 0; _i2 < _this10.$refs.esTableContent.childNodes.length; _i2++) {
+            var _ele2 = _this10.$refs.esTableContent.childNodes[_i2];
+            if (_ele2 !== _this10.$refs.oaTable.$el && (!loadingDom || _ele2 !== loadingDom)) {
               height -= _ele2.offsetHeight === undefined ? 0 : _ele2.offsetHeight;
             }
           }
-          var pt = parseInt(util.getStyle(_this9.$refs.esTableContent, 'paddingTop'), 10);
-          var pb = parseInt(util.getStyle(_this9.$refs.esTableContent, 'paddingBottom'), 10);
-          _this9.tableHeight = height - pt - pb + (_this9.page ? 2 : 1) + 'px';
+          var pt = parseInt(util.getStyle(_this10.$refs.esTableContent, 'paddingTop'), 10);
+          var pb = parseInt(util.getStyle(_this10.$refs.esTableContent, 'paddingBottom'), 10);
+          _this10.tableHeight = height - pt - pb + (_this10.page ? 2 : 1) + 'px';
         }
       });
     },
     handleAjax: function handleAjax(handle, row) {
-      var _this10 = this;
+      var _this11 = this;
 
       this.$toast.loading({
         message: '加载中...',
@@ -7959,9 +8016,9 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         method: handle.method,
         format: handle.format
       }).then(function (res) {
-        _this10.$toast.clear();
+        _this11.$toast.clear();
         if (res.rCode === 0) {
-          _this10.$message({
+          _this11.$message({
             message: handle.text + '\u6210\u529F',
             duration: 2000,
             type: 'success',
@@ -7969,17 +8026,17 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
               var first = Object.prototype.hasOwnProperty.call(handle, 'first') ? handle.first : false;
               var reload = handle.reload || true;
               if (reload) {
-                _this10.reload({}, first);
+                _this11.reload({}, first);
               }
             }
           });
         } else {
-          _this10.$toast(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
+          _this11.$toast(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
         }
       }).catch(function () {});
     },
     handleClick: function handleClick(res) {
-      var _this11 = this;
+      var _this12 = this;
 
       var row = res.row,
           handle = res.handle;
@@ -8017,7 +8074,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this11.handleAjax(handle, rows);
+            _this12.handleAjax(handle, rows);
           }).catch(function () {});
         } else {
           this.handleAjax(handle, rows);
@@ -8124,35 +8181,35 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.$emit('row-click', row, column, event);
     },
     getChildrens: function getChildrens(h, items) {
-      var _this12 = this;
+      var _this13 = this;
 
       var doms = [];
       items.childHead.forEach(function (item, index) {
         if (!item.hide) {
           var childs = [];
           if (item.childHead && item.childHead.length) {
-            childs = _this12.getChildrens(h, item);
+            childs = _this13.getChildrens(h, item);
           }
           doms.push(h('em-table-column', {
             ref: 'emTableColum',
             props: {
-              name: _this12.name,
+              name: _this13.name,
               item: item,
-              prop: item[_this12.valueKey],
-              label: item[_this12.labelKey],
+              prop: item[_this13.valueKey],
+              label: item[_this13.labelKey],
               width: item.width,
               index: index + 1000,
-              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
             }
           }, childs));
         }
@@ -8173,7 +8230,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     }
   },
   render: function render(h) {
-    var _this13 = this;
+    var _this14 = this;
 
     var tag = 'div';
     var dom = [];
@@ -8239,28 +8296,28 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       } else if (!items.hide) {
         var tds = [];
         if (items.childHead && items.childHead.length) {
-          tds = _this13.getChildrens(h, items);
+          tds = _this14.getChildrens(h, items);
         }
         dom.push(h('em-table-column', {
           ref: 'emTableColum',
           props: {
-            name: _this13.name,
-            prop: items[_this13.valueKey],
-            label: items[_this13.labelKey],
+            name: _this14.name,
+            prop: items[_this14.valueKey],
+            label: items[_this14.labelKey],
             item: items,
             width: items.width,
             index: indexs,
-            readonly: _this13.readonly,
-            optionData: _this13.optionDatas,
-            form: _this13.form,
-            minWidth: _this13.minWidth
+            readonly: _this14.readonly,
+            optionData: _this14.optionDatas,
+            form: _this14.form,
+            minWidth: _this14.minWidth
           },
           on: {
-            handleClick: _this13.handleClick,
-            formBlur: _this13.formBlur,
-            formFocus: _this13.formFocus,
-            tableColumns: _this13.getTableColumns,
-            formChange: _this13.formChange
+            handleClick: _this14.handleClick,
+            formBlur: _this14.formBlur,
+            formFocus: _this14.formFocus,
+            tableColumns: _this14.getTableColumns,
+            formChange: _this14.formChange
           },
           key: indexs
         }, tds));
@@ -8275,7 +8332,7 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         'header-row-class-name': this.tableHeader,
         data: this.datas
       }, this.$attrs, {
-        height: this.tableHeight !== 'auto' ? this.tableHeight : undefined
+        height: this.tableHeight !== 'auto' ? this.tableHeight : this.tableClientHeight
       }),
       on: table_src_mainvue_type_script_lang_js_extends({}, this.$listeners, {
         'row-click': this.rowClick,
@@ -8284,13 +8341,9 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       ref: 'oaTable'
     }, dom));
     if (this.page) {
+      console.log(this.config, 'this.configpage');
       tableContents.push(h('em-pagination', {
-        attrs: {
-          // ...this.config,
-          pageNum: this.config.pageNum,
-          pageSize: this.config.pageSize,
-          totalCount: this.config.totalCount
-        },
+        attrs: table_src_mainvue_type_script_lang_js_extends({}, this.config),
         class: 'em-table-page',
         style: { 'text-align': this.page.position || 'center' },
         on: {
@@ -8299,19 +8352,10 @@ var table_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }));
     }
     return h('div', {
-      // ref: ref,
-      // attrs: {
-      //   'row-class-name': this.tableRowClassName,
-      //   'header-row-class-name': this.tableHeader,
-      //   data: this.data,
-      //   ...this.$attrs,
-      //   height: this.tableHeight !== 'auto' ? this.tableHeight : undefined
-      // },
-      // on: {
-      //   ...this.$listeners,
-      //   'row-click': this.rowClick,
-      //   'selection-change': this.selectionChange
-      // }
+      ref: 'emTable',
+      style: {
+        height: '100%'
+      }
     }, tableContents);
   }
 });
@@ -18003,7 +18047,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.1.88',
+  version: '0.1.91',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,