meixioacomponent 0.2.47 → 0.2.50

package/package.json

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

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

@@ -1,9 +1,9 @@
 <template>
   <div class="pro_form_content" ref="proFormWrap">
     <el-form
-      v-if="!loading"
       ref="form"
       :rules="rules"
+      v-if="!loading"
       :model="formdata"
       :label-width="labelWidth"
       :label-position="labelPosition"
@@ -14,6 +14,9 @@
         v-show="!item.renderHide"
         class="pro-form-item-content"
         :class="[`chunk-${chunkLength}`]"
+        :style="{
+          width: itemWidth,
+        }"
       >
         <el-form-item
           :prop="item.key"
@@ -72,6 +75,7 @@
         :key="item.key"
         v-for="item in module"
         :class="[`chunk-${chunkLength}`, `${flexClass}`, size]"
+        :style="{ width: itemWidth }"
       >
         <pro_formItem_skeletonVue></pro_formItem_skeletonVue>
       </div>
@@ -162,6 +166,9 @@ export default {
     pro_formItem_skeletonVue,
   },
   computed: {
+    itemWidth() {
+      return `${100 / this.chunkLength}%`;
+    },
     module: {
       set(val) {
         this.$emit("input", val);
@@ -382,7 +389,7 @@ export default {
     display: flex;
     flex-flow: row wrap;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
   }
   /deep/.el-form {
     width: 100%;
@@ -390,7 +397,7 @@ export default {
     display: flex;
     flex-flow: row wrap;
     align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
   }
   /deep/ .el-form-item {
     width: 100%;
@@ -401,15 +408,7 @@ export default {
     padding-right: var(--padding-5);
     margin-left: 0px !important;
   }
-  .chunk-1 {
-    width: 100%;
-  }
-  .chunk-2 {
-    width: 50%;
-  }
-  .chunk-3 {
-    width: 33%;
-  }
+
   .flex-row {
     display: flex;
     align-items: center;

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

@@ -73,6 +73,7 @@
         ref="target"
         :size="size"
         v-model="module"
+        :disabled="config.disabled"
         v-if="config.type == 'input'"
         style="width: 100%; height: 100%"
       >
@@ -81,17 +82,21 @@
       <el-input-number
         ref="target"
         :size="size"
-        v-else-if="config.type == 'number'"
-        v-model.number="module"
         :controls="false"
+        v-model.number="module"
+        :disabled="config.disabled"
+        v-else-if="config.type == 'number'"
+        style="width: 100%; height: 100%"
       ></el-input-number>
       <!--数字类型两位小数  -->
       <el-input-number
         :size="size"
         ref="target"
         :precision="2"
-        v-model.number="module"
         :controls="false"
+        v-model.number="module"
+        :disabled="config.disabled"
+        style="width: 100%; height: 100%"
         v-else-if="config.type == 'number2'"
       ></el-input-number>
       <!-- select选择器 -->
@@ -103,6 +108,7 @@
         :multiple="multiple"
         :filterable="true"
         :loading="selectLoading"
+        :disabled="config.disabled"
         @visible-change="visibleChange"
         style="width: 100%; height: 100%"
         v-else-if="config.type == 'select'"
@@ -125,6 +131,7 @@
         ref="target"
         placeholder="选择日期"
         value-format="timestamp"
+        :disabled="config.disabled"
         :prefix-icon="`el-icon-time`"
         style="width: 100%; height: 100%"
         v-else-if="config.type == 'time'"
@@ -135,11 +142,13 @@
       <el-radio-group
         v-model="module"
         size="mini"
+        :disabled="config.disabled"
         v-else-if="config.type == 'radio'"
       >
         <el-radio-button
           :key="index"
           :label="item.value"
+          :disabled="config.disabled"
           v-for="(item, index) in config.list"
           >{{ item.label }}</el-radio-button
         >
@@ -151,11 +160,13 @@
         :max="checkMax"
         v-model="module"
         style="width: 100%"
+        :disabled="config.disabled"
         v-else-if="config.type == 'checkbox'"
       >
         <el-checkbox
           :key="index"
           :label="item"
+          :disabled="config.disabled"
           v-for="(item, index) in config.list"
           >{{ item }}</el-checkbox
         >
@@ -167,6 +178,7 @@
         :size="size"
         type="textarea"
         v-model="module"
+        :disabled="config.disabled"
         v-if="config.type == 'textarea'"
       >
       </el-input>

package/packages/components/proForm/proFormWrap/pro_form_wrap.vue

@@ -26,12 +26,13 @@
           :rowNumber="rowNumber"
           :labelWidth="labelWidth"
           @formItemConfirm="formItemConfirm"
-        ></pro_formVue>
-        <template v-for="slotItem in slotList">
-          <template :slot="`form-${slotItem}`">
-            <slot :scope="formList" :name="`formslot-${slotItem}`"></slot>
+        >
+          <template v-for="slotItem in slotList">
+            <template :slot="`form-${slotItem}`">
+              <slot :scope="formList" :name="`formslot-${slotItem}`"></slot>
+            </template>
           </template>
-        </template> </template
+        </pro_formVue> </template
     ></baseSectionVue>
   </div>
 </template>
@@ -49,6 +50,7 @@ export default {
   },
   created() {
     this.createSlots();
+    console.log(this.slotList);
   },
   props: {
     form: {