bri-components 1.2.56 → 1.2.58

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

@@ -187,7 +187,11 @@
                         headers: { "Content-Type": "multipart/form-data" }
                     },
                     callback: data => {
-                        this.timer = setInterval(this.getTransitStatus(data.jobId, "import"), 1000);
+                        this.$Message.success("导入成功");
+                        this.file = null;
+                        this.loadingStatus = false;
+                        this.$emit("importCb", data);
+                        this.showModal = false;
                     },
                     error: data => {
                         this.$Message.error("导入失败:" + data.msg);
@@ -198,14 +202,10 @@
                 });
             },
 
-            getTransitStatus (id, type) {
+            getTransitStatus (id) {
                 let that = this;
                 return function () {
-                    if (type && type === "import") {
-                        that.getImportJobStatus(id);
-                    } else {
-                        that.getJobStatus(id);
-                    }
+                    that.getJobStatus(id);
                 };
             },
             // 状态查询
@@ -231,35 +231,6 @@
                         this.timer = null;
                     }
                 });
-            },
-            // 导入状态查询
-            getImportJobStatus (id) {
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "getImportJobStatus"
-                    },
-                    params: {
-                        jobId: id
-                    },
-                    callback: data => {
-                        if (data.status === "over") {
-                            clearInterval(this.timer);
-                            this.$Message.success("导入成功");
-                            this.file = null;
-                            this.loadingStatus = false;
-                            this.showModal = false;
-                            this.$emit("importCb");
-                        } else if (data.status === "check-fai" || data.status === "fai") {
-                            clearInterval(this.timer);
-                            this.$Message.info({ content: data.faiMsg });
-                            this.loadingStatus = false;
-                        }
-                    },
-                    error: data => {
-                        this.timer = null;
-                    }
-                });
             }
         }
     };

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

@@ -121,7 +121,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
     import BriTreeItem from "../../list/BriTreeItem.vue";
     import BriCard from "../../list/BriCard.vue";
 

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

@@ -200,7 +200,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
     import departMenu from "./departMenu.vue";
 
     export default {

package/src/components/controls/special/DshBack.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "DshBack",

package/src/components/controls/special/DshUndeveloped.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "DshUndeveloped",

package/src/components/form/DshAdvSearch.vue

@@ -422,7 +422,7 @@
                 }
 
                 &-control {
-                    .dsh-margin-bottom5();
+                    margin-bottom: 5px;
                 }
 
                 &-blank {

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

@@ -1,21 +1,16 @@
 <template>
     <div class="DshCard">
-        <!-- 无数据 -->
-        <div
-            v-if="!data.length"
-            class="dsh-tip"
-        >{{noDataText}}</div>
-
         <!-- 有数据 -->
-        <template v-else>
+        <template v-if="data.length">
             <div
-                class="DshCard-item"
                 v-for="(dataItem, dataIndex) in data"
                 :key="dataIndex"
+                class="DshCard-item"
                 @click="clickRow(dataItem)"
             >
                 <!-- 下拉操作（定位css） -->
                 <dsh-dropdown
+                    v-if="operationList.length"
                     class="DshCard-item-dropdown"
                     :dropdownObj="dropdownObj"
                     :list="operationList"
@@ -34,36 +29,41 @@
                 <!-- 内容 -->
                 <div class="DshCard-item-info">
                     <!-- 标题 -->
-                    <div class="DshCard-item-info-title dsh-ellipsis">
-                        <bri-tooltip
-                            placement="top"
-                            :transfer="true"
-                            :content="dataItem[propsObj.titleField]"
-                        >
-                            <div class="dsh-ellipsis">{{ dataItem[propsObj.titleField] }}</div>
-                        </bri-tooltip>
-                    </div>
+                    <bri-tooltip
+                        class="title"
+                        :content="dataItem[propsObj.titleField]"
+                        placement="top"
+                        :transfer="true"
+                    >
+                        <div class="title-name">
+                            {{ dataItem[propsObj.titleField] }}
+                        </div>
+                    </bri-tooltip>
 
                     <!-- 显示字段 -->
                     <div
-                        class="DshCard-item-info-col unit"
                         v-for="colItem in selfColumns"
                         :key="colItem._key"
+                        class="unit"
                     >
                         <!-- 左 label -->
-                        <bri-tooltip
-                            class="unit-label"
-                            placement="top"
-                            :transfer="true"
-                            maxWidth="200"
-                            :content="colItem._name"
-                        >
-                            <span class="dsh-ellipsis">{{ colItem._name }}</span>
-                        </bri-tooltip>
-                        <span class="unit-colon">：</span>
+                        <div class="unit-label">
+                            <bri-tooltip
+                                class="unit-label-tooltip"
+                                :content="colItem._name"
+                                :transfer="true"
+                            >
+                                <span class="unit-label-name">
+                                    {{ colItem._name }}
+                                </span>
+                                <span class="unit-label-colon">
+                                    ：
+                                </span>
+                            </bri-tooltip>
+                        </div>
 
                         <!-- 右 val -->
-                        <div class="unit-value dsh-ellipsis">
+                        <div class="unit-control">
                             <dsh-list-render
                                 v-if="colItem.renderBodyCell"
                                 :row="dataItem"
@@ -79,13 +79,23 @@
 
                             <span
                                 v-else
-                                class="unit-value-text"
-                            >{{ dataItem[colItem._key] }}</span>
+                                class="unit-control-text"
+                            >
+                                {{ dataItem[colItem._key] }}
+                            </span>
                         </div>
                     </div>
                 </div>
             </div>
         </template>
+
+        <!-- 无数据 -->
+        <div
+            v-else
+            class="dsh-tip"
+        >
+            {{ noDataText }}
+        </div>
     </div>
 </template>
 
@@ -132,24 +142,41 @@
                     color: "#E9ECF4",
                     showDropdownItemIcon: false
                 },
-                defaultImgObj: {
-                    url: this.$imageSrcMap.app.projectCard
-                },
 
                 getCardBgImgSrc (dataItem) {
                     const fileList = dataItem[this.propsObj.imageField] || [];
-                    const imgObj = fileList.find(fileItem => fileItem.mimetype.includes("image")) || this.defaultImgObj;
+                    const imgObj = fileList.find(fileItem => fileItem.mimetype.includes("image")) || {
+                        url: this.$imageSrcMap.app.projectCard
+                    };
                     return imgObj.url;
                 }
             };
         },
         computed: {
+            imageField () {
+                return this.propsObj.imageField;
+            },
+            // imageFieldObj () {
+            //     return this.columns.find(colItem => colItem._key === this.imageField) || {};
+            // },
+            titleField () {
+                return this.propsObj.titleField;
+            },
+            // titleFieldObj () {
+            //     return this.columns.find(colItem => colItem._key === this.titleField) || {};
+            // },
             selfColumns () {
-                return this.columns.slice(0, 2);
+                return this.columns
+                    .filter(colItem => ![this.imageField, this.titleField].includes(colItem._key))
+                    .map(colItem => ({
+                        ...colItem,
+                        titleAlign: "left",
+                        columnAlign: "left"
+                    }))
+                    .slice(0, 2);
             }
         },
-        created () {
-        },
+        created () {},
         methods: {
             // 点击某行
             clickRow (row) {
@@ -158,3 +185,91 @@
         }
     };
 </script>
+
+<style lang="less">
+    .DshCard {
+        padding: 0 40px;
+        background-color: #ffffff;
+        display: flex;
+        flex-wrap: wrap;
+
+        &-item {
+            box-sizing: border-box;
+            width: 250px;
+            height: 210px;
+            margin: 10px 16px 30px;
+            border-radius: 6px;
+            box-shadow: 0px 4px 8px 0px rgba(222, 222, 222, 0.75);
+            cursor: pointer;
+            overflow: hidden;
+            position: relative;
+
+            display: flex;
+            flex-direction: column;
+
+            &-dropdown {
+                position: absolute;
+                top: 5px;
+                right: 5px;
+            }
+
+            &-image {
+                height: 122px;
+                padding-top: 20px;
+
+                img {
+                    width: 100%;
+                }
+            }
+
+            &-info {
+                padding: 8px 15px;
+                background: #F7FBFF;
+                overflow: hidden;
+
+                .title {
+                    height: 24px;
+                    padding-right: 6px;
+                    font-size: 14px;
+                    font-weight: 600;
+
+                    &-name {
+                        .dsh-ellipsis();
+                    }
+                }
+
+                .unit {
+                    height: 24px;
+                    display: flex;
+                    flex-direction: row;
+
+                    &-label {
+                        font-weight: 400;
+                        color: #515A6E;
+
+                        &-name {
+                            min-width: 70px;
+                            max-width: 70px;
+                            .dsh-ellipsis();
+                            display: inline-block;
+                        }
+
+                        &-colon {
+
+                        }
+                    }
+
+                    &-control {
+                        flex: 1;
+                        min-width: 0px;
+                        overflow: hidden;
+
+                        &-text {
+
+                        }
+                    }
+                }
+            }
+        }
+    }
+</style>