bri-components 1.1.0 → 1.1.2

package/src/components/controls/controlMixin.js

@@ -1,9 +1,5 @@
 export default {
     props: {
-        canEdit: {
-            type: Boolean,
-            default: true
-        },
         value: {
             type: Object,
             default () {
@@ -16,33 +12,37 @@ export default {
                 return {};
             }
         },
+
+        /* 表单形式用到的 */
+        canEdit: {
+            type: Boolean,
+            default: true
+        },
+        /* 列表形式用到的 */
         isUnit: {
             type: Boolean,
             default: false
+        },
+        parentData: {
+            type: Array,
+            default () {
+                return [];
+            }
         }
     },
     data () {
         return {};
     },
     computed: {
-        compKey () {
-            return this.propsObj.compKey;
-        },
-        appKey () {
-            return this.propsObj.appKey;
-        },
-        entityKey () {
-            return this.propsObj.entityKey;
-        },
-        inTable () {
-            return !!this.propsObj.inTable;
-        },
-        isShare () {
-            return !!this.propsObj.isShare;
-        },
         controlKey () {
             return this.propsObj._key;
         },
+        curVal () {
+            return this.value[this.controlKey];
+        },
+        showText () {
+            return this.curVal || (this.isUnit ? "-" : "暂无内容");
+        },
 
         finalCanEdit () {
             return this.$canEdit(this.canEdit, this.propsObj);
@@ -57,9 +57,6 @@ export default {
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable)
             };
         },
-        currentVal () {
-            return this.value[this.controlKey];
-        },
         commonClass () {
             return {
                 "dsh-ellipsis": true,
@@ -67,11 +64,28 @@ export default {
                 "control-disabled": this.$isDisabled(this.canEdit, this.propsObj),
                 // "control-readonly": this.$isReadonly(this.canEdit, this.propsObj),
                 "control-show": !this.canEdit,
-                "control-notext": !this.currentVal
+                "control-notext": !this.curVal
             };
         },
-        showText () {
-            return this.currentVal || (this.isUnit ? "-" : "暂无内容");
+
+        // 部分控件或部分条件下 才使用的属性
+        compKey () {
+            return this.propsObj.compKey;
+        },
+        appKey () {
+            return this.propsObj.appKey;
+        },
+        entityKey () {
+            return this.propsObj.entityKey;
+        },
+        inTable () {
+            return !!this.propsObj.inTable;
+        },
+        stopModInit () {
+            return this.inTable;
+        },
+        isShare () {
+            return !!this.propsObj.isShare;
         }
     },
     methods: {

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

@@ -1,54 +1,43 @@
 <template>
-    <div class="cascaderTable" :id="`cascaderTable${controlKey}`">
+    <div
+        class="cascaderTable"
+        :id="`cascaderTable${controlKey}`"
+    >
         <!-- 表格查看 -->
-        <span v-if="isUnit" class="cascaderTable-unit">
-            <dsh-icons
-                :list="$getOperationList(['link'])"
-            ></dsh-icons>
+        <span
+            v-if="isUnit"
+            class="cascaderTable-unit"
+        >
+            <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
             <span class="cascaderTable-unit-text">
                 {{ value[controlKey] && value[controlKey].tree.length || 0 }}行
             </span>
         </span>
 
-        <!-- 配置端默认模式-->
-        <dsh-btn-modal v-else-if="propsObj._key === '_default'">
-            <dsh-cascader-table
-                :canEdit="finalCanEdit"
-                :treeColumns="treeColumns"
-                :subColumns="subColumns"
-                :data="value[controlKey]"
-                :propsObj="propsObj"
-                @change="change"
-            ></dsh-cascader-table>
-        </dsh-btn-modal>
-
         <template v-else>
-            <!-- 操作按钮 -->
-            <dsh-buttons
-                class="cascaderTable-btns"
-                itemClass="cascaderTable-btns-item"
-                :list="$getOperationList(operationFieldList)"
-                @click="$dispatchEvent($event)"
-            ></dsh-buttons>
+            <!-- 配置端默认模式-->
+            <dsh-btn-modal v-if="propsObj._key === '_default'">
+                <dsh-cascader-table
+                    :canEdit="finalCanEdit"
+                    :treeColumns="treeColumns"
+                    :subColumns="subColumns"
+                    :data="value[controlKey]"
+                    :propsObj="propsObj"
+                    @change="change"
+                ></dsh-cascader-table>
+            </dsh-btn-modal>
 
-            <dsh-cascader-table
-                v-if="value[controlKey]"
-                useCol
-                :canEdit="finalCanEdit"
-                :treeColumns="treeColumns"
-                :subColumns="subColumns"
-                :data="value[controlKey]"
-                :propsObj="propsObj"
-                @change="change"
-            ></dsh-cascader-table>
+            <template v-else>
+                <!-- 操作按钮 -->
+                <dsh-buttons
+                    class="cascaderTable-btns"
+                    itemClass="cascaderTable-btns-item"
+                    :list="$getOperationList(operationFieldList)"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
 
-            <dsh-modal
-                v-model="isEnlarge"
-                mode="custom"
-                :propsObj="modalPropsObj"
-            >
                 <dsh-cascader-table
-                    v-if="value[controlKey] && isEnlarge"
+                    v-if="value[controlKey]"
                     useCol
                     :canEdit="finalCanEdit"
                     :treeColumns="treeColumns"
@@ -57,7 +46,24 @@
                     :propsObj="propsObj"
                     @change="change"
                 ></dsh-cascader-table>
-            </dsh-modal>
+
+                <dsh-modal
+                    v-model="isEnlarge"
+                    mode="custom"
+                    :propsObj="modalPropsObj"
+                >
+                    <dsh-cascader-table
+                        v-if="value[controlKey] && isEnlarge"
+                        useCol
+                        :canEdit="finalCanEdit"
+                        :treeColumns="treeColumns"
+                        :subColumns="subColumns"
+                        :data="value[controlKey]"
+                        :propsObj="propsObj"
+                        @change="change"
+                    ></dsh-cascader-table>
+                </dsh-modal>
+            </template>
         </template>
     </div>
 </template>

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

@@ -1,64 +1,68 @@
 <template>
     <div class="flatTable">
-        <span v-if="isUnit" class="flatTable-unit">
-            <dsh-icons
-                :list="$getOperationList(['link'])"
-            ></dsh-icons>
+        <span
+            v-if="isUnit"
+            class="flatTable-unit"
+        >
+            <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
             <span class="flatTable-unit-text">
-                {{ val.list.length || 0 }}行
+                {{ val.list.length }}行
             </span>
         </span>
 
-        <!-- 设置默认值所用的控件 -->
-        <dsh-btn-modal v-else-if="propsObj._key === '_default'">
-            <bri-flat-table
-                :canEdit="finalCanEdit"
-                :columns="columns"
-                :data="val.list"
-                :rowDefault="val.rowDefault"
-                :propsObj="propsObj"
-                @change="change"
-            ></bri-flat-table>
-        </dsh-btn-modal>
-
-        <!-- 操作按钮 -->
         <template v-else>
-            <dsh-buttons
-                class="flatTable-btns"
-                itemClass="flatTable-btns-item"
-                :list="$getOperationList(['canEnlarge'])"
-                @click="$dispatchEvent($event)"
-            ></dsh-buttons>
+            <!-- 设置默认值所用的控件 -->
+            <dsh-btn-modal v-if="propsObj._key === '_default'">
+                <bri-flat-table
+                    :canEdit="finalCanEdit"
+                    :columns="columns"
+                    :data="val.list"
+                    :rowDefault="val.rowDefault"
+                    :outObj="value"
+                    :propsObj="propsObj"
+                    @change="change"
+                ></bri-flat-table>
+            </dsh-btn-modal>
 
-            <bri-flat-table
-                ref="dshFatTable"
-                :canEdit="finalCanEdit"
-                :columns="columns"
-                :data="val.list"
-                :oldData="val.oldList"
-                :rowDefault="val.rowDefault"
-                :isShare="isShare"
-                :propsObj="propsObj"
-                @change="change"
-            ></bri-flat-table>
+            <!-- 操作按钮 -->
+            <template v-else>
+                <dsh-buttons
+                    class="flatTable-btns"
+                    itemClass="flatTable-btns-item"
+                    :list="$getOperationList(['canEnlarge'])"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
 
-            <dsh-modal
-                v-model="isEnlarge"
-                mode="custom"
-                :propsObj="modalPropsObj"
-            >
                 <bri-flat-table
-                    v-if="value[controlKey] && isEnlarge"
+                    ref="dshFatTable"
                     :canEdit="finalCanEdit"
                     :columns="columns"
                     :data="val.list"
                     :oldData="val.oldList"
                     :rowDefault="val.rowDefault"
-                    :isShare="isShare"
+                    :outObj="value"
                     :propsObj="propsObj"
                     @change="change"
                 ></bri-flat-table>
-            </dsh-modal>
+
+                <dsh-modal
+                    v-model="isEnlarge"
+                    mode="custom"
+                    :propsObj="modalPropsObj"
+                >
+                    <bri-flat-table
+                        v-if="value[controlKey] && isEnlarge"
+                        :canEdit="finalCanEdit"
+                        :columns="columns"
+                        :data="val.list"
+                        :oldData="val.oldList"
+                        :rowDefault="val.rowDefault"
+                        :outObj="value"
+                        :propsObj="propsObj"
+                        @change="change"
+                    ></bri-flat-table>
+                </dsh-modal>
+            </template>
         </template>
     </div>
 </template>
@@ -68,12 +72,15 @@
 
     export default {
         name: "flatTable",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {},
-        props: {
-        },
+        props: {},
         data () {
             return {
+                isEnlarge: false,
+
                 operationMap: {
                     canEnlarge: {
                         name: "全屏展示",
@@ -86,8 +93,7 @@
                     link: {
                         customIcon: "bico-internaltable"
                     }
-                },
-                isEnlarge: false
+                }
             };
         },
         computed: {
@@ -117,14 +123,13 @@
             validate () {
                 return this.$refs.dshFatTable.validate();
             },
-
-            change (...params) {
-                this.$emit("change", ...params);
-            },
-
             // 打开全屏模态框
             enlarge () {
                 this.isEnlarge = true;
+            },
+
+            change (...params) {
+                this.$emit("change", ...params);
             }
         }
     };

package/src/components/form/DshForm.vue

@@ -16,7 +16,7 @@
                     :span="formItem._br ? 24 : (formItem._span || 24)"
                 >
                     <FormItem
-                        :class="['DshForm-item-FormItem', formItemClass]"
+                        class="DshForm-item-FormItem"
                         :prop="formItem._key"
                         @click.native="clickControl(formItem)"
                     >
@@ -27,10 +27,9 @@
                             :formItem="formItem"
                             :allFormList="allFormList"
                             :changedFields="changedFields"
+                            :height="height"
                             :rowStyle="rowStyle"
                             :labelStyle="labelStyle"
-                            :height="height"
-                            :label-width="labelWidth"
                             :formControlClass="formControlClass"
                             @change="change(formItem, arguments)"
                             @refChange="refChange(formItem, arguments)"
@@ -120,6 +119,7 @@
             },
             changedFields: Array,
 
+            height: [String, Number],
             rowStyle: {
                 type: Object,
                 default () {
@@ -132,10 +132,6 @@
                     return {};
                 }
             },
-
-            height: [String, Number],
-            labelWidth: [String, Number],
-            formItemClass: String,
             formControlClass: String,
             showRules: {
                 type: Boolean,
@@ -194,7 +190,7 @@
                 } else {
                     bool = true;
                 }
-                callback && callBack(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
+                callback && callback(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
 
                 return bool;
             },
@@ -317,19 +313,14 @@
     };
 </script>
 
-<style lang="less" scoped>
-    .DshForm {
-
-    }
-</style>
 <style lang="less">
     .DshForm {
         &-item-FormItem {
             margin-bottom: 0px!important;
-            // .ivu-form-item-content {
-            //     line-height: 1.5;
-            //     font-size: 18px;
-            // }
+        }
+        .ivu-form-item-error-tip {
+            top: 90%;
+            left: 15px;
         }
     }
 </style>

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;
             },
@@ -195,13 +199,11 @@
                                         scopedSlots: {
                                             default: props => h("dsh-unit", {
                                                 props: {
-                                                    canEdit: this.getUnitCanEdit(column, row),
-                                                    parentData: this.listData,
+                                                    isUnit: !this.getUnitCanEdit(column, row),
                                                     formData: row,
                                                     formItem: this.resetCol(item),
-                                                    isShare: this.isShare,
                                                     rowIndex: rowIndex,
-                                                    isUnit: !this.finalCanEdit
+                                                    parentData: this.listData
                                                 },
                                                 on: {
                                                     blur: () => this.controlBlur(null, column, row, arguments),
@@ -212,13 +214,11 @@
                                     })
                                     : h("dsh-unit", {
                                         props: {
-                                            canEdit: this.getUnitCanEdit(column, row),
-                                            parentData: this.listData,
+                                            isUnit: !this.getUnitCanEdit(column, row),
                                             formData: row,
                                             formItem: this.resetCol(item),
-                                            isShare: this.isShare,
                                             rowIndex: rowIndex,
-                                            isUnit: !this.finalCanEdit
+                                            parentData: this.listData
                                         },
                                         on: {
                                             blur: () => this.controlBlur(null, column, row, arguments),
@@ -343,7 +343,6 @@
                 };
                 const newRowIndex = index == null ? list.length : index + 1;
                 list.splice(newRowIndex, 0, newRow);
-
                 this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
 
                 this.change("createRow", null, newRow, newRowIndex);
@@ -387,7 +386,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

@@ -32,12 +32,19 @@
             :clipboardOption="selfPropsObj.clipboardOption"
             :columnWidthResizeOption="columnWidthResizeOption"
         ></ve-table>
+
         <!-- loading -->
-        <div v-if="isLoading" class="bri-table-empty bri-table-loading">
+        <div
+            v-if="isLoading"
+            class="bri-table-empty bri-table-loading"
+        >
             <slot name="loading">正在加载中，请稍后...</slot>
         </div>
         <!-- empty -->
-        <div v-else-if="!data.length" class="bri-table-empty">
+        <div
+            v-else-if="!data.length"
+            class="bri-table-empty"
+        >
             <slot name="empty">{{ noDataText }}</slot>
         </div>
     </div>
@@ -56,7 +63,7 @@
             isLoading: Boolean,
             noDataText: {
                 type: String,
-                default: "暂无数据"
+                default: "暂无内容"
             },
             columns: Array,
             data: Array,
@@ -177,8 +184,7 @@
                 };
             }
         },
-        mounted () {
-        },
+        mounted () {},
         methods: {}
     };
 </script>

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"
@@ -27,7 +27,6 @@
 </template>
 
 <script>
-
     export default {
         name: "DshSingleData",
         components: {},
@@ -55,12 +54,6 @@
                 default () {
                     return [];
                 }
-            },
-            extraOperationList: {
-                type: Array,
-                default () {
-                    return [];
-                }
             }
         },
         computed: {