meixioacomponent 0.3.39 → 0.3.42

package/lib/style/element/index.css

@@ -8923,16 +8923,7 @@
   outline-width: 0;
 }
 
-.el-tooltip__popper {
-  position: absolute;
-  border-radius: 4px;
-  padding: 10px;
-  z-index: 2000;
-  font-size: 12px;
-  line-height: 1.2;
-  min-width: 10px;
-  word-wrap: break-word;
-}
+
 
 .el-tooltip__popper .popper__arrow,
 .el-tooltip__popper .popper__arrow::after {
@@ -14276,16 +14267,6 @@
   outline-width: 0;
 }
 
-.el-tooltip__popper {
-  position: absolute;
-  border-radius: 4px;
-  padding: 10px;
-  z-index: 2000;
-  font-size: 12px;
-  line-height: 1.2;
-  min-width: 10px;
-  word-wrap: break-word;
-}
 
 .el-tooltip__popper .popper__arrow,
 .el-tooltip__popper .popper__arrow::after {
@@ -18390,7 +18371,7 @@
 .el-tooltip__popper {
   position: absolute;
   border-radius: 4px;
-  padding: 10px;
+  padding: 4px;
   z-index: 2000;
   font-size: 12px;
   line-height: 1.2;

package/lib/style/index.less

@@ -13,6 +13,10 @@ body {
   margin: 0px;
   --footer-height: 40px;
   --header-height: 63px;
+
+  .popper__arrow {
+    display: none !important;
+  }
 }
 
 html {
@@ -109,4 +113,4 @@ h6 {
 
 #nprogress .bar {
   background: var(--color-primary) !important;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.39",
+  "version": "0.3.42",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/base/baseIcon/index.vue

@@ -2,24 +2,27 @@
   <div
     class="base-icon-wrap"
     :title="title"
-    @click.stop="iconClick"
     :class="{ event: event && !disable, plain: plain, disable: disable }"
   >
-    <i :class="iconName" :style="{ color: _color, fontSize: _size }"></i>
+    <i
+      @click.stop="iconClick"
+      :class="iconName"
+      :style="{ color: _color, fontSize: _size }"
+    ></i>
   </div>
 </template>
 
 <script>
 export default {
-  name: "baseIcon",
+  name: 'baseIcon',
   data() {
-    return {};
+    return {}
   },
 
   props: {
     iconClass: {
       type: String,
-      default: "meixi",
+      default: 'meixi',
     },
     event: {
       type: Boolean,
@@ -30,11 +33,11 @@ export default {
       require: true,
     },
     color: {
-      default: "d",
+      default: 'd',
       type: String,
     },
     size: {
-      default: "d",
+      default: 'd',
       type: String,
     },
     active: {
@@ -55,65 +58,66 @@ export default {
   },
   computed: {
     _color() {
-      let color = null;
+      let color = null
       if (this.$props.active) {
-        color = `var(--color-primary)`;
-        return color;
+        color = `var(--color-primary)`
+        return color
       }
-      let propsColor = this.$props.color;
+      let propsColor = this.$props.color
       switch (propsColor) {
-        case "d":
-          color = `var(--icon-color-d)`;
-          break;
-        case "m":
-          color = `var(--icon-color-m)`;
-          break;
-        case "s":
-          color = `var(--icon-color-s)`;
-          break;
+        case 'd':
+          color = `var(--icon-color-d)`
+          break
+        case 'm':
+          color = `var(--icon-color-m)`
+          break
+        case 's':
+          color = `var(--icon-color-s)`
+          break
         default:
-          color = `var(--${propsColor})`;
-          break;
+          color = `var(--${propsColor})`
+          break
       }
-      return color;
+      return color
     },
     _size() {
-      let size = null;
+      let size = null
       switch (this.$props.size) {
-        case "s":
-          size = `var(--icon-size-s)`;
-          break;
-        case "d":
-          size = `var(--icon-size-base)`;
-          break;
-        case "l":
-          size = `var(--icon-size-l)`;
-          break;
+        case 's':
+          size = `var(--icon-size-s)`
+          break
+        case 'd':
+          size = `var(--icon-size-base)`
+          break
+        case 'l':
+          size = `var(--icon-size-l)`
+          break
 
         default:
-          break;
+          break
       }
-      return size;
+      return size
     },
     iconName() {
-      let _iconClass = this.$props.iconClass;
-      if (_iconClass == "meixi") {
-        return `meixicomponenticonfont ${this.$props.name}`;
-      } else if (_iconClass == "element") {
-        return `${this.$props.name}`;
-      } else if (_iconClass == "other") {
-        return `${this.$props.name}`;
+      let _iconClass = this.$props.iconClass
+      if (_iconClass == 'meixi') {
+        return `meixicomponenticonfont ${this.$props.name}`
+      } else if (_iconClass == 'element') {
+        return `${this.$props.name}`
+      } else if (_iconClass == 'other') {
+        return `${this.$props.name}`
       }
     },
   },
   methods: {
     iconClick() {
       if (this.$props.event) {
-        this.$emit("iconClick");
+        console.log('das')
+        this.$emit('iconClick')
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -139,7 +143,7 @@ export default {
   &:hover {
     // background: var(--hover-gray);
     i {
-      color: var(--color-primary) !important;
+      color: var(--color-primary);
     }
   }
 }

package/packages/components/base/baseLineInfoItem/baseLineInfoItem.vue

@@ -8,7 +8,7 @@
         :size="`l`"
         :event="event"
         @iconClick="iconClick"
-        style="margin-right: var(--margin-5)"
+        style="margin-right: var(--margin-5);"
       ></base-icon>
       <span>{{ label }}</span>
     </div>
@@ -29,8 +29,8 @@
             textAlign: valueAlign,
           }"
         >
-          {{ value }}</span
-        >
+          {{ value }}
+        </span>
       </el-tooltip>
 
       <div
@@ -48,15 +48,15 @@
 
 <script>
 export default {
-  name: "baseLineInfoItem",
+  name: 'baseLineInfoItem',
   data() {
     return {
       isChildren: false,
-    };
+    }
   },
   created() {
-    if (this.$parent.$options.name == "baseLineInfoGroup") {
-      this.isChildren = true;
+    if (this.$parent.$options.name == 'baseLineInfoGroup') {
+      this.isChildren = true
     }
   },
   props: {
@@ -81,7 +81,7 @@ export default {
     },
     valueAlign: {
       type: String,
-      default: "left",
+      default: 'left',
     },
     labelWidth: {
       type: Number,
@@ -89,45 +89,45 @@ export default {
   },
   computed: {
     _labelWidth() {
-      let width = null;
+      let width = null
       if (this.isChildren) {
-        width = this.$parent.labelWidth;
+        width = this.$parent.labelWidth
       } else {
-        width = this.$props.labelWidth;
+        width = this.$props.labelWidth
       }
-      return width;
+      return width
     },
 
     slotAlignStyle() {
-      let value = "";
-      let align = this.$props.valueAlign;
+      let value = ''
+      let align = this.$props.valueAlign
       switch (align) {
-        case "left":
-          value = `flex-start`;
-          break;
-        case "center":
-          value = `center`;
-          break;
-        case "right":
-          value = "flex-end";
-          break;
+        case 'left':
+          value = `flex-start`
+          break
+        case 'center':
+          value = `center`
+          break
+        case 'right':
+          value = 'flex-end'
+          break
 
         default:
-          break;
+          break
       }
-      return value;
+      return value
     },
   },
   methods: {
     iconClick() {
       if (this.isChildren) {
-        this.$emit("infoclickicon");
+        this.$emit('infoclickicon')
       } else {
-        this.$emit("infoclickicon", this.$props);
+        this.$emit('infoclickicon', this.$props)
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -137,7 +137,12 @@ export default {
   display: flex;
   align-items: center;
   flex-flow: row nowrap;
+  margin-bottom: var(--margin-4);
   justify-content: space-between;
+
+  &:last-of-type {
+    margin-bottom: 0px;
+  }
   .infor-label {
     display: flex;
     align-items: center;
@@ -148,8 +153,6 @@ export default {
   }
   .infor-value {
     box-sizing: border-box;
-    padding: var(--padding-5) 0px;
-    padding-left: var(--padding-5);
     .infor-value_text {
       vertical-align: middle;
       color: var(--font-color-d);

package/packages/components/base/basePopoverButton/index.vue

@@ -19,6 +19,7 @@
       :disabled="disabled"
       class="popover-button"
       :type="module ? 'selected' : 'info'"
+      @click.stop="iconClick"
       :class="{ 'is-single': !buttonText && buttonIcon }"
     >
       <base-icon
@@ -32,7 +33,7 @@
         @iconClick="iconClick"
         :color="module ? 'text-white' : 'd'"
       ></base-icon>
-      <span class="inner-span" v-if="buttonText"> {{ buttonText }}</span>
+      <span class="inner-span" v-if="buttonText">{{ buttonText }}</span>
     </el-button>
     <template slot="reference" v-else>
       <slot name="popoverReference"></slot>
@@ -42,9 +43,9 @@
 
 <script>
 export default {
-  name: "basePopoverButton",
+  name: 'basePopoverButton',
   data() {
-    return {};
+    return {}
   },
 
   props: {
@@ -57,17 +58,17 @@ export default {
     // 	click/focus/hover/manual
     trigger: {
       type: String,
-      default: "click",
+      default: 'click',
     },
     // 位置
     // top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end
     placement: {
-      default: "bottom",
+      default: 'bottom',
       type: String,
     },
     // button 按钮的大小
     buttonSize: {
-      default: "small",
+      default: 'small',
     },
     // 控制显影的参数
     value: {
@@ -77,7 +78,7 @@ export default {
     // button文字内容
     buttonText: {
       type: String,
-      default: "",
+      default: '',
     },
 
     // icon的类名
@@ -88,7 +89,7 @@ export default {
 
     iconClass: {
       type: String,
-      default: "meixi",
+      default: 'meixi',
     },
 
     template: {
@@ -99,33 +100,29 @@ export default {
   computed: {
     module: {
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
     },
   },
   methods: {
     popoverShow() {
-      this.$emit("popoverShow");
+      this.$emit('popoverShow')
     },
     popoverHide() {
-      this.$emit("poporverHide");
+      this.$emit('poporverHide')
     },
     iconClick() {
-      this.module = !this.module;
+      this.$refs.popover.doShow()
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
-.popover-content {
-}
 .popover-button {
-  .button-icon {
-  }
   /deep/ span {
     display: flex;
     align-items: center;
@@ -139,6 +136,5 @@ export default {
 .is-single {
   border: none;
   padding: 7px !important;
-  background: var(--color-gray-m);
 }
 </style>

package/packages/components/proForm/proForm/pro_form.vue

@@ -38,25 +38,27 @@
               @formItemConfirm="formItemConfirm"
               @disableWatcherResult="disableWatcherResult"
               :disableWatcher="setWatcher(item.key)"
-              v-if="formType == 'default' && item.type != 'area'"
+              v-if="formType == 'default'"
             >
               <template slot="template" v-if="item.type == 'template'">
                 <slot :name="`form-${item.key}`" :scope="module"></slot>
               </template>
+              <template slot="area" v-if="item.type == 'area'">
+                <baseAreaVue
+                  v-model="item.value"
+                  :disable="item.disabled"
+                  :ref="`area-${item.key}`"
+                  :style="{ width: `100%` }"
+                  :class="[`form-item-${item.key}`]"
+                  @confirmAreaValue="
+                    formItemConfirm({
+                      config: item,
+                    })
+                  "
+                ></baseAreaVue>
+              </template>
             </pro_form_itemVue>
-            <baseAreaVue
-              v-model="item.value"
-              :disable="item.disabled"
-              v-if="item.type == 'area'"
-              :ref="`area-${item.key}`"
-              :style="{ width: `100%` }"
-              :class="[`form-item-${item.key}`]"
-              @confirmAreaValue="
-                formItemConfirm({
-                  config: item,
-                })
-              "
-            ></baseAreaVue>
+
             <baseUploadVue
               v-model="item.value"
               :max="formConfig.max"

package/packages/components/proForm/proForm/pro_form_item.vue

@@ -8,7 +8,7 @@
       'form-item-wrap': true,
     }"
   >
-    <div class="item-content" v-if="config.type != 'template' && !isEdit">
+    <div class="item-content" v-if="!typeOftemplate && !isEdit">
       <p
         v-if="!spContentType"
         class="content-value"
@@ -185,10 +185,13 @@
         type="textarea"
         v-model="module"
         :disabled="isDisabled"
+        :maxlength="config.maxlength"
         v-if="config.type == 'textarea'"
+        :show-word-limit="config.maxlength ? true : false"
       ></el-input>
       <!-- 插槽 -->
       <slot name="template" v-else-if="config.type == 'template'"></slot>
+      <slot name="area" v-else-if="config.type == 'area'"></slot>
     </div>
     <!-- 确定的按钮 -->
     <div class="bottom-handle-wrap" v-show="isEdit && !form">
@@ -213,7 +216,6 @@
 </template>
 
 <script>
-import { FilterTime } from '../../../utils/utils'
 //
 import componentConfig from '../../../config/componentConfig'
 export default {
@@ -303,6 +305,17 @@ export default {
       }
       return false
     },
+
+    typeOftemplate() {
+      const { type } = this.$props.config
+
+      if (type == 'template' || type == 'area') {
+        return true
+      }
+
+      return false
+    },
+
     contentValue() {
       let type = this.$props.config.type
       switch (type) {
@@ -425,7 +438,6 @@ export default {
     },
     targetFocus() {
       let ref = this.$refs.target
-      console.log(ref)
       if (ref) {
         ref.focus()
       }