bri-components 1.1.2 → 1.1.4

package/src/components/controls/controlShow.vue

@@ -0,0 +1,44 @@
+<template>
+    <div class="controlShow">
+        <Ctooltip
+            :content="showVal"
+            maxWidth="200"
+            :transfer="true"
+        >
+            <div
+                v-if="!$isEmptyData(showVal)"
+                class="controlShow-val"
+            >
+                {{ showVal }}
+            </div>
+
+            <div
+                v-else
+                class="controlShow-nodata"
+            >
+                {{ emptyShowVal }}
+            </div>
+        </Ctooltip>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "controlShow",
+        props: {
+            showVal: String,
+            emptyShowVal: {
+                type: String,
+                default () {
+                    return "-";
+                }
+            }
+        },
+        data () {
+            return {};
+        },
+        computed: {},
+        created () {},
+        methods: {}
+    };
+</script>

package/src/components/controls/{base → senior}/BriLabels.vue

@@ -34,6 +34,7 @@
                     :type="inputIcon"
                 />
             </div>
+
             <template #list>
                 <DropdownMenu>
                     <DropdownItem
@@ -82,7 +83,10 @@
                             </Input>
                         </div>
                     </DropdownItem>
-                    <div class="BriLabels-dropdown-btnWrap">
+                    <div
+                        class="BriLabels-dropdown-btnWrap"
+                        v-if="!selfPropsObj._onlySelect"
+                    >
                         <bri-button
                             class="BriLabels-dropdown-add"
                             :propsObj="{
@@ -97,6 +101,7 @@
                 </DropdownMenu>
             </template>
         </Dropdown>
+
         <!-- 查看 -->
         <div
             v-else
@@ -126,12 +131,7 @@
                 v-else
                 class="BriLabels-view-nodata"
             >
-                <template v-if="isUnit">
-                    -
-                </template>
-                <template v-else>
-                    暂无内容
-                </template>
+                {{ emptyShowVal }}
             </div>
         </div>
     </div>
@@ -158,9 +158,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-            modKey () {
-                return this.propsObj.modKey;
-            },
             val: {
                 get () {
                     return this.value[this.propsObj._key] || [];
@@ -189,8 +186,6 @@
                     params: {
                         search: {
                             entityKey: this.entityKey, // 当前工作表关联的数据表Key
-                            modKey: this.modKey,
-                            name: this.curVal,
                             fieldKey: this.selfPropsObj._key === "_default" ? this.value._key : (this.selfPropsObj.__realKey__ || this.selfPropsObj._key), // 当前字段Key
                             labelType: this.selfPropsObj._labelType
                         },

package/src/components/controls/{base → senior}/DshPackage.vue

@@ -33,41 +33,22 @@
                 v-else
                 class="DshPackage-nodata"
             >
-                <template v-if="isUnit">
-                    -
-                </template>
-                <template v-else>
-                    暂无内容
-                </template>
+                {{ emptyShowVal }}
             </div>
         </div>
     </div>
 </template>
+
 <script>
     import controlMixin from "../controlMixin.js";
 
     export default {
         name: "DshPackage",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {},
-        props: {
-            canEdit: {
-                type: Boolean,
-                default: true
-            },
-            formData: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            },
-            formList: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            }
-        },
+        props: {},
         data () {
             return {};
         },

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

@@ -1,11 +1,8 @@
 <template>
-    <div
-        class="cascaderTable"
-        :id="`cascaderTable${controlKey}`"
-    >
-        <!-- 表格查看 -->
+    <div class="cascaderTable">
+        <!-- 在表格内的查看 -->
         <span
-            v-if="isUnit"
+            v-if="isUnitShow"
             class="cascaderTable-unit"
         >
             <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
@@ -15,7 +12,7 @@
         </span>
 
         <template v-else>
-            <!-- 配置端默认模式-->
+            <!-- 配置端 设置默认值用-->
             <dsh-btn-modal v-if="propsObj._key === '_default'">
                 <dsh-cascader-table
                     :canEdit="finalCanEdit"
@@ -27,17 +24,17 @@
                 ></dsh-cascader-table>
             </dsh-btn-modal>
 
+            <!-- 正常使用 -->
             <template v-else>
                 <!-- 操作按钮 -->
                 <dsh-buttons
                     class="cascaderTable-btns"
                     itemClass="cascaderTable-btns-item"
-                    :list="$getOperationList(operationFieldList)"
+                    :list="$getOperationList(operationBtns)"
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
 
                 <dsh-cascader-table
-                    v-if="value[controlKey]"
                     useCol
                     :canEdit="finalCanEdit"
                     :treeColumns="treeColumns"
@@ -47,6 +44,7 @@
                     @change="change"
                 ></dsh-cascader-table>
 
+                <!-- 全屏查看 -->
                 <dsh-modal
                     v-model="isEnlarge"
                     mode="custom"
@@ -73,11 +71,15 @@
 
     export default {
         name: "cascaderTable",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {},
         props: {},
         data () {
             return {
+                isEnlarge: false,
+                timer: null,
                 operationMap: {
                     canExport: {
                         name: "导出",
@@ -85,7 +87,7 @@
                         icon: "md-share-alt",
                         size: "small",
                         btnType: "text",
-                        event: "openExportModal"
+                        event: "clickExport"
                     },
                     canEnlarge: {
                         name: "全屏展示",
@@ -93,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,
@@ -111,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",
@@ -170,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

@@ -110,15 +110,19 @@
                     return [];
                 }
             },
-            monitorFormList: Array,
+
             allFormList: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
-            changedFields: Array,
-
+            changedFields: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
             height: [String, Number],
             rowStyle: {
                 type: Object,
@@ -133,6 +137,9 @@
                 }
             },
             formControlClass: String,
+
+            /* 本组件使用的 */
+            monitorFormList: Array,
             showRules: {
                 type: Boolean,
                 default: true

package/src/components/list/BriFlatTable.vue

@@ -199,7 +199,7 @@
                                         scopedSlots: {
                                             default: props => h("dsh-unit", {
                                                 props: {
-                                                    isUnit: !this.getUnitCanEdit(column, row),
+                                                    canEdit: this.getUnitCanEdit(column, row),
                                                     formData: row,
                                                     formItem: this.resetCol(item),
                                                     rowIndex: rowIndex,
@@ -214,7 +214,7 @@
                                     })
                                     : h("dsh-unit", {
                                         props: {
-                                            isUnit: !this.getUnitCanEdit(column, row),
+                                            canEdit: this.getUnitCanEdit(column, row),
                                             formData: row,
                                             formItem: this.resetCol(item),
                                             rowIndex: rowIndex,
@@ -267,7 +267,7 @@
                                             },
                                             on: {
                                                 click: (operationItem) => {
-                                                    this.$dispatchEvent(operationItem, params.row, params.index, this.listData);
+                                                    this.$dispatchEvent(operationItem, params.row, params.rowIndex, this.listData);
                                                 }
                                             }
                                         });
@@ -378,7 +378,7 @@
 
             /* --------------- 工具方法 ------------- */
             resetCol (col) {
-                let obj = {
+                let resetMap = {
                     select: {
                         _optionKind: "dropdown"
                     },
@@ -388,7 +388,7 @@
                 };
                 return {
                     ...col,
-                    ...(obj[col._type] || {}),
+                    ...(resetMap[col._type] || {}),
                     isShare: this.isShare
                 };
             },

package/src/components/list/BriTable.vue

@@ -34,12 +34,7 @@
         ></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"
@@ -123,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);
@@ -139,6 +136,7 @@
             // 全选配置项
             checkboxOption () {
                 return {
+                    selectedRowKeys: [],
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
                         this.$emit(

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

@@ -76,9 +76,15 @@
                 }
             },
 
-            changedFields: Array,
             data: Array,
             columns: Array,
+            changedFields: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+
             fixTitle: {
                 type: Boolean,
                 default: true
@@ -143,26 +149,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshBox {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-
-        &-list {
-            width: 100%;
-            flex: 1;
-            min-height: 60px;
-            margin-bottom: 10px;
-            background: #fff;
-            overflow: auto;
-        }
-
-        &-page {
-            width: 100%;
-            height: 30px;
-        }
-    }
-</style>