bri-components 1.1.6 → 1.2.1

package/src/components/controls/base/DshCoordinates.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="DshCoordinates">
-        <Ctooltip
+        <bri-tooltip
             :content="curValName"
             placement="top"
             maxWidth="200"
@@ -155,7 +155,7 @@
                     {{ curValName || emptyShowVal }}
                 </span>
             </template>
-        </Ctooltip>
+        </bri-tooltip>
     </div>
 </template>
 

package/src/components/controls/base/DshDate.vue

@@ -5,10 +5,11 @@
     >
         <!-- 编辑 -->
         <template v-if="canEdit">
+            <!-- 时间子类型 -->
             <template v-if="['time'].includes(subType)">
                 <TimePicker
-                    style="width: 100%;"
-                    v-model="val"
+                    class="DshDate-edit"
+                    v-model="curValDate"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
                     :disabled="!finalCanEdit"
@@ -18,10 +19,11 @@
                 ></TimePicker>
             </template>
 
+            <!-- 日期、日期时间、年、月 -->
             <template v-else>
                 <DatePicker
-                    style="width: 100%;"
-                    v-model="val"
+                    class="DshDate-edit"
+                    v-model="curValDate"
                     :type="subType"
                     :placeholder="selfPropsObj._placeholder"
                     :disabled="!finalCanEdit"
@@ -35,11 +37,19 @@
 
         <!-- 查看 -->
         <template v-else>
-            <control-show
-                :showVal="curVal"
-                :emptyShowVal="emptyShowVal"
-                :propsObj="selfPropsObj"
-            ></control-show>
+            <bri-tooltip
+                :content="showText"
+                maxWidth="200"
+                :transfer="true"
+            >
+                <div :class="{
+                    ...commonClass,
+                    'DshDate-unit': isUnitShow,
+                    'DshDate-show': !isUnitShow
+                }">
+                    {{ showText }}
+                </div>
+            </bri-tooltip>
         </template>
     </div>
 </template>
@@ -62,12 +72,13 @@
             selfPropsObj () {
                 return {
                     _transfer: true,
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
 
-            val: {
+            curValDate: {
                 get () {
                     const val = this.value[this.controlKey];
                     return this.$transformDateCompatible(val, this.subType);

package/src/components/controls/base/DshEditor.vue

@@ -1,49 +1,38 @@
 <template>
     <div class="DshEditor">
         <!-- 编辑 -->
-        <template v-if="canEdit">
-            <!-- 可编辑 -->
-            <template v-if="finalCanEdit">
-                <div
-                    class="DshEditor-show DshEditor-edit"
-                    :class="value[controlKey] ? '': 'DshEditor-edit-placeholder'"
-                    v-show="showType === 'show'"
-                    v-html="editVal"
-                    @click="handleEdit"
-                ></div>
-
-                <div
-                    v-show="showType === 'edit'"
-                    class="DshEditor-wrap"
-                >
-                    <div
-                        ref="toolbar"
-                        class="DshEditor-wrap-toolbar"
-                    ></div>
-
-                    <div
-                        ref="editor"
-                        class="DshEditor-wrap-text"
-                    ></div>
-
-                    <dsh-buttons
-                        class="DshEditor-wrap-btn"
-                        :list="$getOperationList(['canSave'])"
-                        @click="$dispatchEvent($event)"
-                    ></dsh-buttons>
-                </div>
-            </template>
-
-            <!-- 不可编辑 -->
+         <template v-if="canEdit">
             <div
-                v-else
                 :class="{
-                    'DshEditor-show': true,
-                    'DshEditor-show-disabled': true
+                    'DshEditor-edit': true,
+                    ...commonClass
                 }"
                 v-show="showType === 'show'"
                 v-html="showText"
+                @click="handleEdit"
             ></div>
+
+            <div
+                v-if="finalCanEdit"
+                v-show="showType === 'edit'"
+                class="DshEditor-wrap"
+            >
+                <div
+                    ref="toolbar"
+                    class="DshEditor-wrap-toolbar"
+                ></div>
+
+                <div
+                    ref="editor"
+                    class="DshEditor-wrap-text"
+                ></div>
+
+                <dsh-buttons
+                    class="DshEditor-wrap-btn"
+                    :list="$getOperationList(['canSave'])"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
+            </div>
         </template>
 
         <!-- 查看 -->
@@ -52,11 +41,10 @@
             <div
                 v-if="isUnitShow"
                 :class="{
-                    'DshEditor-unit': true,
-                    'DshEditor-unit-nodata': true,
+                    'DshEditor-unit': !$isEmptyData(curVal)
                 }"
             >
-                {{ curVal ? "富文本" : emptyShowVal }}
+                {{ $isEmptyData(curVal) ? emptyShowVal : "富文本" }}
             </div>
 
             <!-- 查看页里 的查看 -->
@@ -64,9 +52,8 @@
                 v-else
                 :class="{
                     'DshEditor-show': true,
-                    'DshEditor-show-nodata': !curVal
+                    'DshEditor-show-nodata': $isEmptyData(curVal)
                 }"
-                v-show="showType === 'show'"
                 v-html="showText"
             ></div>
         </template>
@@ -106,10 +93,6 @@
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
-            },
-
-            editVal () {
-                return this.curVal || this.selfPropsObj._placeholder;
             }
         },
         created () {},
@@ -181,8 +164,10 @@
                 this.editor = editor;
             },
             handleEdit () {
-                this.editor.txt.html(this.value[this.propsObj._key]);
-                this.showType = "edit";
+                if (this.finalCanEdit) {
+                    this.editor.txt.html(this.value[this.propsObj._key]);
+                    this.showType = "edit";
+                }
             },
             clickSave () {
                 this.showType = "show";

package/src/components/controls/base/DshInput.vue

@@ -3,6 +3,7 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <Input
+                class="DshInput-edit"
                 v-model="value[controlKey]"
                 :type="subType"
                 :placeholder="selfPropsObj._placeholder"
@@ -36,29 +37,29 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 表格 里的查看 -->
-            <template v-if="isUnitShow">
-                <control-show
-                    :showVal="curVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
-            </template>
-
-            <!-- 查看页 里的查看 (textarea单独处理) -->
-            <template v-else>
+            <!-- 查看页 的textarea单独处理 -->
+            <template v-if="!isUnitShow && subType === 'textarea' && !$isEmptyData(curVal)">
                 <p
-                    v-if="subType === 'textarea' && curVal"
                     class="DshInput-show-textarea"
-                    v-text="curVal"
+                    v-text="showText"
                 ></p>
+            </template>
 
-                <control-show
-                    v-else
-                    :showVal="curVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
+            <!-- 表格和查看页 里的查看 -->
+            <template v-else>
+                <bri-tooltip
+                    :content="showText"
+                    maxWidth="200"
+                    :transfer="true"
+                >
+                    <div :class="{
+                        ...commonClass,
+                        'DshInput-unit': isUnitShow,
+                        'DshInput-show': !isUnitShow
+                    }">
+                        {{ showText }}
+                    </div>
+                </bri-tooltip>
             </template>
         </template>
     </div>
@@ -87,6 +88,7 @@
                     _autosize: {
                         minRows: 2
                     },
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };

package/src/components/controls/base/DshNumber/DshNumber.vue

@@ -3,6 +3,7 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <BriInputNumber
+                class="DshNumber-edit"
                 v-model="value[controlKey]"
                 :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
@@ -10,13 +11,13 @@
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
-                :numberAdjust="selfPropsObj._numberAdjust"
+                :numberAdjust="selfPropsObj._numberAdjust || !unitStr"
                 @on-change="change"
             >
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    class="DshNumber-suffix"
+                    class="DshNumber-edit-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -25,30 +26,29 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 表格 里的查看 -->
-            <template v-if="isUnitShow">
-                <!-- 进度条模式 -->
+            <!-- 单元格的查看 进度条模式 -->
+            <template v-if="isUnitShow && selfPropsObj._showProgress">
                 <Progress
                     v-if="selfPropsObj._showProgress"
                     :percent="curVal > 100 ? 100 : toDecimal(curVal)"
                 />
-
-                <!-- 文字模式 -->
-                <control-show
-                    v-else
-                    :showVal="showVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
             </template>
 
-            <!-- 查看页 里的查看 -->
+            <!-- 单元格和查看页的查看 -->
             <template v-else>
-                <control-show
-                    :showVal="showVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
+                <bri-tooltip
+                    :content="showText"
+                    maxWidth="200"
+                    :transfer="true"
+                >
+                    <div :class="{
+                        ...commonClass,
+                        'DshInput-unit': isUnitShow,
+                        'DshInput-show': !isUnitShow
+                    }">
+                        {{ showText }}
+                    </div>
+                </bri-tooltip>
             </template>
         </template>
     </div>
@@ -73,7 +73,6 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _numberAdjust: true,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -122,8 +121,10 @@
                 return this.selfPropsObj._separator;
             },
 
-            showVal () {
-                return this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
+            showText () {
+                return this.$isEmptyData(this.curVal)
+                    ? this.emptyShowVal
+                    : this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
             }
         },
         created () {},

package/src/components/controls/base/DshSelect.vue

@@ -74,7 +74,7 @@
             </Select>
         </template>
 
-        <Ctooltip
+        <bri-tooltip
             v-else
             :content="valStr"
             maxWidth="200"
@@ -98,11 +98,11 @@
             </div>
             <div
                 v-else
-                class="control-notext dsh-ellipsis"
+                class="bri-control-nodata dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>
-        </Ctooltip>
+        </bri-tooltip>
 
         <!-- tip项弹框提示 -->
         <dsh-render :render="tipModalRender"></dsh-render>

package/src/components/controls/base/DshSwitch.vue

@@ -20,7 +20,7 @@
 
         <!-- 查看 -->
         <template v-else>
-            <Ctooltip
+            <bri-tooltip
                 :content="showText"
                 placement="top"
                 :transfer="true"
@@ -37,7 +37,7 @@
                         {{ showText }}
                     </span>
                 </div>
-            </Ctooltip>
+            </bri-tooltip>
         </template>
     </div>
 </template>

package/src/components/controls/controlMap.js

@@ -34,6 +34,8 @@ const componentNameMap = {
     editor: "DshEditor",
     tag: "DshDivider",
 
+    users: "selectUsers",
+    departments: "selectDepartments",
     labels: "BriLabels",
     package: "DshPackage",
     flatTable: "flatTable",
@@ -58,11 +60,13 @@ const pathMap = {
         // DshSelect: "./base/DshSelect.vue", // 全局已注册
         // DshCheckbox: "./base/DshCheckbox.vue", // 全局已注册
         // DshCascader: "./base/DshCascader/DshCascader.vue", // 全局已注册
-        BriUpload: "./base/BriUpload/index.vue",
+        BriUpload: "./base/BriUpload/BriUpload.vue",
         DshCoordinates: "./base/DshCoordinates.vue",
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",
 
+        selectUsers: "./senior/selectUsers/selectUsers.vue",
+        selectDepartments: "./senior/selectDepartments.vue",
         BriLabels: "./senior/BriLabels.vue",
         DshPackage: "./senior/DshPackage.vue",
         flatTable: "./senior/flatTable.vue",

package/src/components/controls/controlMixin.js

@@ -1,9 +1,4 @@
-import controlShow from "./controlShow.vue";
-
 export default {
-    components: {
-        controlShow
-    },
     props: {
         canEdit: {
             type: Boolean,
@@ -42,9 +37,6 @@ export default {
         return {};
     },
     computed: {
-        controlKey () {
-            return this.propsObj._key;
-        },
         // 值为不是[]类型用的
         curVal: {
             get () {
@@ -57,7 +49,7 @@ export default {
         // 值为[]类型用的
         curValList: {
             get () {
-                return this.value[this.controlKey] || [];
+                return (this.value[this.controlKey] || []).filter(item => !!item);
             },
             set (val) {
                 this.value[this.controlKey] = val;
@@ -72,15 +64,21 @@ export default {
                     : "暂无内容";
         },
         showText () {
-            return this.$isEmptyData(this.curVal) ? this.curVal : this.emptyShowVal;
+            return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal;
         },
 
-        isUnitShow () {
-            return !this.canEdit && this.inTable;
+        controlKey () {
+            return this.propsObj._key;
+        },
+        controlType () {
+            return this.propsObj._type;
         },
         finalCanEdit () {
             return this.canEdit && (this.propsObj.canEdit == undefined ? true : this.propsObj.canEdit);
         },
+        isUnitShow () {
+            return !this.canEdit && this.inTable;
+        },
         commonDealPropsObj () {
             const selectControlTypes = ["date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "coordinates", "users", "departments"];
             return {
@@ -93,12 +91,13 @@ export default {
         },
         commonClass () {
             return {
+                "bri-control-edit": this.canEdit && this.finalCanEdit,
+                "bri-control-disabled": this.canEdit && !this.finalCanEdit,
+                "bri-control-unit": !this.canEdit && this.isUnitShow,
+                "bri-control-show": !this.canEdit && !this.isUnitShow,
+
                 "dsh-ellipsis": true,
-                "control-edit": this.canEdit && this.finalCanEdit,
-                "control-disabled": this.canEdit && !this.finalCanEdit,
-                "control-unit": !this.canEdit && this.isUnitShow,
-                "control-show": !this.canEdit && !this.isUnitShow,
-                "control-notext": this.$isEmptyData(this.curVal)
+                "bri-control-nodata": !this.isUnitShow && this.$isEmptyData(this.curVal)
             };
         },