eoss-mobiles 0.1.87 → 0.1.89

package/CHANGELOG.md

@@ -1,7 +1,10 @@
 ## 更新日志
 
-### 0.1.84
+### 0.1.88
 
+- 2023-12-08
+  - fix:<br/>1. input 组件新增属性required-position必填图标展示的位置<br/>2. form 组件优化验证表格
+  - 版本号:0.1.88
 - 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,
@@ -8284,13 +8335,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 +8346,9 @@ 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
-      // }
+      style: {
+        height: '100%'
+      }
     }, tableContents);
   }
 });
@@ -16266,8 +16303,8 @@ count_down_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var count_down = (count_down_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=ed69589e&
-var mainvue_type_template_id_ed69589e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=c96d908e&
+var mainvue_type_template_id_c96d908e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -16685,11 +16722,11 @@ var mainvue_type_template_id_ed69589e_render = function () {
     2
   )
 }
-var mainvue_type_template_id_ed69589e_staticRenderFns = []
-mainvue_type_template_id_ed69589e_render._withStripped = true
+var mainvue_type_template_id_c96d908e_staticRenderFns = []
+mainvue_type_template_id_c96d908e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=ed69589e&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=c96d908e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=script&lang=js&
 //
@@ -16956,11 +16993,13 @@ mainvue_type_template_id_ed69589e_render._withStripped = true
     },
     handleSubmit: function handleSubmit() {
       var errForm = false;
-      this.$refs.emFormTable.map(function (item) {
-        if (!item.validate()) {
-          errForm = true;
-        }
-      });
+      if (this.$refs.emFormTable) {
+        this.$refs.emFormTable.map(function (item) {
+          if (!item.validate()) {
+            errForm = true;
+          }
+        });
+      }
       if (errForm) {
         this.$emit('failed', { errors: [], values: this.model });
       } else {
@@ -17002,8 +17041,8 @@ mainvue_type_template_id_ed69589e_render._withStripped = true
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_ed69589e_render,
-  mainvue_type_template_id_ed69589e_staticRenderFns,
+  mainvue_type_template_id_c96d908e_render,
+  mainvue_type_template_id_c96d908e_staticRenderFns,
   false,
   null,
   null,
@@ -18001,7 +18040,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.1.87',
+  version: '0.1.89',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/field.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/field/src/main.vue?vue&type=template&id=4bdc96b0&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -216,6 +216,14 @@ var 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",
@@ -238,7 +246,8 @@ var 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 : [],
               },
@@ -263,6 +272,24 @@ var 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)
           }),
@@ -277,7 +304,7 @@ var staticRenderFns = []
 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&
 //
@@ -317,6 +344,18 @@ render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EmInput',
@@ -326,6 +365,14 @@ render._withStripped = true
       type: [String, Array, Number],
       default: ''
     },
+    label: {
+      type: String,
+      default: ''
+    },
+    labelAlign: {
+      type: String,
+      default: 'left'
+    },
     required: {
       type: Boolean,
       default: false
@@ -363,6 +410,10 @@ render._withStripped = true
     type: {
       type: String,
       default: 'text'
+    },
+    requiredPosition: {
+      type: String,
+      default: 'left'
     }
   },
   data: function data() {
@@ -375,7 +426,6 @@ render._withStripped = true
   },
 
   computed: {
-
     getRightIcon: {
       get: function get() {
         var icon = undefined;
@@ -403,6 +453,7 @@ render._withStripped = true
     }
   },
   mounted: function mounted() {
+    console.log(this.$slots, 's');
     this.newType = this.type;
     this.newPlaceholder = this.$attrs.placeholder;
     this.newErrorMessage = this.errorMessage;

package/lib/form.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/form/src/main.vue?vue&type=template&id=ed69589e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=c96d908e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -622,7 +622,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=ed69589e&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=c96d908e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=script&lang=js&
 //
@@ -889,11 +889,13 @@ render._withStripped = true
     },
     handleSubmit: function handleSubmit() {
       var errForm = false;
-      this.$refs.emFormTable.map(function (item) {
-        if (!item.validate()) {
-          errForm = true;
-        }
-      });
+      if (this.$refs.emFormTable) {
+        this.$refs.emFormTable.map(function (item) {
+          if (!item.validate()) {
+            errForm = true;
+          }
+        });
+      }
       if (errForm) {
         this.$emit('failed', { errors: [], values: this.model });
       } else {