bri-components 1.2.47 → 1.2.49

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.47",
+    "version": "1.2.49",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -37,7 +37,7 @@
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",
         "stream": "^0.0.2",
-        "view-design": "4.6.0",
+        "view-design": "4.7.0",
         "viewerjs": "^1.10.2",
         "vue-codemirror": "^4.0.6",
         "vue-cropperjs": "^4.1.0",

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

@@ -45,7 +45,7 @@
                     'DshEditor-unit': !$isEmptyData(curVal)
                 }"
             >
-                {{ $isEmptyData(curVal) ? emptyShowVal : "富文本" }}
+                {{ $isEmptyData(curVal) ? emptyShowVal : "富文本达成纳斯达克了城市的女你说的 v 是对女生看到 v 你说的 v 说" }}
             </div>
 
             <!-- 查看页里 的查看 -->
@@ -187,3 +187,81 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshEditor {
+        width: 100%;
+
+        #show {
+            white-space: pre-wrap;
+            word-break: break-word;
+
+            p {
+                font-size: 14px !important;
+            }
+
+            li {
+                margin-left: 20px;
+            }
+
+            ul li {
+                list-style: disc;
+            }
+
+            ol li {
+                list-style: auto;
+            }
+        }
+
+        &-edit {
+            #show();
+            height: 100%;
+            min-height: 32px;
+            padding: 4px 7px;
+            border-radius: @borderRadius;
+
+            &.bri-control-nodata {
+                line-height: 24px;
+            }
+        }
+
+        &-wrap {
+            border: 1px solid @themeColor;
+            border-radius: 4px;
+            background: #fff;
+
+            &-toolbar {
+                margin-top: 5px;
+            }
+
+            &-text {
+                min-height: 130px;
+
+                ul li {
+                    list-style: disc;
+                }
+
+                ol li {
+                    list-style: auto;
+                }
+            }
+
+            &-btn {
+                text-align: right;
+                padding: 10px;
+            }
+        }
+
+        &-unit {
+            .bri-unit-show();
+        }
+
+        &-show {
+            #show();
+
+            &-nodata {
+                .bri-control-nodata();
+            }
+        }
+    }
+</style>

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

@@ -58,3 +58,13 @@
         methods: {}
     };
 </script>
+
+<style lang="less" scoped>
+    .DshSwitch {
+        width: 100%;
+
+        &-show {
+            .bri-unit-show();
+        }
+    }
+</style>

package/src/components/controls/controlMixin.js

@@ -65,7 +65,9 @@ export default {
                     : "暂无内容";
         },
         showVal () {
-            return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal;
+            return this.$isEmptyData(this.curVal)
+                ? this.emptyShowVal
+                : this.curVal;
         },
 
         controlKey () {
@@ -121,21 +123,18 @@ export default {
         // },
 
         /* 部分条件下 才使用的属性 */
-        isCore () {
-            return !!this.propsObj.isCore;
-        },
         isInTable () {
             return !!this.propsObj.isInTable;
         },
         isUnitUpdate () {
-            return !!this.canEdit && this.isInTable;
+            return this.isInTable && !!this.canEdit;
         },
         isUnitShow () {
-            return !this.canEdit && this.isInTable;
-        },
-        isShare () {
-            return !!this.propsObj.isShare;
+            return this.isInTable && !this.canEdit;
         },
+        // isShare () {
+        //     return !!this.propsObj.isShare;
+        // },
         /* 部分控件下 才使用的属性 */
         compKey () {
             return this.propsObj.compKey;

package/src/components/controls/senior/BriLabels.vue

@@ -171,7 +171,7 @@
             clickInput () {
                 if (this.finalCanEdit) {
                     if (!this.renderList) {
-                        if (this.isCore) {
+                        if (this.controlKey === "_default") {
                             this.listData = this.originLabels.map(item => {
                                 return {
                                     ...item,

package/src/components/controls/special/DshBack.vue

@@ -34,3 +34,9 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshBack {
+
+    }
+</style>

package/src/components/controls/special/DshUndeveloped.vue

@@ -33,3 +33,9 @@
         methods: {}
     };
 </script>
+
+<style lang="less" scoped>
+    .DshUndeveloped {
+
+    }
+</style>

package/src/styles/components/index.less

@@ -27,7 +27,6 @@
 @import "./controls/base/BriInputs.less";
 @import "./controls/base/DshNumber.less";
 @import "./controls/base/DshNumberange.less";
-@import "./controls/base/DshSwitch.less";
 @import "./controls/base/DshSelect.less";
 @import "./controls/base/DshCheckbox.less";
 @import "./controls/base/DshDate.less";
@@ -35,7 +34,6 @@
 @import "./controls/base/DshCascader/index.less";
 @import "./controls/base/BriUpload/index.less";
 @import "./controls/base/DshCoordinates.less";
-@import "./controls/base/DshEditor.less";
 @import "./controls/base/DshDivider.less";
 
 @import "./controls/senior/selectUsers/index.less";
@@ -45,9 +43,6 @@
 @import "./controls/senior/BriLabels.less";
 @import "./controls/senior/DshPackage.less";
 
-@import "./controls/special/DshBack.less";
-@import "./controls/special/DshUndeveloped.less";
-
 // other
 @import "./other/BriAvatar.less";
 @import "./other/BriIframe.less";

package/src/styles/{control.less → global/control.less}

@@ -54,8 +54,9 @@
 
 // 单元格标签式展示 -非全部类型通用
 .bri-unit-show () {
-    display: inline;
-    padding: 2px 8px;
+    display: inline-block;
+    max-width: 100%;
+    padding: 2px 6px 2px 8px;
     border-radius: @borderRadius;
     background-color: @theme-focus;
     line-height: 24px;

package/src/styles/global/global.less

@@ -3,4 +3,6 @@
 @import "./box.less";
 @import "./text.less";
 @import "./flex.less";
+@import "./control.less";
 @import "./base.less";
+

package/src/styles/index.less

@@ -6,6 +6,5 @@
 
 // @import "./global/global.less"; // 全局公共css
 @import "./iconfont/iconfont.css"; // 字体图标样式
-@import "./control.less"; // 控件共用样式，不需混入方式使用，所以不用放global
 
 @import "./components/index.less"; // 组件样式

package/src/utils/table.js

@@ -13,6 +13,7 @@ const transformToColumns = function (form, {
                 field: col._key,
                 key: col._key,
                 align: col._align || typeData.align,
+                fixed: col._fixed,
                 width: col._width || typeData.width,
                 sortBy: headerFilter ? col._sortBy || typeData.sortBy : undefined,
                 renderHeaderCell: ({ row, column }, h) => {

package/src/styles/components/controls/base/DshEditor.less

@@ -1,75 +0,0 @@
-.DshEditor {
-    width: 100%;
-
-    #show {
-        white-space: pre-wrap;
-        word-break: break-word;
-
-        p {
-            font-size: 14px !important;
-        }
-
-        li {
-            margin-left: 20px;
-        }
-
-        ul li {
-            list-style: disc;
-        }
-
-        ol li {
-            list-style: auto;
-        }
-    }
-
-    &-edit {
-        #show();
-        height: 100%;
-        min-height: 32px;
-        padding: 4px 7px;
-        border-radius: @borderRadius;
-
-        &.bri-control-nodata {
-            line-height: 24px;
-        }
-    }
-
-    &-wrap {
-        border: 1px solid @themeColor;
-        border-radius: 4px;
-        background: #fff;
-
-        &-toolbar {
-            margin-top: 5px;
-        }
-
-        &-text {
-            min-height: 130px;
-
-            ul li {
-                list-style: disc;
-            }
-
-            ol li {
-                list-style: auto;
-            }
-        }
-
-        &-btn {
-            text-align: right;
-            padding: 10px;
-        }
-    }
-
-    &-unit {
-        .bri-unit-show();
-    }
-
-    &-show {
-        #show();
-
-        &-nodata {
-            .bri-control-nodata();
-        }
-    }
-}

package/src/styles/components/controls/base/DshSwitch.less

@@ -1,7 +0,0 @@
-.DshSwitch {
-    width: 100%;
-    
-    .DshSwitch-show {
-        .bri-unit-show();
-    }
-}

package/src/styles/components/controls/special/DshBack.less

@@ -1,3 +0,0 @@
-.DshBack {
-    width: 100%;
-}

package/src/styles/components/controls/special/DshUndeveloped.less

@@ -1,3 +0,0 @@
-.DshUndeveloped {
-    width: 100%;
-}