bri-components 1.1.0 → 1.1.1

package/src/components/list/BriFlatTable.vue

@@ -63,8 +63,7 @@
                 default () {
                     return {};
                 }
-            },
-            isShare: Boolean
+            }
         },
         model: {
             prop: "data",
@@ -106,6 +105,8 @@
 
             selfPropsObj () {
                 return {
+                    isShare: false, // 是否是分享页在用
+
                     _contentHeight: 500,
                     _useSelection: false, // 使用选择列
                     _useIndex: true, // 使用序号列
@@ -117,6 +118,9 @@
                     ...this.propsObj
                 };
             },
+            isShare () {
+                return this.selfPropsObj.isShare;
+            },
             contentHeight () {
                 return this.selfPropsObj._contentHeight;
             },
@@ -199,9 +203,8 @@
                                                     parentData: this.listData,
                                                     formData: row,
                                                     formItem: this.resetCol(item),
-                                                    isShare: this.isShare,
                                                     rowIndex: rowIndex,
-                                                    isUnit: !this.finalCanEdit
+                                                    isUnit: !this.canEdit
                                                 },
                                                 on: {
                                                     blur: () => this.controlBlur(null, column, row, arguments),
@@ -216,9 +219,8 @@
                                             parentData: this.listData,
                                             formData: row,
                                             formItem: this.resetCol(item),
-                                            isShare: this.isShare,
                                             rowIndex: rowIndex,
-                                            isUnit: !this.finalCanEdit
+                                            isUnit: !this.canEdit
                                         },
                                         on: {
                                             blur: () => this.controlBlur(null, column, row, arguments),
@@ -343,7 +345,6 @@
                 };
                 const newRowIndex = index == null ? list.length : index + 1;
                 list.splice(newRowIndex, 0, newRow);
-
                 this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
 
                 this.change("createRow", null, newRow, newRowIndex);
@@ -387,7 +388,11 @@
                         _optionKind: "dropdown"
                     }
                 };
-                return { ...col, ...(obj[col._type] || {}) };
+                return {
+                    ...col,
+                    ...(obj[col._type] || {}),
+                    isShare: this.isShare
+                };
             },
             getUnitCanEdit (col, row) {
                 return this.canEdit && // 是否是编辑状态

package/src/components/list/BriTable.vue

@@ -56,7 +56,7 @@
             isLoading: Boolean,
             noDataText: {
                 type: String,
-                default: "暂无数据"
+                default: "暂无内容"
             },
             columns: Array,
             data: Array,

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

@@ -13,7 +13,7 @@
                 :propsObj="listPropsObj"
                 :changedFields="changedFields"
                 :isLoading="listPropsObj && listPropsObj.isLoading"
-                :noDataText="listPropsObj && listPropsObj.noDataText || '暂无数据...'"
+                :noDataText="listPropsObj && listPropsObj.noDataText || '暂无内容...'"
                 @clickRow="clickRow"
                 @sortChange="changeSort"
                 @selectChange="changeSelect"

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

@@ -113,7 +113,7 @@
             },
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             }
         },
         data () {

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

@@ -367,7 +367,7 @@
 
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             },
             changedFields: {
                 type: Array,

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

@@ -133,12 +133,12 @@
                             >
                                 <div class="row-item-inner dsh-ellipsis">
                                     <dsh-td-render
-                                        v-if="col.render"
+                                        v-if="col.renderBodyCell"
                                         class="ms-ellipsis"
                                         :row="row"
                                         :column="col"
                                         :index="index"
-                                        :render="col.render"
+                                        :render="col.renderBodyCell"
                                     ></dsh-td-render>
                                     <template v-else-if="col.formatter">
                                         <div v-html="col.formatter(row, index)"></div>
@@ -225,7 +225,7 @@
             },
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             }
         },
         data () {

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

@@ -164,7 +164,7 @@
             },
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             },
 
             operationList: {

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

@@ -8,7 +8,7 @@
             :formList="columns"
         ></dsh-form>
 
-        <!-- 暂无数据 -->
+        <!-- 暂无内容 -->
         <div
             v-else
             class="DshSingleData-nodata"

package/src/components/list/DshCascaderTable.vue

@@ -153,6 +153,7 @@
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"
                                                     :rowIndex="rowIndex"
+                                                    :isUnit="!canEdit"
                                                     @change="$dispatchEvent(operationMap.changeVal, col, row, arguments)"
                                                 ></dsh-unit>
                                             </td>
@@ -165,7 +166,7 @@
                                     v-else
                                     class="table-nodata"
                                 >
-                                    <td :colspan="columns.length">暂无数据……</td>
+                                    <td :colspan="columns.length">暂无内容……</td>
                                 </tr>
                             </tbody>
                         </table>

package/src/components/list/DshFlatTable.vue

@@ -154,7 +154,7 @@
                         <td
                             class="table-row-nodata"
                             :colspan="showColumns.length"
-                        >暂无数据……</td>
+                        >暂无内容……</td>
                     </tr>
                 </tfoot>
             </table>

package/src/components/list/easyTable/v-table/src/table.vue

@@ -992,7 +992,7 @@
                 hasFrozenColumn: false, // 是否拥有固定列（false时最后一列的右边border无边框）
                 hasFrozenRightColumn: false,
                 resizeTimer: null,
-                firstLoad: true, // 表格首次初始化加载，用于区分显示”数据加载中“还是”暂无数据“
+                firstLoad: true, // 表格首次初始化加载，用于区分显示”数据加载中“还是”暂无内容“
                 tipContent: ""
             };
         },
@@ -1113,7 +1113,7 @@
             // 没数据时的html
             errorContent: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             },
             // 没数据时内容区域高度
             errorContentHeight: {
@@ -1488,7 +1488,7 @@
             updateErrorContent () {
                 if (!this.firstLoad) {
                     if (!(this.internalTableData && this.internalTableData.length)) {
-                        this.tipContent = "暂无数据";
+                        this.tipContent = "暂无内容";
                     }
                 }
                 this.firstLoad = false;

package/src/components/list/evTable/EvTable.vue

@@ -173,7 +173,7 @@
             height: Number,
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             }
         },
         data () {

package/src/components/other/BriTransfer.vue

@@ -6,7 +6,7 @@
             :filterable="filterable"
             :filter-method="filterMethod"
             :titles="titles"
-            not-found-text="暂无数据"
+            not-found-text="暂无内容"
             @on-change="handleChange"
         ></Transfer>
     </div>

package/src/components/other/ZGantt.vue

@@ -110,14 +110,14 @@
                             <td
                                 :colspan="timeData.length"
                                 class="briGantt-table-td"
-                            >暂无数据</td>
+                            >暂无内容</td>
                         </tr>
                         <tbody v-if="type==='table'">
                             <tr v-if="computedData.length === 0">
                                 <td
                                     :colspan="timeData.length"
                                     class="briGantt-table-td"
-                                >暂无数据</td>
+                                >暂无内容</td>
                             </tr>
                             <tr
                                 class="briGantt-table-tr"

package/src/components/small/DshControlDefine.vue

@@ -3,7 +3,8 @@
         :class="{
             'dsh-control-define': true,
             'dsh-control-define-multiplerow': selfPropsObj._multiplerow,
-            'dsh-control-define-disabled': !canEdit
+            'dsh-control-define-disabled': $isDisabled(canEdit, propsObj),
+            'dsh-control-define-show': !canEdit
         }"
         @click="clickInput"
     >

package/src/components/small/DshDropdown.vue

@@ -86,7 +86,7 @@
                     v-else
                     class="nodata"
                 >
-                    暂无数据
+                    暂无内容
                 </div>
             </div>
         </div>

package/src/components/small/DshTdRender.js

@@ -16,6 +16,6 @@ export default {
             index: ctx.props.index
         };
         if (ctx.props.column) params.column = ctx.props.column;
-        return ctx.props.render(h, params);
+        return ctx.props.render(params, h);
     }
 };

package/src/styles/common/control.less

@@ -14,6 +14,7 @@
     background-color: transparent;
 }
 .control-edit {
+    height: 32px;
     color: @textColor;
     border: 1px solid @borderColor;
     background: @inputBg;

package/src/styles/components/controls/BriLabels.less

@@ -4,9 +4,23 @@
     &-dropdown {
         width: 100%;
 
-        &-input {
-            input {
-                cursor: pointer;
+        &-show {
+            display: flex;
+            justify-content: space-between;
+            cursor: pointer;
+            border-radius: @borderRadius;
+            border: 1px solid @borderColor;
+            padding-left: 5px;
+
+            &-active {
+                border-color: #64c6d1;
+                box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
+            }
+
+            &-arrow {
+                display: flex;
+                align-items: center;
+                margin-right: 5px;
             }
         }
 
@@ -18,6 +32,88 @@
                 background-color: @theme-focus;
                 color: @themeColor;
             }
+
+            &-show {
+                // width: 100%;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+
+                &-icons {
+                    margin-left: 10px;
+
+                    i {
+                        padding: 3px;
+                        border-radius: @borderRadius;
+                        color: rgba(0, 0, 0, 0.4);
+
+                        &:hover {
+                            background-color: #fff;
+                        }
+                    }
+
+                    &-edit {
+                        &:hover {
+                            color: @themeColor;
+                        }
+                    }
+
+                    &-del {
+                        &:hover {
+                            color: @error-color;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .ivu-select-dropdown {
+        width: fit-content;
+    }
+
+    .ivu-input-suffix {
+        display: flex;
+        align-items: center;
+
+        i {
+            width: 24px;
+            height: 24px;
+            line-height: 24px;
+
+            &:hover {
+                background-color: @btn-hover;
+                border-radius: @borderRadius;
+            }
+        }
+    }
+
+    &-view {
+        .dsh-flex-row-start-start();
+        flex-wrap: wrap;
+        height: 32px;
+        overflow-y: hidden;
+
+        &-readonly {
+            width: 100%;
+            background: @white;
+            border: 1px solid #eee;
+            border-radius: 4px;
+            height: 32px;
+            cursor: not-allowed;
+
+            .DshLabels-view-nodata {
+                display: none;
+            }
+        }
+
+        &-tag {
+            width: fit-content;
+            margin-right: 10px;
+        }
+
+        &-nodata {
+            color: @textColor;
         }
     }
 }

package/src/styles/components/controls/DshCoordinates.less

@@ -1,11 +1,13 @@
 .DshCoordinates {
+    width: 100%;
+    line-height: 32px;
     .textRight {
         text-align: right;
     }
 
     &-wrap {
         position: relative;
-        padding: 0 7px;
+        padding: 0 8px;
         .control-edit();
         &-zuobiao{
             color: #e5e5e5;
@@ -47,6 +49,9 @@
     &-readonly {
         cursor: not-allowed;
     }
+    &-show {
+        padding: 0 8px;
+    }
 }
 
 

package/src/styles/components/controls/DshInput.less

@@ -37,4 +37,10 @@
         width: 100%;
         display: flex;
     }
+}
+.ivu-input {
+    .control-edit();
+    &[disabled] {
+        .control-disabled(); 
+    }
 }

package/src/styles/components/controls/controlShow.less

@@ -1,7 +1,5 @@
 .controlShow {
     &-val {
-        display: inline-block;
-        width: 100%;
         height: 100%;
     }
 

package/src/styles/components/index.less

@@ -25,7 +25,7 @@
 // list
 @import "./list/evTable.less";
 @import "./list/DshCascaderTable.less";
-@import "./list/DshFlatTable.less";
+// @import "./list/DshFlatTable.less";
 @import "./list/DshSingleData.less";
 @import "./list/DshCrossTable.less";
 @import "./list/ivu_reset.less";

package/src/styles/components/small/DshControlDefine.less

@@ -1,22 +1,5 @@
 .dsh-control-define {
-    height: 32px;
-    padding: 2px 6px;
-    border: 1px solid @borderColor;
-    border-radius: 0px;
-    line-height: 22px;
-    text-align: left;
-    cursor: pointer;
-    overflow: auto;
-
-    // &::-webkit-scrollbar {
-    //     height: 4px;
-    //     width: 4px;
-    
-    //     &::-webkit-scrollbar-thumb {
-    //         border-radius: 4px;
-    //         background-clip: border-box;
-    //     }
-    // }
+    .control-edit();
 
     &-multiplerow {
         height: 70px;
@@ -29,36 +12,31 @@
     }
 
     &-disabled {
-        border-color: @border-disabled !important;
+        .control-disabled();
+    }
+
+    &-show {
+        .control-show();
     }
 
     &-text {
         width: 100%;
+        height: 100%;
         display: flex;
         justify-content: space-between;
         align-items: center;
+        overflow-x: auto;
+        overflow-y: hidden;
+        padding: 0 8px;
+        .bri-scrollbar6();
 
         .DshTags {
-            max-width: 100%;
             display: flex;
-            .ivu-tag {
-                display: flex;
-                height: 24px;
-                .ivu-tag-text {
-                    .dsh-ellipsis();
-                }
-                .ivu-icon {
-                    line-height: 22px;
-                }
-            }
+            white-space: nowrap;
         }
     }
     
     &-nodata {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        color: #b7b7b7;
+        .control-notext();
     }
 }

package/src/styles/components/small/DshTitle.less

@@ -3,9 +3,6 @@
     display: flex;
     align-items: center;
     cursor: pointer;
-    &-icon {
-        color: #666;
-    }
     &-name {
         margin-left: 10px;
         font-size: @smallTitleSize;

package/src/styles/components/unit/DshFormItem.less

@@ -1,5 +1,5 @@
 .DshFormItem {
-    margin: 3px 6px;
+    margin: 5px 6px;
     padding: 3px 10px;
     overflow: hidden;