bri-components 1.3.30 → 1.3.32

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

@@ -1,100 +1,56 @@
 <template>
     <div class="flatTable">
-        <!-- 多选模式 -->
-        <template v-if="multipleMode"></template>
-
-        <!-- 单选模式 -->
-        <template v-else>
-            <!-- 查看 单元格内 -->
-            <span
-                v-if="isUnitShow"
-                class="flatTable-unit"
-            >
-                <dsh-icons :list="[{
-                    customIcon: 'bico-internaltable'
-                }]"></dsh-icons>
-                <span class="flatTable-unit-text">
-                    {{ curVal.list.length }}行
-                </span>
+        <!-- 查看 单元格内 -->
+        <span
+            v-if="isUnitShow"
+            class="flatTable-unit"
+        >
+            <dsh-icons :list="[{
+                customIcon: 'bico-internaltable'
+            }]"></dsh-icons>
+            <span class="flatTable-unit-text">
+                {{ curVal.list.length }}行
             </span>
+        </span>
 
-            <!-- 编辑、查看（查看页内） -->
-            <template v-else>
-                <!-- 配置端 设置默认值用-->
-                <dsh-btn-modal v-if="propsObj._key === '_default'">
-                    <dsh-flat-table
-                        :canEdit="finalCanEdit"
-                        :data="curVal.list"
-                        :rowDefault="curVal.rowDefault"
-                        :columns="columns"
-                        :propsObj="propsObj"
-                        :parentFormList="allFormList"
-                        :parentObj="value"
-                        @change="change"
-                    ></dsh-flat-table>
-                </dsh-btn-modal>
-
-                <!-- 正常使用 -->
-                <template v-else>
-                    <!-- 操作按钮 -->
-                    <dsh-buttons
-                        class="flatTable-btns"
-                        itemClass="flatTable-btns-item"
-                        :list="$getOperationList(operationFieldList)"
-                        @click="$dispatchEvent($event)"
-                    ></dsh-buttons>
-
-                    <dsh-flat-table
-                        ref="dshFatTable"
-                        :canEdit="finalCanEdit"
-                        :data="curVal.list"
-                        :oldData="curVal.oldList"
-                        :rowDefault="curVal.rowDefault"
-                        :columns="columns"
-                        :propsObj="propsObj"
-                        :parentFormList="allFormList"
-                        :parentObj="value"
-                        @change="change"
-                    ></dsh-flat-table>
-
-                    <!-- 全屏查看 -->
-                    <dsh-modal
-                        v-model="isEnlarge"
-                        mode="custom"
-                        :propsObj="modalPropsObj"
-                    >
-                        <dsh-flat-table
-                            :canEdit="finalCanEdit"
-                            :data="curVal.list"
-                            :oldData="curVal.oldList"
-                            :rowDefault="curVal.rowDefault"
-                            :columns="columns"
-                            :propsObj="propsObj"
-                            :parentFormList="allFormList"
-                            :parentObj="value"
-                            @change="change"
-                        ></dsh-flat-table>
-                    </dsh-modal>
-                </template>
-            </template>
+        <!-- 编辑、查看（查看页内） -->
+        <template v-else>
+            <!-- 配置端 设置默认值用-->
+            <dsh-btn-modal v-if="propsObj._key === '_default'">
+                <dsh-flat-table
+                    :canEdit="finalCanEdit"
+                    :data="curVal.list"
+                    :rowDefault="curVal.rowDefault"
+                    :columns="subForm"
+                    :propsObj="propsObj"
+                    :parentFormList="allFormList"
+                    :parentObj="value"
+                    @change="change"
+                ></dsh-flat-table>
+            </dsh-btn-modal>
+
+            <!-- 正常使用 -->
+            <dsh-flat-table
+                v-else
+                ref="table"
+                :canEdit="finalCanEdit"
+                :data="curVal.list"
+                :oldData="curVal.oldList"
+                :rowDefault="curVal.rowDefault"
+                :columns="subForm"
+                :propsObj="propsObj"
+                :parentFormList="allFormList"
+                :parentObj="value"
+                @change="change"
+            ></dsh-flat-table>
         </template>
-
-        <flat-table-import-modal
-            v-if="showBatchImportModal"
-            :value="showBatchImportModal"
-            :propsObj="propsObj"
-            :importParams="importParams"
-            @input="toggleBatchImportModal"
-            @importCb="importCb"
-        ></flat-table-import-modal>
     </div>
 </template>
 
 <script>
     import controlMixin from "../../mixins/controlMixin.js";
-    import DshBtnModal from "../../../small/DshBtnModal.vue";
     import DshFlatTable from "../../../list/DshFlatTable.vue";
-    import flatTableImportModal from "./flatTableImportModal.vue";
+    import DshBtnModal from "../../../small/DshBtnModal.vue";
 
     export default {
         name: "flatTable",
@@ -102,48 +58,24 @@
             controlMixin
         ],
         components: {
-            DshBtnModal,
             DshFlatTable,
-            flatTableImportModal
+            DshBtnModal
         },
         props: {},
         data () {
-            return {
-                isEnlarge: false,
-
-                operationMap: {
-                    canEnlarge: {
-                        name: "全屏展示",
-                        type: "canEnlarge",
-                        icon: "md-expand",
-                        size: "small",
-                        btnType: "text",
-                        event: "enlarge"
-                    },
-                    canImport: {
-                        name: "导入",
-                        type: "canImport",
-                        icon: "ios-create-outline",
-                        size: "small",
-                        btnType: "text",
-                        event: "clickBatchImport"
-                    },
-                    canExport: {
-                        name: "导出",
-                        type: "canExport",
-                        icon: "md-share-alt",
-                        size: "small",
-                        btnType: "text",
-                        disabled: false,
-                        event: "clickExport"
-                    }
-                },
-
-                showBatchImportModal: false,
-                timer: null
-            };
+            return {};
         },
         computed: {
+            selfPropsObj () {
+                return {
+                    _subForm: [],
+                    ...this.propsObj
+                };
+            },
+            subForm () {
+                return this.selfPropsObj._subForm;
+            },
+
             curVal () {
                 // TODO: 待定处理
                 return this.value[this.controlKey] || {
@@ -151,125 +83,15 @@
                     oldList: [],
                     rowDefault: {}
                 };
-            },
-            columns () {
-                return this.propsObj._subForm;
-            },
-
-            modalPropsObj () {
-                return {
-                    title: this.propsObj._name,
-                    fullscreen: true,
-                    showSlotClose: false,
-                    closable: true
-                };
-            },
-
-            operationFieldList () {
-                let btnList = ["canEnlarge"];
-                if (this.propsObj._isExport) {
-                    btnList.unshift("canExport");
-                }
-                if (this.propsObj._isImport && this.finalCanEdit) {
-                    btnList.unshift("canImport");
-                }
-
-                return btnList;
-            },
-            importParams () {
-                return {
-                    _key: this.controlKey,
-                    _id: this.value._id
-                };
             }
         },
         created () {},
         methods: {
-            clickBatchImport () {
-                this.openBatchImportModal();
-            },
-            openBatchImportModal () {
-                this.showBatchImportModal = true;
-            },
-            // 关闭批量导入模态框
-            closeBatchImportModal () {
-                this.showBatchImportModal = false;
-            },
-            // 切换批量导入模态框
-            toggleBatchImportModal (bool) {
-                bool ? this.openBatchImportModal() : this.closeBatchImportModal();
-            },
-            // 导出点击
-            clickExport (operationItem) {
-                if (operationItem.disabled || this.timer) {
-                    return;
-                }
-                operationItem.disabled = true;
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "exportFlatTableExcel"
-                    },
-                    params: {
-                        _key: this.controlKey,
-                        _id: this.value._id,
-                        screenKey: this.screenKey
-                    },
-                    callback: data => {
-                        setTimeout(() => {
-                            operationItem.disabled = false;
-                        }, 500);
-                        this.timer = setInterval(this.getTransitStatus(data.jobId, data.excel_url), 1000);
-                    }
-                });
-            },
-            getTransitStatus (id, url) {
-                let that = this;
-                return function () {
-                    that.getJobStatus(id, url);
-                };
-            },
-            getJobStatus (id, url) {
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "getJobStatus"
-                    },
-                    params: {
-                        jobId: id
-                    },
-                    callback: data => {
-                        if (data.status === "completed") {
-                            clearInterval(this.timer);
-                            this.timer = null;
-                            window.location.href = data.url;
-                        } else if (data.status === "failed") {
-                            clearInterval(this.timer);
-                            this.timer = null;
-                            // this.exportBtnLoading = false;
-                            this.$Message.info({ content: "操作失败，请稍后再试" });
-                        }
-                    },
-                    error: data => {
-                        this.timer = null;
-                    }
-                });
-            },
-            // 回调- 导入成功
-            importCb (data) {
-                this.value[this.controlKey] = data;
-                this.change(data);
-            },
-
             // 校验方法 -供外部使用
             validate () {
-                return this.$refs.dshFatTable.validate();
+                return this.$refs.table.validate();
             },
 
-            // 打开全屏模态框
-            enlarge () {
-                this.isEnlarge = true;
-            },
             change (...params) {
                 this.$emit("change", ...params);
             }
@@ -288,14 +110,5 @@
 
             }
         }
-
-        &-btns {
-            text-align: right;
-            color: @textColor;
-
-            &-item {
-
-            }
-        }
     }
 </style>

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

@@ -28,18 +28,19 @@
                         }"
                     >
                         <template v-if="!$isEmptyData(curValList)">
-                            <img
-                                v-for="item in curValList"
-                                :src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
-                                :key="item._key"
-                                class="selectUsers-unit-img"
-                            />
-                            <span
-                                v-if="curValList[0]"
-                                class="selectUsers-unit-text"
-                            >
-                                {{ curValList[0].name || curValList[0].realname || curValList[0].mobile }}
-                            </span>
+                            <template v-for="item in curValList">
+                                <img
+                                    :src="item.avatarurl ? $imageResize(item.avatarurl, imageResizeConfig) : $imageSrcMap.system.boy"
+                                    :key="item._key"
+                                    class="selectUsers-unit-img"
+                                />
+                                <span
+                                    :key="item._key + 'span'"
+                                    class="selectUsers-unit-text"
+                                >
+                                    {{ item.name || item.realname || item.mobile }}
+                                </span>
+                            </template>
                         </template>
 
                         <template v-else>
@@ -274,7 +275,9 @@
                     m: "fixed",
                     w: 18,
                     h: 18
-                }
+                },
+
+                allListFilterVals: []
             };
         },
         computed: {

package/src/components/form/DshDefaultSearch.vue

@@ -186,8 +186,7 @@
 
             &-item {
                 padding: 6px 0px;
-                margin-top: 0px;
-                margin-bottom: 0px;
+                margin: 0px;
 
                 &-name {}
             }