bri-components 1.1.2 → 1.1.4

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

@@ -1,52 +1,66 @@
 <template>
-    <div :class="`DshInput`">
-        <Input
-            v-if="finalCanEdit || $isDisabled(canEdit, selfPropsObj)"
-            :class="{
-                'DshInput-disabled': $isDisabled(canEdit, selfPropsObj)
-            }"
-            v-model="value[controlKey]"
-            :type="inputType"
-            :placeholder="selfPropsObj._placeholder"
-            :disabled="!finalCanEdit"
-            :clearable="selfPropsObj._clearable"
-            :size="selfPropsObj._size"
-            :rows="selfPropsObj._rows"
-            :search="selfPropsObj._search"
-            :show-word-limit="selfPropsObj._showWordLimit"
-            :maxlength="selfPropsObj._maxlength"
-            :autosize="selfPropsObj._autosize"
-            @on-enter="onEnter"
-            @on-search="onSearch"
-            @on-focus="onFocus"
-            @on-change="onChange"
-            @on-blur="onBlur"
-            @on-clear="onClear"
-        >
-        <span
-            v-if="selfPropsObj._prepend"
-            slot="prepend"
-        >{{ selfPropsObj._prepend }}</span>
-        <span
-            v-if="selfPropsObj._append"
-            slot="append"
-        >{{ selfPropsObj._append }}</span>
-        </Input>
-        <!-- textarea特殊处理 -->
-        <p
-            v-else-if="subType === 'textarea' && showVal"
-            :class="['control-show-text', 'DshInput-textarea-show']"
-            v-text="showVal"
-        >
-        </p>
+    <div class="DshInput">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
+            <Input
+                v-model="value[controlKey]"
+                :type="subType"
+                :placeholder="selfPropsObj._placeholder"
+                :readonly="selfPropsObj._readonly"
+                :disabled="!finalCanEdit || selfPropsObj._disabled"
+                :clearable="selfPropsObj._clearable"
+                :size="selfPropsObj._size"
+                :rows="selfPropsObj._rows"
+                :search="selfPropsObj._search"
+                :show-word-limit="selfPropsObj._showWordLimit"
+                :maxlength="selfPropsObj._maxlength"
+                :autosize="selfPropsObj._autosize"
+                @on-enter="onEnter"
+                @on-search="onSearch"
+                @on-focus="onFocus"
+                @on-change="onChange"
+                @on-blur="onBlur"
+                @on-clear="onClear"
+            >
+            <span
+                v-if="selfPropsObj._prepend"
+                slot="prepend"
+            >{{ selfPropsObj._prepend }}</span>
 
-        <!-- 查看模式 -->
-        <control-show
-            v-else
-            :showVal="showVal"
-            :propsObj="selfPropsObj"
-            :isUnit="isUnit"
-        ></control-show>
+            <span
+                v-if="selfPropsObj._append"
+                slot="append"
+            >{{ selfPropsObj._append }}</span>
+            </Input>
+        </template>
+
+        <!-- 查看 -->
+        <template v-else>
+            <!-- 表格 里的查看 -->
+            <template v-if="isUnitShow">
+                <control-show
+                    :showVal="curVal"
+                    :emptyShowVal="emptyShowVal"
+                    :propsObj="selfPropsObj"
+                ></control-show>
+            </template>
+
+            <!-- 查看页 里的查看 (textarea单独处理) -->
+            <template v-else>
+                <p
+                    v-if="subType === 'textarea' && curVal"
+                    class="DshInput-show-textarea"
+                    v-text="curVal"
+                ></p>
+
+                <control-show
+                    v-else
+                    :showVal="curVal"
+                    :emptyShowVal="emptyShowVal"
+                    :propsObj="selfPropsObj"
+                ></control-show>
+            </template>
+        </template>
     </div>
 </template>
 
@@ -55,7 +69,9 @@
 
     export default {
         name: "DshInput",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
             return {
@@ -65,6 +81,8 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _readonly: ["serialNumber"].includes(this.propsObj._type),
+                    // _disabled: ["serialNumber"].includes(this.propsObj._type),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
                         minRows: 2
@@ -74,20 +92,14 @@
                 };
             },
             subType () {
-                return this.selfPropsObj._type;
-            },
-            inputType () {
-                return ["text", "password", "textarea", "url", "email", "number", "tel"].includes(this.subType)
-                    ? this.subType
-                    : undefined;
-            },
-
-            showVal () {
-                return this.value[this.controlKey] || "";
+                return ["serialNumber"].includes(this.selfPropsObj._type)
+                    ? "text"
+                    : ["text", "textarea", "password", "url", "email", "number", "tel"].includes(this.selfPropsObj._type)
+                        ? this.selfPropsObj._type
+                        : "text";
             }
         },
-        created () {
-        },
+        created () {},
         methods: {
             onSearch (...params) {
                 this.$emit("search", ...params);

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

@@ -48,12 +48,12 @@
                 :name="name"
                 :value="formatterValue"
                 :placeholder="placeholder"
-                :style="{textAlign:itemDisabled ? 'right':'left'}"
             >
             <slot name="suffix"></slot>
         </div>
     </div>
 </template>
+
 <script>
     import { findComponentUpward } from "./utils/assist";
     import Emitter from "./mixins/emitter";

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

@@ -1,55 +1,68 @@
 <template>
-    <div :class="`DshNumber`">
-        <!-- 编辑模式 组件无clearable -->
-        <template v-if="finalCanEdit">
+    <div class="DshNumber">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
             <BriInputNumber
-                style="width: 100%"
-                :class="{
-                    'DshNumber-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshNumber-disabled': $isDisabled(canEdit, selfPropsObj)
-                }"
                 v-model="value[controlKey]"
-                :placeholder="$showPlaceholder(canEdit, selfPropsObj) ? `请输入${selfPropsObj._name}` : ''"
+                :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
                 :formatter="formatterFunc"
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
+                :numberAdjust="selfPropsObj._numberAdjust"
                 @on-change="change"
             >
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    style="padding-right: 24px; padding-left: 8px; line-height: 30px; white-space: nowrap"
+                    class="DshNumber-suffix"
                 >
                     {{ unitStr }}
                 </div>
             </BriInputNumber>
         </template>
 
-        <!-- 查看模式 -->
+        <!-- 查看 -->
         <template v-else>
-            <Progress
-                v-if="selfPropsObj._showProgress"
-                :percent="value[controlKey] > 100 ? 100 : toDecimal(value[controlKey])"
-            />
-            <control-show
-                v-else
-                :showVal="String(showVal)"
-                :propsObj="selfPropsObj"
-                :isUnit="isUnit"
-            ></control-show>
+            <!-- 表格 里的查看 -->
+            <template v-if="isUnitShow">
+                <!-- 进度条模式 -->
+                <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>
+            </template>
         </template>
     </div>
 </template>
 
 <script>
-    import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
     import controlMixin from "../../controlMixin.js";
+    import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
 
     export default {
         name: "DshNumber",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {
             BriInputNumber
         },
@@ -60,22 +73,26 @@
         computed: {
             selfPropsObj () {
                 return {
-                    ...this.propsObj
+                    _numberAdjust: true,
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
                 };
             },
             formatterFunc () {
-                if (this.separator) {
-                    return this.$numToSeparator;
-                } else {
-                    return value => `${value}`;
-                }
+                return this.separator
+                    ? this.$numToSeparator
+                    : value => `${value}`;
             },
 
             maxNum () {
-                return this.selfPropsObj._max || this.selfPropsObj._max === 0 ? this.selfPropsObj._max : Infinity;
+                return this.selfPropsObj._max || this.selfPropsObj._max === 0
+                    ? this.selfPropsObj._max
+                    : Infinity;
             },
             minNum () {
-                return this.selfPropsObj._min || this.selfPropsObj._min === 0 ? this.selfPropsObj._min : -Infinity;
+                return this.selfPropsObj._min || this.selfPropsObj._min === 0
+                    ? this.selfPropsObj._min
+                    : -Infinity;
             },
             // round, decimal, 为其他值不处理
             round () {
@@ -111,24 +128,11 @@
         },
         created () {},
         methods: {
-            toDecimal (x) {
-                let f = parseFloat(x);
-                if (isNaN(f)) {
-                    return;
-                }
-                f = Math.round(x * 100) / 100;
-                return f;
+            toDecimal (num) {
+                return isNaN(parseFloat(num))
+                    ? undefined
+                    : Math.round(num * 100) / 100;
             }
         }
     };
 </script>
-
-<style lang="less">
-    .DshNumber {
-        width: 100%;
-
-        .ivu-input-number-disabled .ivu-input-number-input {
-            color:#999;
-        }
-    }
-</style>

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

@@ -4,13 +4,8 @@
         <!-- 最小值 -->
         <div class="DshNumberange-left">
             <BriInputNumber
-                style="width: 100%;"
-                :class="{
-                    'DshNumberange-left-readonly': $isReadonly(canEdit, propsObj),
-                    'DshNumberange-left-disabled': $isDisabled(canEdit, propsObj)
-                }"
                 v-model="value[propsObj._key][0]"
-                :placeholder="$showPlaceholder(canEdit, propsObj) ? `请输入${propsObj._name}最小值` : ''"
+                :placeholder="selfPropsObj._placeholder ? `${selfPropsObj._placeholder}最小值` : ''"
                 :disabled="!finalCanEdit"
                 :formatter="formatterFunc"
                 :max="maxNum"
@@ -22,7 +17,7 @@
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    style="padding-right: 24px; padding-left: 8px; line-height: 30px; white-space: nowrap"
+                    class="DshNumberange-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -35,13 +30,8 @@
         <!-- 最大值 -->
         <div class="DshNumberange-right">
             <BriInputNumber
-                style="width: 100%;"
-                :class="{
-                    'DshNumberange-right-readonly': $isReadonly(canEdit, propsObj),
-                    'DshNumberange-right-disabled': $isDisabled(canEdit, propsObj)
-                }"
                 v-model="value[propsObj._key][1]"
-                :placeholder="$showPlaceholder(canEdit, propsObj) ? `请输入${propsObj._name}最大值` : ''"
+                :placeholder="selfPropsObj._placeholder ? `${selfPropsObj._placeholder}最大值` : ''"
                 :disabled="!finalCanEdit"
                 :max="maxNum"
                 :min="minNum"
@@ -52,7 +42,7 @@
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    style="padding-right: 24px; padding-left: 8px; line-height: 30px; white-space: nowrap"
+                    class="DshNumberange-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -67,7 +57,9 @@
 
     export default {
         name: "DshNumberange",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {
             BriInputNumber
         },
@@ -78,9 +70,11 @@
         computed: {
             selfPropsObj () {
                 return {
-                    ...this.propsObj
+                    ...this.propsObj,
+                    ...this.commonDealPropsObj
                 };
             },
+
             formatterFunc () {
                 if (this.propsObj._separator) {
                     return this.$numToSeparator;
@@ -128,10 +122,6 @@
             }
         },
         created () {},
-        methods: {
-            change (...params) {
-                this.$emit("change", ...params);
-            }
-        }
+        methods: {}
     };
 </script>

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

@@ -8,8 +8,6 @@
                 :class="{
                     'DshSelect-radioGroup': true,
                     'DshSelect-radioGroup-useColor': selfPropsObj._useColor,
-                    'DshSelect-radioGroup-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshSelect-radioGroup-disabled': $isDisabled(canEdit, selfPropsObj),
                     'DshSelect-radioGroup-scroll': selfPropsObj._span < 24 && !selfPropsObj._br
                 }"
                 v-model="value[controlKey]"
@@ -48,10 +46,6 @@
             <Select
                 v-else
                 v-model="value[controlKey]"
-                :class="{
-                    'DshSelect-select-readonly': $isReadonly(canEdit, selfPropsObj),
-                    'DshSelect-select-disabled': $isDisabled(canEdit, selfPropsObj)
-                }"
                 :placeholder="selfPropsObj._placeholder"
                 :multiple="selfPropsObj._multiple"
                 :disabled="!finalCanEdit"
@@ -89,13 +83,13 @@
         >
             <div
                 v-if="curSelectItem"
-                class="DshCheckbox-value-wrapper"
+                class="DshSelect-value-wrapper"
                 :style="{
                     justifyContent: flatShowAlign
                 }"
             >
                 <span
-                    class="DshCheckbox-value dsh-ellipsis"
+                    class="DshSelect-value dsh-ellipsis"
                     :style="{
                         background: selfPropsObj._useColor ? getBgColor(curSelectItem.color, 0.1) : '',
                         color: selfPropsObj._useColor ? getColor(curSelectItem.color) : ''
@@ -104,14 +98,9 @@
             </div>
             <div
                 v-else
-                class="control-nodata-text dsh-ellipsis"
+                class="control-notext dsh-ellipsis"
             >
-                <template v-if="isUnit">
-                    -
-                </template>
-                <template v-else>
-                    暂无内容
-                </template>
+                {{ emptyShowVal }}
             </div>
         </Ctooltip>
 
@@ -127,7 +116,10 @@
 
     export default {
         name: "DshSelect",
-        mixins: [controlMixin, selectMixin],
+        mixins: [
+            controlMixin,
+            selectMixin
+        ],
         props: {},
         data () {
             return {
@@ -186,7 +178,11 @@
                 return this.valStr;
             },
             flatShowAlign () {
-                return !this.propsObj._align || this.propsObj._align == "left" || !this.isUnit ? "flex-start" : this.propsObj._align == "right" ? "flex-end" : "center";
+                return !this.propsObj._align || this.propsObj._align === "left" || !this.isUnitShow
+                    ? "flex-start"
+                    : this.propsObj._align === "right"
+                        ? "flex-end"
+                        : "center";
             }
         },
         created () {

package/src/components/controls/controlMap.js

@@ -16,8 +16,8 @@ const componentNameMap = {
     phone: "DshInput",
     url: "DshInput",
     password: "DshInput",
-    texts: "MultipleInput",
-    serialNumber: "YSerialNumber",
+    serialNumber: "DshInput",
+    texts: "BriInputs",
     number: "DshNumber",
     numberange: "DshNumberange",
     date: "DshDate",
@@ -29,10 +29,11 @@ const componentNameMap = {
     regions: "DshCascader",
     cascader: "DshCascader",
     cascaders: "DshCascader",
-    file: "ZUpload",
+    file: "BriUpload",
     coordinates: "DshCoordinates",
     editor: "DshEditor",
     tag: "DshDivider",
+
     labels: "BriLabels",
     package: "DshPackage",
     flatTable: "flatTable",
@@ -48,8 +49,7 @@ const componentNameMap = {
 const pathMap = {
     base: {
         // DshInput: "./base/DshInput.vue", // 全局已注册
-        MultipleInput: "./base/textMultiple/MultipleInput.vue",
-        YSerialNumber: "./base/YSerialNumber.vue",
+        BriInputs: "./base/BriInputs.vue",
         // DshNumber: "./base/DshNumber/DshNumber.vue", // 全局已注册
         DshNumberange: "./base/DshNumberange.vue",
         DshDate: "./base/DshDate.vue",
@@ -57,18 +57,19 @@ const pathMap = {
         DshSwitch: "./base/DshSwitch.vue",
         // DshSelect: "./base/DshSelect.vue", // 全局已注册
         // DshCheckbox: "./base/DshCheckbox.vue", // 全局已注册
-        // DshCascader: "./base/DshCascader.vue", // 全局已注册
-        ZUpload: "./base/ZUpload/index.vue",
+        // DshCascader: "./base/DshCascader/DshCascader.vue", // 全局已注册
+        BriUpload: "./base/BriUpload/index.vue",
         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,35 +48,47 @@ 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)
             };
         },
         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-show": !this.canEdit,
-                "control-notext": !this.curVal
+                "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)
             };
         },
 
         // 部分控件或部分条件下 才使用的属性
+        inTable () {
+            return !!this.propsObj.inTable;
+        },
+        isShare () {
+            return !!this.propsObj.isShare;
+        },
         compKey () {
             return this.propsObj.compKey;
         },
@@ -77,23 +97,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);
         }
     }
 };