bri-components 1.1.1 → 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,7 +33,8 @@ const componentNameMap = {
     coordinates: "DshCoordinates",
     editor: "DshEditor",
     tag: "DshDivider",
-    labels: "DshLabels",
+
+    labels: "BriLabels",
     package: "DshPackage",
     flatTable: "flatTable",
     cascaderTable: "cascaderTable",
@@ -62,13 +63,14 @@ const pathMap = {
         DshCoordinates: "./base/DshCoordinates.vue",
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",
-        DshLabels: "./base/DshLabels.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,4 +1,9 @@
+import controlShow from "./controlShow.vue";
+
 export default {
+    components: {
+        controlShow
+    },
     props: {
         canEdit: {
             type: Boolean,
@@ -16,70 +21,89 @@ export default {
                 return {};
             }
         },
-        isUnit: {
-            type: Boolean,
-            default: false
+
+        /* 表单形式下用到的 */
+        // 暂时是dshDate里在用，时间对比时需要用其他时间字段
+        allFormList: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        /* 列表形式下用到的 */
+        parentData: {
+            type: Array,
+            default () {
+                return [];
+            }
         }
     },
     data () {
         return {};
     },
     computed: {
-        compKey () {
-            return this.propsObj.compKey;
-        },
-        appKey () {
-            return this.propsObj.appKey;
-        },
-        entityKey () {
-            return this.propsObj.entityKey;
+        controlKey () {
+            return this.propsObj._key;
         },
-        inTable () {
-            return !!this.propsObj.inTable;
+        curVal () {
+            return this.value[this.controlKey];
         },
-        isShare () {
-            return !!this.propsObj.isShare;
+        emptyShowVal () {
+            return this.isUnitShow ? "-" : "暂无内容";
         },
-        controlKey () {
-            return this.propsObj._key;
+        showText () {
+            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)
             };
         },
-        currentVal () {
-            return this.value[this.controlKey];
-        },
         commonClass () {
             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.currentVal
+                "control-notext": !this.curVal
             };
         },
-        showText () {
-            return this.currentVal || (this.isUnit ? "-" : "暂无内容");
+
+        // 部分控件或部分条件下 才使用的属性
+        inTable () {
+            return !!this.propsObj.inTable;
+        },
+        isShare () {
+            return !!this.propsObj.isShare;
+        },
+        compKey () {
+            return this.propsObj.compKey;
+        },
+        appKey () {
+            return this.propsObj.appKey;
+        },
+        entityKey () {
+            return this.propsObj.entityKey;
         }
     },
     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

@@ -12,12 +12,13 @@
         >
             <div
                 :class="{
+                    'control-edit': true,
                     'BriLabels-dropdown-show':true,
                     'BriLabels-dropdown-show-active':listVisible
                 }"
                 @click="clickInput"
             >
-                <div>
+                <div class="BriLabels-dropdown-show-list">
                     <Tag
                         v-for="item in val"
                         :key="item._key"
@@ -33,6 +34,7 @@
                     :type="inputIcon"
                 />
             </div>
+
             <template #list>
                 <DropdownMenu>
                     <DropdownItem
@@ -51,14 +53,16 @@
                             {{item.name}}
                             <span class="BriLabels-dropdown-item-show-icons">
                                 <Icon
+                                    v-if="!item.coreLabel"
                                     class="BriLabels-dropdown-item-show-icons-edit"
                                     custom="bri bri-bianji"
                                     @click.stop="clickEdit(item)"
                                 />
-                                <Icon
+                                <!-- 暂时不需要删除 -->
+                                <!-- <Icon
                                     class="BriLabels-dropdown-item-show-icons-del"
                                     custom="bri bri-shanchu"
-                                />
+                                /> -->
                             </span>
                         </div>
                         <div
@@ -79,36 +83,55 @@
                             </Input>
                         </div>
                     </DropdownItem>
-                    sds
+                    <div
+                        class="BriLabels-dropdown-btnWrap"
+                        v-if="!selfPropsObj._onlySelect"
+                    >
+                        <bri-button
+                            class="BriLabels-dropdown-add"
+                            :propsObj="{
+                                btnType: 'default',
+                                icon:'md-add'
+                            }"
+                            @click="addLabel"
+                        >
+                            添加选项
+                        </bri-button>
+                    </div>
                 </DropdownMenu>
             </template>
         </Dropdown>
+
         <!-- 查看 -->
         <div
             v-else
             class="BriLabels-view"
         >
             <template v-if="val.length">
-                <Tag
-                    v-for="tagItem in val"
-                    :key="tagItem._key"
-                    size="medium"
-                    class="BriLabels-view-tag"
+                <Ctooltip
+                    placement="top"
+                    :transfer="true"
+                    maxWidth="200"
+                    :content="showValStr"
                 >
-                    {{ tagItem.name }}
-                </Tag>
+                    <div class="dsh-ellipsis">
+                        <div
+                            v-for="item in val"
+                            :key="item._key"
+                            size="medium"
+                            class="BriLabels-view-item"
+                        >
+                            {{ item.name }}
+                        </div>
+                    </div>
+                </Ctooltip>
             </template>
 
             <div
                 v-else
                 class="BriLabels-view-nodata"
             >
-                <template v-if="isUnit">
-                    -
-                </template>
-                <template v-else>
-                    暂无内容
-                </template>
+                {{ emptyShowVal }}
             </div>
         </div>
     </div>
@@ -124,7 +147,8 @@
             return {
                 listData: [],
                 listVisible: false,
-                inputIcon: "ios-arrow-down"
+                inputIcon: "ios-arrow-down",
+                renderList: false
             };
         },
         computed: {
@@ -134,9 +158,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-            modKey () {
-                return this.propsObj.modKey;
-            },
             val: {
                 get () {
                     return this.value[this.propsObj._key] || [];
@@ -151,7 +172,6 @@
             }
         },
         created () {
-            this.init();
         },
         methods: {
             init () {
@@ -166,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
                         },
@@ -188,6 +206,10 @@
             },
             clickInput () {
                 if (!this.finalCanEdit) return;
+                if (!this.renderList) {
+                    this.init();
+                }
+                this.renderList = true;
                 this.listVisible = !this.listVisible;
                 if (this.listVisible) {
                     this.inputIcon = "ios-arrow-up";
@@ -210,11 +232,20 @@
                 e.stopPropagation();
             },
             confirmEdit (item) {
+                if (item.name == "") return;
                 item.isEdit = false;
                 this.$forceUpdate();
             },
             handleCancel (item) {
                 this.val = this.val.filter(i => i._key != item._key);
+            },
+            addLabel () {
+                this.listData.push({
+                    _key: this.$randomB36("Labels"),
+                    isEdit: true,
+                    name: "",
+                    labelType: this.selfPropsObj._labelType
+                });
             }
         },
         watch: {

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 {};
         },