bri-components 1.2.6 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/DshInput.vue

@@ -5,7 +5,7 @@
             <Input
                 class="DshInput-edit"
                 v-model="value[controlKey]"
-                :type="subType"
+                :type="inputType"
                 :placeholder="selfPropsObj._placeholder"
                 :readonly="selfPropsObj._readonly"
                 :disabled="!finalCanEdit || selfPropsObj._disabled"
@@ -38,7 +38,7 @@
         <!-- 查看 -->
         <template v-else>
             <!-- 查看页 的textarea单独处理 -->
-            <template v-if="subType === 'textarea' && !isUnitShow && !$isEmptyData(curVal)">
+            <template v-if="inputType === 'textarea' && !$isEmptyData(curVal) && !isUnitShow">
                 <p
                     class="DshInput-show-textarea"
                     v-text="showVal"
@@ -59,7 +59,7 @@
                     }">
                         <!-- 有值 -->
                         <a
-                            v-if="!$isEmptyData(curVal) && textType === 'url'"
+                            v-if="inputType === 'url' && !$isEmptyData(curVal)"
                             class="text"
                             @click="goHttpWindow($event)"
                         >
@@ -95,8 +95,8 @@
             selfPropsObj () {
                 return {
                     _textType: "default",
-                    _readonly: ["serialNumber"].includes(this.propsObj._type),
-                    // _disabled: ["serialNumber"].includes(this.propsObj._type),
+                    _readonly: ["serialNumber"].includes(this.controlType),
+                    _disabled: ["serialNumber"].includes(this.controlType),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
                         minRows: 2
@@ -106,15 +106,18 @@
                     ...this.commonDealPropsObj
                 };
             },
-            subType () {
-                return ["serialNumber"].includes(this.selfPropsObj._type)
-                    ? "text"
-                    : ["text", "textarea", "password", "url", "email", "number", "tel"].includes(this.selfPropsObj._type)
-                        ? this.selfPropsObj._type
-                        : "text";
+            inputType () {
+                return ["textarea", "password", "email", "url", "number", "tel"].includes(this.controlType)
+                    ? this.controlType
+                    : ["text"].includes(this.controlType) && ["url"].includes(this.subType)
+                        ? "url"
+                        : ["serialNumber"].includes(this.controlType)
+                            ? "text"
+                            : "text";
             },
-            textType () {
-                return this.propsObj._textType;
+            // 子类型，只在type="text"有效
+            subType () {
+                return this.selfPropsObj._textType;
             }
         },
         created () {},

package/src/components/list/DshBox/DshBox.vue

@@ -46,7 +46,9 @@
                 :propsObj="pagePropsObj"
                 @changePage="changePage"
                 @changePageSize="changePageSize"
-            ></dsh-page>
+            >
+                <slot name="page"></slot>
+            </dsh-page>
         </div>
     </div>
 </template>

package/src/components/list/DshPage.vue

@@ -17,7 +17,9 @@
         :disabled="obj.disabled"
         @on-change="changePage"
         @on-page-size-change="changePageSize"
-    />
+    >
+        <slot></slot>
+    </Page>
 </template>
 
 <script>
@@ -32,7 +34,7 @@
                 }
             },
             total: {
-                type: Number,
+                type: [Number, String],
                 default: 0
             },
             propsObj: {

package/src/styles/components/list/DshPage.less

@@ -1,15 +1,15 @@
 .DshPage {
     width: 100%;
-    text-align: right;
-    font-size: 14px;
-    color: #666;
     height: 24px;
     line-height: 24px;
-    .ivu-page-total{
+    text-align: right;
+    font-size: 14px;
+
+    .ivu-page-total {
         float: left;
     }
-    .ivu-select-selection{
-        border: 0px !important;
+    .ivu-select-selection {
+        border: 0px!important;
     }
     .ivu-page-item-active {
         a,
@@ -29,12 +29,11 @@
     .ivu-page-item {
         height: 24px!important;
         line-height: 24px!important;
-        // background: @white;
         background: transparent;
         display: inline-block;
         vertical-align: middle;
     }
-    .ivu-select-single .ivu-select-selection .ivu-select-selected-value{
+    .ivu-select-single .ivu-select-selection .ivu-select-selected-value {
         height: 24px!important;
         line-height: 24px!important;
     }
@@ -46,7 +45,6 @@
         a {
             color: #000;
             font-weight: bold;
-            // font-size: 14px;
         }
     }
     .ivu-page-item {