bri-components 1.1.2 → 1.1.3

package/src/components/controls/base/textMultiple/DshTextMultiple.vue

@@ -3,10 +3,9 @@
         <Input
             class="DshTextMultiple-control"
             v-model="text"
-            :placeholder="$showPlaceholder(canEdit, propsObj) ? `请输入${propsObj._name}` : ''"
+            :placeholder="selfPropsObj._placeholder"
             :type="'text'"
-            :readonly="!canEdit"
-            :disabled="propsObj.canEdit === false"
+            :disabled="!finalCanEdit"
             :clearable="true"
             :size="propsObj._size"
         />
@@ -30,7 +29,9 @@
 
     export default {
         name: "DshTextMultiple",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
             return {
@@ -51,7 +52,14 @@
                 }
             };
         },
-        computed: {},
+        computed: {
+            selfPropsObj () {
+                return {
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
+                };
+            }
+        },
         created () {},
         methods: {
             createTag () {

package/src/components/controls/base/textMultiple/MultipleInput.vue

@@ -2,7 +2,7 @@
     <div class="MutipleInput">
         <Input
             v-show="status === 'edit'"
-            v-model="curVal"
+            v-model="curInputVal"
             icon="ios-search"
             :placeholder="selfPropsObj._placeholder"
             @on-enter="clickConfirm"
@@ -55,7 +55,7 @@
         data () {
             return {
                 status: "edit", // show
-                curVal: "",
+                curInputVal: "",
                 curIndex: -1
             };
         },
@@ -72,7 +72,7 @@
         },
         methods: {
             clickConfirm () {
-                let val = this.curVal.trim();
+                let val = this.curInputVal.trim();
                 if (val && !this.value[this.controlKey].includes(val)) {
                     // 有值，且不存在于当前数组中
                     if (this.curIndex < 0) {
@@ -81,12 +81,12 @@
                         this.$set(this.value[this.controlKey], this.curIndex, val);
                     }
                 }
-                this.curVal = "";
+                this.curInputVal = "";
                 this.status = "show";
                 this.change();
             },
             clickEdit (val, index) {
-                this.curVal = val;
+                this.curInputVal = val;
                 this.curIndex = index;
                 this.status = "edit";
             },

package/src/components/controls/controlMap.js

@@ -33,6 +33,7 @@ const componentNameMap = {
     coordinates: "DshCoordinates",
     editor: "DshEditor",
     tag: "DshDivider",
+
     labels: "BriLabels",
     package: "DshPackage",
     flatTable: "flatTable",
@@ -62,13 +63,14 @@ const pathMap = {
         DshCoordinates: "./base/DshCoordinates.vue",
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",
-        BriLabels: "./base/BriLabels.vue",
-        DshPackage: "./base/DshPackage.vue",
+
+        BriLabels: "./senior/BriLabels.vue",
+        DshPackage: "./senior/DshPackage.vue",
         flatTable: "./senior/flatTable.vue",
         cascaderTable: "./senior/cascaderTable",
 
-        DshBack: "./base/DshBack.vue",
-        DshUndeveloped: "./base/DshUndeveloped.vue"
+        DshBack: "./special/DshBack.vue",
+        DshUndeveloped: "./special/DshUndeveloped.vue"
     }
 };
 

package/src/components/controls/controlMixin.js

@@ -1,5 +1,14 @@
+import controlShow from "./controlShow.vue";
+
 export default {
+    components: {
+        controlShow
+    },
     props: {
+        canEdit: {
+            type: Boolean,
+            default: true
+        },
         value: {
             type: Object,
             default () {
@@ -13,16 +22,15 @@ export default {
             }
         },
 
-        /* 表单形式用到的 */
-        canEdit: {
-            type: Boolean,
-            default: true
-        },
-        /* 列表形式用到的 */
-        isUnit: {
-            type: Boolean,
-            default: false
+        /* 表单形式下用到的 */
+        // 暂时是dshDate里在用，时间对比时需要用其他时间字段
+        allFormList: {
+            type: Array,
+            default () {
+                return [];
+            }
         },
+        /* 列表形式下用到的 */
         parentData: {
             type: Array,
             default () {
@@ -40,20 +48,26 @@ export default {
         curVal () {
             return this.value[this.controlKey];
         },
+        emptyShowVal () {
+            return this.isUnitShow ? "-" : "暂无内容";
+        },
         showText () {
-            return this.curVal || (this.isUnit ? "-" : "暂无内容");
+            return this.curVal || this.emptyShowVal;
         },
 
+        isUnitShow () {
+            return !this.canEdit && this.inTable;
+        },
         finalCanEdit () {
-            return this.$canEdit(this.canEdit, this.propsObj);
+            return this.canEdit && (this.propsObj.canEdit == undefined ? true : this.propsObj.canEdit);
         },
         commonDealPropsObj () {
             const selectControlTypes = ["date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "coordinates", "users", "departments"];
             return {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
-                _placeholder: this.$showPlaceholder(this.canEdit, this.propsObj)
+                _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"
                     ? (this.propsObj._placeholder || `请${selectControlTypes.includes(this.propsObj._type) ? "选择" : "输入"}${this.propsObj._name}`)
-                    : "",
+                    : undefined,
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable)
             };
         },
@@ -61,14 +75,19 @@ export default {
             return {
                 "dsh-ellipsis": true,
                 "control-edit": this.finalCanEdit,
-                "control-disabled": this.$isDisabled(this.canEdit, this.propsObj),
-                // "control-readonly": this.$isReadonly(this.canEdit, this.propsObj),
+                "control-disabled": !this.finalCanEdit,
                 "control-show": !this.canEdit,
                 "control-notext": !this.curVal
             };
         },
 
         // 部分控件或部分条件下 才使用的属性
+        inTable () {
+            return !!this.propsObj.inTable;
+        },
+        isShare () {
+            return !!this.propsObj.isShare;
+        },
         compKey () {
             return this.propsObj.compKey;
         },
@@ -77,23 +96,14 @@ export default {
         },
         entityKey () {
             return this.propsObj.entityKey;
-        },
-        inTable () {
-            return !!this.propsObj.inTable;
-        },
-        stopModInit () {
-            return this.inTable;
-        },
-        isShare () {
-            return !!this.propsObj.isShare;
         }
     },
     methods: {
         change (...params) {
-            this.$emit("change", this.value[this.propsObj._key]);
+            this.$emit("change", this.curVal);
         },
         refChange (...params) {
-            this.$emit("refChange", this.value[this.propsObj._key]);
+            this.$emit("refChange", this.curVal);
         }
     }
 };

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);
             }