eoss-ui 0.4.76 → 0.4.77

package/lib/button.js

@@ -3393,6 +3393,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
   },
   props: {
     icon: String,
+    iconPlacement: {
+      type: String,
+      default: 'start'
+    },
     link: String,
     hide: Boolean,
     param: Object,
@@ -3413,7 +3417,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     useCaseCode: String,
     closed: Function,
     stop: Boolean,
-    syncKeys: Object
+    syncKeys: Object,
+    text: String
   },
   data: function data() {
     return {};
@@ -3605,7 +3610,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         name: 'show',
         value: !this.hide
       }]
-    }, [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default]);
+    }, this.iconPlacement === 'start' ? [this.text, this.$slots.default, this.icon ? h('i', { class: this.icon }) : ''] : [this.icon ? h('i', { class: this.icon }) : '', this.text, this.$slots.default]);
   }
 });
 // CONCATENATED MODULE: ./packages/button/src/main.vue?vue&type=script&lang=js&

package/lib/eoss-ui.common.js

@@ -3378,6 +3378,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
   },
   props: {
     icon: String,
+    iconPlacement: {
+      type: String,
+      default: 'start'
+    },
     link: String,
     hide: Boolean,
     param: Object,
@@ -3398,7 +3402,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     useCaseCode: String,
     closed: Function,
     stop: Boolean,
-    syncKeys: Object
+    syncKeys: Object,
+    text: String
   },
   data: function data() {
     return {};
@@ -3590,7 +3595,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         name: 'show',
         value: !this.hide
       }]
-    }, [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default]);
+    }, this.iconPlacement === 'start' ? [this.text, this.$slots.default, this.icon ? h('i', { class: this.icon }) : ''] : [this.icon ? h('i', { class: this.icon }) : '', this.text, this.$slots.default]);
   }
 });
 // CONCATENATED MODULE: ./packages/button/src/main.vue?vue&type=script&lang=js&
@@ -12502,8 +12507,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_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=84c3a3ea&
-var mainvue_type_template_id_84c3a3ea_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=7c42d088&
+var mainvue_type_template_id_7c42d088_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12530,6 +12535,7 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                 "es-form-inside-dialog": _vm.dialog,
               },
               attrs: {
+                disabled: _vm.disabled,
                 "label-position": _vm.labelPosition,
                 model: _vm.models,
                 "label-width": _vm.labelWidth,
@@ -14322,13 +14328,42 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                               k
                                                                             ) {
                                                                               return [
+                                                                                inline.type ==
+                                                                                  "button" &&
                                                                                 !inline.hide
+                                                                                  ? _c(
+                                                                                      "es-button",
+                                                                                      _vm._b(
+                                                                                        {
+                                                                                          staticClass:
+                                                                                            "es-button-inline",
+                                                                                          attrs:
+                                                                                            {
+                                                                                              disabled:
+                                                                                                _vm.disabled ||
+                                                                                                inline.disabled,
+                                                                                            },
+                                                                                        },
+                                                                                        "es-button",
+                                                                                        _vm.handleExclAttribute(
+                                                                                          {
+                                                                                            data: inline,
+                                                                                            attrs:
+                                                                                              [
+                                                                                                "disabled",
+                                                                                              ],
+                                                                                          }
+                                                                                        ),
+                                                                                        false
+                                                                                      )
+                                                                                    )
+                                                                                  : !inline.hide
                                                                                   ? _c(
                                                                                       "div",
                                                                                       {
                                                                                         key: k,
                                                                                         staticClass:
-                                                                                          "es-form-inline",
+                                                                                          "es-form-inline es-form-item-inline",
                                                                                       },
                                                                                       [
                                                                                         inline.range !==
@@ -14353,12 +14388,10 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                                               {
                                                                                                 "label-width":
                                                                                                   "0",
-                                                                                                prop: item
-                                                                                                  .inline
-                                                                                                  .name,
+                                                                                                prop: inline.name,
                                                                                                 rules:
                                                                                                   _vm.getRules(
-                                                                                                    item.inline
+                                                                                                    inline
                                                                                                   ),
                                                                                               },
                                                                                           },
@@ -16724,13 +16757,42 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                 k
                                                               ) {
                                                                 return [
+                                                                  inline.type ==
+                                                                    "button" &&
                                                                   !inline.hide
+                                                                    ? _c(
+                                                                        "es-button",
+                                                                        _vm._b(
+                                                                          {
+                                                                            staticClass:
+                                                                              "es-button-inline",
+                                                                            attrs:
+                                                                              {
+                                                                                disabled:
+                                                                                  _vm.disabled ||
+                                                                                  inline.disabled,
+                                                                              },
+                                                                          },
+                                                                          "es-button",
+                                                                          _vm.handleExclAttribute(
+                                                                            {
+                                                                              data: inline,
+                                                                              attrs:
+                                                                                [
+                                                                                  "disabled",
+                                                                                ],
+                                                                            }
+                                                                          ),
+                                                                          false
+                                                                        )
+                                                                      )
+                                                                    : !inline.hide
                                                                     ? _c(
                                                                         "div",
                                                                         {
                                                                           key: k,
                                                                           staticClass:
-                                                                            "es-form-inline",
+                                                                            "es-form-inline es-form-item-inline",
                                                                         },
                                                                         [
                                                                           inline.range !==
@@ -16755,12 +16817,10 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                                 {
                                                                                   "label-width":
                                                                                     "0",
-                                                                                  prop: item
-                                                                                    .inline
-                                                                                    .name,
+                                                                                  prop: inline.name,
                                                                                   rules:
                                                                                     _vm.getRules(
-                                                                                      item.inline
+                                                                                      inline
                                                                                     ),
                                                                                 },
                                                                             },
@@ -19620,13 +19680,42 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                           k
                                                                         ) {
                                                                           return [
+                                                                            inline.type ==
+                                                                              "button" &&
                                                                             !inline.hide
+                                                                              ? _c(
+                                                                                  "es-button",
+                                                                                  _vm._b(
+                                                                                    {
+                                                                                      staticClass:
+                                                                                        "es-button-inline",
+                                                                                      attrs:
+                                                                                        {
+                                                                                          disabled:
+                                                                                            _vm.disabled ||
+                                                                                            inline.disabled,
+                                                                                        },
+                                                                                    },
+                                                                                    "es-button",
+                                                                                    _vm.handleExclAttribute(
+                                                                                      {
+                                                                                        data: inline,
+                                                                                        attrs:
+                                                                                          [
+                                                                                            "disabled",
+                                                                                          ],
+                                                                                      }
+                                                                                    ),
+                                                                                    false
+                                                                                  )
+                                                                                )
+                                                                              : !inline.hide
                                                                               ? _c(
                                                                                   "div",
                                                                                   {
                                                                                     key: k,
                                                                                     staticClass:
-                                                                                      "es-form-inline",
+                                                                                      "es-form-inline es-form-item-inline",
                                                                                   },
                                                                                   [
                                                                                     inline.range !==
@@ -19651,12 +19740,10 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                                           {
                                                                                             "label-width":
                                                                                               "0",
-                                                                                            prop: item
-                                                                                              .inline
-                                                                                              .name,
+                                                                                            prop: inline.name,
                                                                                             rules:
                                                                                               _vm.getRules(
-                                                                                                item.inline
+                                                                                                inline
                                                                                               ),
                                                                                           },
                                                                                       },
@@ -21829,13 +21916,42 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                           item.inline,
                                                           function (inline, k) {
                                                             return [
-                                                              !inline.hide
+                                                              inline.type ==
+                                                                "button" &&
+                                                              !inline.readonly &&
+                                                              !_vm.readonly
+                                                                ? _c(
+                                                                    "es-button",
+                                                                    _vm._b(
+                                                                      {
+                                                                        staticClass:
+                                                                          "es-button-inline",
+                                                                        attrs: {
+                                                                          disabled:
+                                                                            _vm.disabled ||
+                                                                            inline.disabled,
+                                                                        },
+                                                                      },
+                                                                      "es-button",
+                                                                      _vm.handleExclAttribute(
+                                                                        {
+                                                                          data: inline,
+                                                                          attrs:
+                                                                            [
+                                                                              "disabled",
+                                                                            ],
+                                                                        }
+                                                                      ),
+                                                                      false
+                                                                    )
+                                                                  )
+                                                                : !inline.hide
                                                                 ? _c(
                                                                     "div",
                                                                     {
                                                                       key: k,
                                                                       staticClass:
-                                                                        "es-form-inline",
+                                                                        "es-form-inline es-form-item-inline",
                                                                     },
                                                                     [
                                                                       inline.range !==
@@ -21853,6 +21969,33 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                             ]
                                                                           )
                                                                         : _vm._e(),
+                                                                      inline.type ==
+                                                                      "button"
+                                                                        ? _c(
+                                                                            "es-button",
+                                                                            _vm._b(
+                                                                              {},
+                                                                              "es-button",
+                                                                              _vm.handleExclAttribute(
+                                                                                {
+                                                                                  data: inline,
+                                                                                  attrs:
+                                                                                    [
+                                                                                      "text",
+                                                                                    ],
+                                                                                }
+                                                                              ),
+                                                                              false
+                                                                            ),
+                                                                            [
+                                                                              _vm._v(
+                                                                                _vm._s(
+                                                                                  inline.text
+                                                                                )
+                                                                              ),
+                                                                            ]
+                                                                          )
+                                                                        : _vm._e(),
                                                                       _c(
                                                                         "el-form-item",
                                                                         {
@@ -21860,12 +22003,10 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
                                                                             {
                                                                               "label-width":
                                                                                 "0",
-                                                                              prop: item
-                                                                                .inline
-                                                                                .name,
+                                                                              prop: inline.name,
                                                                               rules:
                                                                                 _vm.getRules(
-                                                                                  item.inline
+                                                                                  inline
                                                                                 ),
                                                                             },
                                                                         },
@@ -23133,11 +23274,11 @@ var mainvue_type_template_id_84c3a3ea_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_84c3a3ea_staticRenderFns = []
-mainvue_type_template_id_84c3a3ea_render._withStripped = true
+var mainvue_type_template_id_7c42d088_staticRenderFns = []
+mainvue_type_template_id_7c42d088_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=84c3a3ea&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7c42d088&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -26916,6 +27057,69 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -26968,6 +27172,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       type: String,
       default: 'post'
     },
+    disabled: Boolean,
     modelMethod: {
       type: String,
       default: 'get'
@@ -28125,8 +28330,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_84c3a3ea_render,
-  mainvue_type_template_id_84c3a3ea_staticRenderFns,
+  mainvue_type_template_id_7c42d088_render,
+  mainvue_type_template_id_7c42d088_staticRenderFns,
   false,
   null,
   null,
@@ -63437,8 +63642,8 @@ toolbar_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_toolbar = (toolbar_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/table.vue?vue&type=template&id=1875e8ce&
-var tablevue_type_template_id_1875e8ce_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/table.vue?vue&type=template&id=ccea08f4&
+var tablevue_type_template_id_ccea08f4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -64605,13 +64810,42 @@ var tablevue_type_template_id_1875e8ce_render = function () {
                                                                       k
                                                                     ) {
                                                                       return [
+                                                                        inline.type ==
+                                                                          "button" &&
                                                                         !inline.hide
+                                                                          ? _c(
+                                                                              "es-button",
+                                                                              _vm._b(
+                                                                                {
+                                                                                  staticClass:
+                                                                                    "es-button-inline",
+                                                                                  attrs:
+                                                                                    {
+                                                                                      disabled:
+                                                                                        _vm.isDisabled ||
+                                                                                        inline.disabled,
+                                                                                    },
+                                                                                },
+                                                                                "es-button",
+                                                                                _vm.handleExclAttribute(
+                                                                                  {
+                                                                                    data: inline,
+                                                                                    attrs:
+                                                                                      [
+                                                                                        "disabled",
+                                                                                      ],
+                                                                                  }
+                                                                                ),
+                                                                                false
+                                                                              )
+                                                                            )
+                                                                          : !inline.hide
                                                                           ? _c(
                                                                               "div",
                                                                               {
                                                                                 key: k,
                                                                                 staticClass:
-                                                                                  "es-form-inline",
+                                                                                  "es-form-inline es-form-item-inline",
                                                                               },
                                                                               [
                                                                                 inline.range !==
@@ -64636,12 +64870,10 @@ var tablevue_type_template_id_1875e8ce_render = function () {
                                                                                       {
                                                                                         "label-width":
                                                                                           "0",
-                                                                                        prop: item
-                                                                                          .inline
-                                                                                          .name,
+                                                                                        prop: inline.name,
                                                                                         rules:
                                                                                           _vm.getRules(
-                                                                                            item.inline
+                                                                                            inline
                                                                                           ),
                                                                                       },
                                                                                   },
@@ -66024,11 +66256,11 @@ var tablevue_type_template_id_1875e8ce_render = function () {
     2
   )
 }
-var tablevue_type_template_id_1875e8ce_staticRenderFns = []
-tablevue_type_template_id_1875e8ce_render._withStripped = true
+var tablevue_type_template_id_ccea08f4_staticRenderFns = []
+tablevue_type_template_id_ccea08f4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=1875e8ce&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=ccea08f4&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=script&lang=js&
 //
@@ -67064,6 +67296,17 @@ tablevue_type_template_id_1875e8ce_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -67092,6 +67335,9 @@ tablevue_type_template_id_1875e8ce_render._withStripped = true
   inject: {
     scale: {
       default: ''
+    },
+    esForm: {
+      default: ''
     }
   },
   props: {
@@ -67101,6 +67347,7 @@ tablevue_type_template_id_1875e8ce_render._withStripped = true
         return {};
       }
     },
+    disabled: Boolean,
     span: Number,
     contents: {
       type: Array,
@@ -67196,6 +67443,9 @@ tablevue_type_template_id_1875e8ce_render._withStripped = true
       set: function set(val) {
         return val;
       }
+    },
+    isDisabled: function isDisabled() {
+      return this.disabled || (this.esForm || {}).disabled;
     }
   },
   watch: {
@@ -67353,8 +67603,8 @@ tablevue_type_template_id_1875e8ce_render._withStripped = true
 
 var form_src_table_component = normalizeComponent(
   packages_form_src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_1875e8ce_render,
-  tablevue_type_template_id_1875e8ce_staticRenderFns,
+  tablevue_type_template_id_ccea08f4_render,
+  tablevue_type_template_id_ccea08f4_staticRenderFns,
   false,
   null,
   null,
@@ -69275,7 +69525,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.76',
+  version: '0.4.77',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,