bri-components 1.1.1 → 1.1.3

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

@@ -1,54 +1,40 @@
 <template>
-    <div class="cascaderTable" :id="`cascaderTable${controlKey}`">
-        <!-- 表格查看 -->
-        <span v-if="isUnit" class="cascaderTable-unit">
-            <dsh-icons
-                :list="$getOperationList(['link'])"
-            ></dsh-icons>
+    <div class="cascaderTable">
+        <!-- 在表格内的查看 -->
+        <span
+            v-if="isUnitShow"
+            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(operationBtns)"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
 
-            <dsh-modal
-                v-model="isEnlarge"
-                mode="custom"
-                :propsObj="modalPropsObj"
-            >
                 <dsh-cascader-table
-                    v-if="value[controlKey] && isEnlarge"
                     useCol
                     :canEdit="finalCanEdit"
                     :treeColumns="treeColumns"
@@ -57,7 +43,25 @@
                     :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>
@@ -67,11 +71,15 @@
 
     export default {
         name: "cascaderTable",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {},
         props: {},
         data () {
             return {
+                isEnlarge: false,
+                timer: null,
                 operationMap: {
                     canExport: {
                         name: "导出",
@@ -79,7 +87,7 @@
                         icon: "md-share-alt",
                         size: "small",
                         btnType: "text",
-                        event: "openExportModal"
+                        event: "clickExport"
                     },
                     canEnlarge: {
                         name: "全屏展示",
@@ -87,17 +95,29 @@
                         icon: "md-expand",
                         size: "small",
                         btnType: "text",
-                        event: "enlarge"
+                        event: "clickEnlarge"
                     },
                     link: {
                         customIcon: "bico-Cascadetable"
                     }
-                },
-                isEnlarge: false,
-                timer: null
+                }
             };
         },
         computed: {
+            treeColumns () {
+                return this.value[this.controlKey] && this.value[this.controlKey]._treeForm
+                    ? this.value[this.controlKey]._treeForm
+                    : this.propsObj._treeForm;
+            },
+            subColumns () {
+                return this.propsObj._subForm;
+            },
+
+            operationBtns () {
+                return this.propsObj._isExport
+                    ? ["canExport", "canEnlarge"]
+                    : ["canEnlarge"];
+            },
             modalPropsObj () {
                 return {
                     title: this.propsObj._name,
@@ -105,56 +125,44 @@
                     showSlotClose: false,
                     closable: true
                 };
-            },
-            operationFieldList () {
-                return this.propsObj._isExport ? ["canExport", "canEnlarge"] : ["canEnlarge"];
-            },
-            treeColumns () {
-                return this.value[this.controlKey]._treeForm
-                    ? this.value[this.controlKey]._treeForm
-                    : this.propsObj._treeForm;
-            },
-            subColumns () {
-                return this.propsObj._subForm;
             }
         },
         created () {},
         methods: {
+            // 点击导出
+            clickExport (operationItem) {
+                operationItem.disabled = true;
+                this.handleExport(operationItem);
+            },
+            // 打开全屏模态框
+            clickEnlarge () {
+                this.isEnlarge = true;
+            },
             // 发生变动
             change (...params) {
                 this.$emit("change", ...params);
             },
 
-            // 导出点击
-            openExportModal (operationItem) {
-                operationItem.disabled = true;
+            // 接口 -导出级联表
+            handleExport (operationItem) {
                 this.$https({
                     url: {
                         module: "sheet",
-                        name: "exportCascaderTableExcel",
-                        params: {
-                            modKey: this.modKey
-                        }
+                        name: "exportCascaderTableExcel"
                     },
                     params: {
                         _key: this.controlKey,
                         _id: this.value._id
                     },
                     callback: data => {
-                        setTimeout(() => {
-                            operationItem.disabled = false;
-                        }, 500);
-                        this.timer = setInterval(this.getTransitStatus(data.jobId, data.excel_url), 1000);
+                        this.timer = setInterval(() => {
+                            this.getJobStatusData(operationItem, data.jobId, data.excel_url);
+                        }, 1000);
                     }
                 });
             },
-            getTransitStatus (id, url) {
-                let that = this;
-                return function () {
-                    that.getJobStatus(id, url);
-                };
-            },
-            getJobStatus (id, url) {
+            // 接口 -
+            getJobStatusData (operationItem, id, url) {
                 this.$https({
                     url: {
                         module: "sheet",
@@ -164,24 +172,23 @@
                         jobId: id
                     },
                     callback: data => {
+                        operationItem.disabled = false;
+
                         if (data.status === "completed") {
                             clearInterval(this.timer);
                             window.location.href = data.url;
                         } else if (data.status === "failed") {
                             clearInterval(this.timer);
-                            // this.exportBtnLoading = false;
-                            this.$Message.info({ content: "操作失败，请稍后再试" });
+                            this.$Message.info({
+                                content: "操作失败，请稍后再试"
+                            });
                         }
                     },
                     error: data => {
+                        operationItem.disabled = false;
                         this.timer = null;
                     }
                 });
-            },
-
-            // 打开全屏模态框
-            enlarge () {
-                this.isEnlarge = true;
             }
         }
     };

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

@@ -1,17 +1,20 @@
 <template>
     <div class="flatTable">
+        <!-- 在表格内的查看 -->
         <span
-            v-if="isUnit"
+            v-if="isUnitShow"
             class="flatTable-unit"
         >
-            <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
+            <dsh-icons :list="[{
+                customIcon: 'bico-internaltable'
+            }]"></dsh-icons>
             <span class="flatTable-unit-text">
                 {{ val.list.length }}行
             </span>
         </span>
 
         <template v-else>
-            <!-- 设置默认值所用的控件 -->
+            <!-- 配置端 设置默认值用-->
             <dsh-btn-modal v-if="propsObj._key === '_default'">
                 <bri-flat-table
                     :canEdit="finalCanEdit"
@@ -24,8 +27,9 @@
                 ></bri-flat-table>
             </dsh-btn-modal>
 
-            <!-- 操作按钮 -->
+            <!-- 正常使用 -->
             <template v-else>
+                <!-- 操作按钮 -->
                 <dsh-buttons
                     class="flatTable-btns"
                     itemClass="flatTable-btns-item"
@@ -45,6 +49,7 @@
                     @change="change"
                 ></bri-flat-table>
 
+                <!-- 全屏查看 -->
                 <dsh-modal
                     v-model="isEnlarge"
                     mode="custom"
@@ -89,24 +94,13 @@
                         size: "small",
                         btnType: "text",
                         event: "enlarge"
-                    },
-                    link: {
-                        customIcon: "bico-internaltable"
                     }
                 }
             };
         },
         computed: {
-            modalPropsObj () {
-                return {
-                    title: this.propsObj._name,
-                    fullscreen: true,
-                    showSlotClose: false,
-                    closable: true
-                };
-            },
             val () {
-                // TODOS: 待定处理
+                // TODO: 待定处理
                 return this.value[this.controlKey] || {
                     list: [],
                     oldList: [],
@@ -115,6 +109,15 @@
             },
             columns () {
                 return this.propsObj._subForm;
+            },
+
+            modalPropsObj () {
+                return {
+                    title: this.propsObj._name,
+                    fullscreen: true,
+                    showSlotClose: false,
+                    closable: true
+                };
             }
         },
         created () {},
@@ -123,11 +126,11 @@
             validate () {
                 return this.$refs.dshFatTable.validate();
             },
+
             // 打开全屏模态框
             enlarge () {
                 this.isEnlarge = true;
             },
-
             change (...params) {
                 this.$emit("change", ...params);
             }

package/src/components/controls/{base → special}/DshBack.vue

@@ -13,12 +13,12 @@
 
     export default {
         name: "DshBack",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
-            return {
-
-            };
+            return {};
         },
         computed: {
             modForm () {

package/src/components/controls/{base → special}/DshUndeveloped.vue

@@ -9,7 +9,9 @@
 
     export default {
         name: "DshUndeveloped",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
             return {};

package/src/components/form/DshAdvSearchForm.vue

@@ -103,7 +103,7 @@
                                 class="extra-dynamic"
                                 :value="conditionItem"
                                 :propsObj="parameterPropsObj"
-                                @change="change(conditionItem, arguments)"
+                                @change="parameterChange(conditionItem, arguments)"
                             ></dsh-select>
 
                             <!-- operators 筛选条件 -->
@@ -328,6 +328,15 @@
 
                 this.change(conditionItem);
             },
+            // 动态文本和固定文本切换类型
+            parameterChange (conditionItem) {
+                if (conditionItem.parameterType === "fixedText") {
+                    conditionItem.fieldParams = [];
+                } else if (conditionItem.parameterType === "dynamicText") {
+                    conditionItem.fieldValue = [];
+                }
+                this.change();
+            },
             // 发生改动
             change (conditionItem) {
                 const advSearchObj = {

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)"
@@ -111,15 +110,20 @@
                     return [];
                 }
             },
-            monitorFormList: Array,
+
             allFormList: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
-            changedFields: Array,
-
+            changedFields: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            height: [String, Number],
             rowStyle: {
                 type: Object,
                 default () {
@@ -132,11 +136,10 @@
                     return {};
                 }
             },
-
-            height: [String, Number],
-            labelWidth: [String, Number],
-            formItemClass: String,
             formControlClass: String,
+
+            /* 本组件使用的 */
+            monitorFormList: Array,
             showRules: {
                 type: Boolean,
                 default: true
@@ -194,7 +197,7 @@
                 } else {
                     bool = true;
                 }
-                callback && callBack(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
+                callback && callback(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
 
                 return bool;
             },
@@ -317,19 +320,10 @@
     };
 </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%;

package/src/components/list/BriFlatTable.vue

@@ -200,11 +200,10 @@
                                             default: props => h("dsh-unit", {
                                                 props: {
                                                     canEdit: this.getUnitCanEdit(column, row),
-                                                    parentData: this.listData,
                                                     formData: row,
                                                     formItem: this.resetCol(item),
                                                     rowIndex: rowIndex,
-                                                    isUnit: !this.canEdit
+                                                    parentData: this.listData
                                                 },
                                                 on: {
                                                     blur: () => this.controlBlur(null, column, row, arguments),
@@ -216,11 +215,10 @@
                                     : h("dsh-unit", {
                                         props: {
                                             canEdit: this.getUnitCanEdit(column, row),
-                                            parentData: this.listData,
                                             formData: row,
                                             formItem: this.resetCol(item),
                                             rowIndex: rowIndex,
-                                            isUnit: !this.canEdit
+                                            parentData: this.listData
                                         },
                                         on: {
                                             blur: () => this.controlBlur(null, column, row, arguments),
@@ -269,7 +267,7 @@
                                             },
                                             on: {
                                                 click: (operationItem) => {
-                                                    this.$dispatchEvent(operationItem, params.row, params.index, this.listData);
+                                                    this.$dispatchEvent(operationItem, params.row, params.rowIndex, this.listData);
                                                 }
                                             }
                                         });
@@ -380,7 +378,7 @@
 
             /* --------------- 工具方法 ------------- */
             resetCol (col) {
-                let obj = {
+                let resetMap = {
                     select: {
                         _optionKind: "dropdown"
                     },
@@ -390,7 +388,7 @@
                 };
                 return {
                     ...col,
-                    ...(obj[col._type] || {}),
+                    ...(resetMap[col._type] || {}),
                     isShare: this.isShare
                 };
             },

package/src/components/list/BriTable.vue

@@ -32,12 +32,14 @@
             :clipboardOption="selfPropsObj.clipboardOption"
             :columnWidthResizeOption="columnWidthResizeOption"
         ></ve-table>
+
         <!-- loading -->
-        <div v-if="isLoading" class="bri-table-empty bri-table-loading">
-            <slot name="loading">正在加载中，请稍后...</slot>
-        </div>
+        <ZLoading v-if="isLoading" />
         <!-- 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>
@@ -116,10 +118,12 @@
             // 自定义表格事件，也可配置鼠标事件
             eventCustomOption () {
                 return {
-                    bodyRowEvents: ({ row, rowIndex }) => {
+                    bodyCellEvents: ({ row, column, rowIndex }) => {
                         return {
                             click: (event) => {
-                                this.$emit("click-row", row, rowIndex, event);
+                                if (!["checkbox"].includes(column.type)) {
+                                    this.$emit("click-row", row, rowIndex, event);
+                                }
                             },
                             dblclick: (event) => {
                                 this.$emit("db-click-row", row, rowIndex, event);
@@ -132,6 +136,7 @@
             // 全选配置项
             checkboxOption () {
                 return {
+                    selectedRowKeys: [],
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
                         this.$emit(
@@ -177,8 +182,7 @@
                 };
             }
         },
-        mounted () {
-        },
+        mounted () {},
         methods: {}
     };
 </script>

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

@@ -61,11 +61,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

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: {