bri-components 1.1.2 → 1.1.4

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

@@ -1,7 +1,10 @@
 <template>
     <div class="DshCard">
         <!-- 无数据 -->
-        <div v-if="!data.length" class="dsh-tip">{{noDataText}}</div>
+        <div
+            v-if="!data.length"
+            class="dsh-tip"
+        >{{noDataText}}</div>
 
         <!-- 有数据 -->
         <template v-else>
@@ -21,10 +24,11 @@
                 ></dsh-dropdown>
 
                 <!-- 背景图 -->
-                <div
-                    class="DshCard-item-image"
-                >
-                    <img :src="getCardBgImgSrc(dataItem)" alt="">
+                <div class="DshCard-item-image">
+                    <img
+                        :src="getCardBgImgSrc(dataItem)"
+                        alt=""
+                    >
                 </div>
 
                 <!-- 内容 -->
@@ -61,11 +65,11 @@
                         <!-- 右 val -->
                         <div class="unit-value dsh-ellipsis">
                             <dsh-td-render
-                                v-if="colItem.render"
+                                v-if="colItem.renderBodyCell"
                                 :row="dataItem"
                                 :column="colItem"
                                 :index="0"
-                                :render="colItem.render"
+                                :render="colItem.renderBodyCell"
                             ></dsh-td-render>
 
                             <div
@@ -73,7 +77,10 @@
                                 v-html="colItem.formatter(dataItem, 0)"
                             ></div>
 
-                            <span v-else class="unit-value-text">{{ dataItem[colItem._key] }}</span>
+                            <span
+                                v-else
+                                class="unit-value-text"
+                            >{{ dataItem[colItem._key] }}</span>
                         </div>
                     </div>
                 </div>
@@ -151,69 +158,3 @@
         }
     };
 </script>
-
-<style lang="less" scoped>
-    .DshCard {
-        display: flex;
-        flex-wrap: wrap;
-        background-color: #ffffff;
-        padding: 0 40px;
-        &-item {
-            width: 250px;
-            height: 210px;
-            box-sizing: border-box;
-            margin: 10px 16px 30px;
-            border-radius: 6px;
-            overflow: hidden;
-            box-shadow: 0px 4px 8px 0px rgba(222, 222, 222, 0.75);
-            cursor: pointer;
-            display: flex;
-            flex-direction: column;
-            position: relative;
-
-            &-dropdown {
-                position: absolute;
-                top: 5px;
-                right: 5px;
-            }
-            &-image {
-                padding-top: 20px;
-                height: 122px;
-            }
-            &-info {
-                flex: 1;
-                padding: 8px 15px;
-                overflow: hidden;
-                background: #F7FBFF;
-                &-title {
-                    font-size: 14px;
-                    font-weight: 600;
-                }
-                &-col {
-                    height: 24px;
-                }
-
-                .unit {
-                    display: flex;
-                    flex-direction: row;
-                    &-label {
-                        max-width: 60px;
-                        font-weight: 400;
-                        color: #515A6E;
-                    }
-                    &-colon {
-
-                    }
-                    &-value {
-                        flex: 1;
-                    }
-                }
-            }
-        }
-    }
-</style>
-<style lang="less">
-    .DshCard {
-
-    }
-</style>

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

@@ -273,13 +273,13 @@
                             @click="clickRow(dataItem, dataIndex)"
                         >
                             <div
-                                v-if="colItem.render"
+                                v-if="colItem.renderBodyCell"
                                 class="td-content"
                             >
                                 <dsh-td-render
                                     :row="dataItem"
                                     :index="dataIndex"
-                                    :render="colItem.render"
+                                    :render="colItem.renderBodyCell"
                                 ></dsh-td-render>
                             </div>
 
@@ -323,7 +323,7 @@
                                 <dsh-td-render
                                     :row="dataItem"
                                     :index="dataIndex"
-                                    :render="operationCol.render"
+                                    :render="operationCol.renderBodyCell"
                                 ></dsh-td-render>
                             </div>
                         </td>
@@ -413,11 +413,7 @@
                     _name: "操作",
                     type: "expend",
                     width: 150,
-                    titleAlign: "center",
-                    columnAlign: "center",
-                    componentName: "dsh-td-render",
-                    isFrozenRight: true,
-                    render: (h, params) => {
+                    renderBodyCell: (params, h) => {
                         return this.operationList.length < 3
                             ? h("dsh-buttons", {
                                 props: {

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

@@ -62,16 +62,10 @@
                 v-if="isLoading"
                 class="list-loading"
             >
-                <div
-                    class="v-table-loading"
-                    :style="{'opacity': 0.6}"
-                ></div>
-                <div class="v-table-loading-content" style="top: 30px">
+                <div class="list-loading-wrap"></div>
+                <div class="list-loading-content">
                     <span>
-                        <i
-                            class="v-icon-spin5 animate-loading-23"
-                            style="font-size: 28px;opacity:0.6;"
-                        ></i>
+                        <i class="list-loading-content-icon"></i>
                     </span>
                 </div>
             </div>
@@ -118,6 +112,7 @@
                                     {{ index + 1 }}
                                 </div>
                             </div>
+
                             <!-- 单元格 -->
                             <div
                                 v-for="(col) in selfColumns"
@@ -140,9 +135,11 @@
                                         :index="index"
                                         :render="col.renderBodyCell"
                                     ></dsh-td-render>
+
                                     <template v-else-if="col.formatter">
                                         <div v-html="col.formatter(row, index)"></div>
                                     </template>
+
                                     <Tooltip
                                         v-else-if="row[col._key]"
                                         :transfer="true"
@@ -153,9 +150,9 @@
                                     >
                                         <div class="list-tooltip-box">{{ row[col._key] }}</div>
                                     </Tooltip>
+
                                     <!-- <dsh-unit
                                         :key="col._key"
-                                        :mode="mode"
                                         :canEdit="false"
                                         :formData="row"
                                         :formItem="col"
@@ -173,7 +170,7 @@
                     v-else
                     class="list-noData"
                 >
-                    {{noDataText}}
+                    {{ noDataText }}
                 </div>
             </template>
         </div>
@@ -189,13 +186,6 @@
             // DshUnit
         },
         props: {
-            // mode: {
-            //     type: String,
-            //     default: "default",
-            //     validator: function (value) {
-            //         return ["default"].indexOf(value) !== -1;
-            //     }
-            // },
             isLoading: {
                 type: Boolean,
                 default: false
@@ -256,9 +246,6 @@
                 }
             },
 
-            // isLoading () {
-            //     return this.propsObj.isLoading;
-            // },
             multiple () {
                 return this.propsObj.multiple !== false;
             },
@@ -325,118 +312,3 @@
         }
     };
 </script>
-
-<style lang="less" scoped>
-    @height:44px;
-    .DshList {
-        .list {
-            &-loading {
-                min-height: 100px;
-            }
-
-            &-cols,
-            &-rows {
-                position: relative;
-                &-left {
-                    width: 48px;
-                    text-align: center;
-                    position: absolute;
-                    left: 0;
-                    top: 0;
-                    label {
-                        display: inline-block;
-                        height: 36px;
-                        padding: 9px 5px;
-                        margin: 0px;
-                        line-height: 18px;
-                    }
-                }
-
-                .row {
-                    width: 100%;
-                    // height: 36px;
-                    // padding: 9px 5px;
-                    line-height: 20px;
-                    display: flex;
-                    justify-content: space-between;
-                    &-item {
-                        min-width: 120px;
-                        height: 100%;
-                        padding: 0 16px;
-                        font-size: 14px;
-                        align-items: center;
-                    }
-                }
-            }
-
-            &-cols {
-                height: @height;
-                background: #f0f0f0;
-                &-left {}
-                &-right {}
-
-                .row {
-                    font-weight: 700;
-                    &-item {
-                        padding: 10px 16px;
-                        border-top: 1px #e5e5e5 solid;
-                        border-bottom: 1px #f0f0f0 solid;
-                        border-left: 1px #e5e5e5 solid;
-
-                        &:last-child{
-                           border-right: 1px #e5e5e5 solid;
-                        }
-
-                        &-inner {
-                            .dsh-ellipsis{
-                                font-size: 14px;
-                                color: #666;
-                                font-weight: 700;
-                                line-height: 24px;
-                            }
-                        }
-                    }
-                }
-            }
-
-            &-rows {
-                &-left {
-                    label {
-                        height: 44px;
-                        line-height: 20px;
-                    }
-                }
-                &-right {}
-
-                .row {
-                    height: 44px;
-                    line-height: 20px;
-
-                    cursor: pointer;
-                    &-item {
-                        display: flex;
-                        border: 1px solid #E5E5E5;
-                        border-width: 0 0 1px 1px;
-
-                        &:last-child{
-                            border-width: 0 1px 1px 1px;
-                        }
-
-                        &-inner {
-                            width: 100%;
-                            font-size: 14px;
-                            color: #333;
-                            font-weight: 400;
-                            line-height: 24px;
-                        }
-                    }
-                }
-            }
-
-            &-noData {
-                padding: 10px 0px;
-                text-align: center;
-            }
-        }
-    }
-</style>

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

@@ -279,113 +279,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshPanel {
-        min-width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: row;
-
-        &-group {
-            width: 300px;
-            min-width: 300px;
-            max-width: 300px;
-            height: 100%;
-            padding: 10px;
-            overflow: hidden;
-            display: flex;
-            flex-direction: column;
-
-            &-title {
-                width: 100%;
-                height: 50px;
-                padding: 15px 10px;
-                display: flex;
-                border-radius: 10px 10px 0px 0px;
-                font-size: 14px;
-
-                &-name {
-                    max-width: 120px;
-                }
-                &-number {
-                    font-weight: bold;
-                }
-            }
-
-            &-list {
-                width: 100%;
-                flex: 1;
-                min-height: 0px;
-                border: 1px dashed #cccccc;
-                border-top: none;
-                display: flex;
-                flex-direction: column;
-
-                .list-drag {
-                    width: 100%;
-                    flex: 1;
-                    min-height: 0px;
-
-                    &-transition {
-                        display: block;
-                        width: 100%;
-                        height: 100%;
-                        padding: 10px;
-                        overflow: auto;
-
-                        .item {
-                            height: 60px;
-                            padding: 10px 17px;
-                            margin-bottom: 10px;
-                            border: 1px solid rgba(102, 110, 126, 0.1);
-                            border-radius: 4px;
-                            background: #FFFFFF;
-                            cursor: pointer;
-                            position: relative;
-
-                            &-dropdown {
-                                position: absolute;
-                                top: 5px;
-                                right: 5px;
-                            }
-
-                            &-title {
-                                width: calc(100% - 22px);
-                                margin-bottom: 2px;
-                                font-family: Source Han Sans CN;
-                                font-size: 14px;
-                                font-weight: 500;
-                                color: #515A6E;
-                            }
-
-                            &-cols {}
-
-                            .unit {
-                                display: flex;
-                                flex-direction: row;
-                                color: #515A6E;
-                                &-label {
-                                    max-width: 60px;
-                                }
-                                &-colon {
-
-                                }
-                                &-value {
-                                    flex: 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                .list-btns {
-                    width: 100%;
-                    height: 40px;
-                    padding: 0px 10px;
-                    text-align: center;
-                }
-            }
-        }
-    }
-</style>

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

@@ -1,8 +1,5 @@
 <template>
-    <div
-        class="DshTable"
-        style="width: 100%; height: 100%;"
-    >
+    <div class="DshTable">
         <bri-table
             :className="propsObj.className"
             :data="data"

package/src/components/list/DshCascaderTable.vue

@@ -149,7 +149,7 @@
                                                 :style="getTdStyle(col, row)"
                                             >
                                                 <dsh-unit
-                                                    :isUnit="!canEdit"
+                                                    :canEdit="canEdit"
                                                     :rowIndex="rowIndex"
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"

package/src/components/list/ZTree.vue

@@ -470,61 +470,3 @@
         }
     };
 </script>
-
-<style lang="less" scoped>
-    .ZTree {
-        max-width: 1200px;
-        min-width: 720px;
-        height: 100%;
-        margin: 0px auto;
-        background: #fff;
-        display: flex;
-        flex-direction: column;
-        &-action {
-            padding: 10px;
-            display: flex;
-            justify-content: flex-end;
-        }
-
-        &-tree {
-            width: 100%;
-            flex: 1;
-            min-height: 0px;
-            overflow: auto;
-        }
-    }
-</style>
-<style lang="less">
-    .ZTree {
-        &-action-create {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-
-            .ivu-icon {
-                font-size: 20px;
-                font-weight: bold;
-                margin-right: -10px;
-                vertical-align: middle;
-                transform: translate(0, -1px);
-            }
-        }
-
-        &-tree {
-            .ivu-tree-title {
-                width: calc(100% - 18px);
-            }
-            .ivu-tree-arrow {
-                margin-top: 5px;
-            }
-        }
-        &-dropdown-menu.DshColorPanel-list {
-            width: 242px!important;
-        }
-    }
-    .ZTree-create-content {
-        .textRight {
-            text-align: right;
-        }
-    }
-</style>

package/src/components/other/ZIframe.vue

@@ -7,6 +7,7 @@
             :src="url"
             frameborder="0"
             allowtransparency="true"
+            :allow="allow"
         ></iframe>
         <div
             v-else
@@ -33,6 +34,10 @@
             url: {
                 type: String,
                 required: true
+            },
+            allow: {
+                type: String,
+                default: "fullscreen"
             }
         },
         data () {

package/src/components/small/DshControlDefine.vue

@@ -3,7 +3,7 @@
         :class="{
             'dsh-control-define': true,
             'dsh-control-define-multiplerow': selfPropsObj._multiplerow,
-            'dsh-control-define-disabled': $isDisabled(canEdit, propsObj),
+            'dsh-control-define-disabled': !finalCanEdit,
             'dsh-control-define-show': !canEdit
         }"
         @click="clickInput"
@@ -18,7 +18,7 @@
                     :list="val"
                     @delete="deleteTag"
                     :propsObj="{
-                        closable: canEdit,
+                        closable: canEdit && propsObj.canEdit,
                         size: selfPropsObj._multiplerow ? 'medium' : 'default'
                     }"
                 ></dsh-tags>
@@ -53,6 +53,10 @@
                 type: Boolean,
                 default: true
             },
+            finalCanEdit: {
+                type: Boolean,
+                default: true
+            },
             value: {
                 type: [String, Array],
                 default () {