bri-components 1.2.52 → 1.2.53

package/package.json

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

package/src/components/controls/BriControlInput.vue

@@ -99,7 +99,7 @@
 <style lang="less" scoped>
     .BriControlInput {
         height: 32px;
-        padding: 4px 0 4px 7px;
+        padding: 0px 0px 0px 7px;
         line-height: 24px;
         .dsh-flex-row-between-center();
 
@@ -108,8 +108,12 @@
         }
 
         .overflow {
-            overflow: auto;
             .bri-scrollbar3();
+            width: 100%;
+            height: 100%;
+            overflow-x: auto;
+            overflow-y: hidden;
+            white-space: nowrap;
         }
 
         .placeholder {
@@ -134,5 +138,9 @@
             padding: 5px;
             color: @placeholder-disabled-color;
         }
+
+        .ivu-tag-size-medium {
+            margin: 3px 4px 3px 0px;
+        }
     }
 </style>

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

@@ -8,8 +8,8 @@
                     class="DshCascader-edit-multiple"
                     :value="multipleSelectVal"
                     :data="renderCascaderData"
-                    :disabled="!finalCanEdit"
-                    :change-on-select="selfPropsObj._changeOnSelect"
+                    :disabled="selfPropsObj._disabled"
+                    :change-on-select="changeOnSelect"
                     :clearable="selfPropsObj._clearable"
                     :size="selfPropsObj._size"
                     :filterable="false"
@@ -72,8 +72,8 @@
                         :value="curValList"
                         :data="renderCascaderData"
                         :placeholder="selfPropsObj._placeholder"
-                        :disabled="!finalCanEdit"
-                        :change-on-select="selfPropsObj._changeOnSelect"
+                        :disabled="selfPropsObj._disabled"
+                        :change-on-select="changeOnSelect"
                         :clearable="selfPropsObj._clearable"
                         :size="selfPropsObj._size"
                         :filterable="selfPropsObj._filterable"

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

@@ -540,13 +540,13 @@
                 erd.listenTo(document.getElementById("DshCrossTable-right"), function (element) {
                     // 计算宽度
                     let tableWidth = that.$refs["DshCrossTable-right"].clientWidth;
-                    let nums = tableWidth / 240;
+                    let nums = tableWidth / 200;
                     let dataTotal = that.data.length;
                     if (nums >= dataTotal) {
                         that.rowWidth = tableWidth;
                         that.colWidth = (tableWidth - 10) / dataTotal;
                     } else {
-                        that.rowWidth = dataTotal * 240;
+                        that.rowWidth = dataTotal * 200;
                     }
 
                     // that.rowWidth = 200 * that.data.length;

package/src/components/unit/DshFormUnit.vue

@@ -166,7 +166,7 @@
         padding: 0px 10px 10px;
 
         &-label {
-            min-width: 0px;
+            min-width: 50px;
             padding: 5px 0px 5px;
             line-height: 20px;
             font-size: @smallSize;

package/src/index.js

@@ -14,6 +14,7 @@ import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshPage from "./components/list/DshPage.vue";
+import DshCrossTable from "./components/list/DshBox/DshCrossTable.vue";
 // import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 
 // form
@@ -184,6 +185,7 @@ export {
     DshList,
     DshTable,
     DshPage,
+    DshCrossTable,
 
     // form
     DshForm,