bri-components 1.1.3 → 1.1.5

package/src/components/{other → controls/base/DshCascader}/InfoCascader.vue

@@ -9,8 +9,8 @@
                 class="InfoCascader-search"
                 :value="searchData"
                 :propsObj="inputPropsObj"
-            >
-            </dsh-input>
+            ></dsh-input>
+
             <div class="InfoCascader-content">
                 <div class="InfoCascader-content-left">
                     <Tree
@@ -30,6 +30,7 @@
                     </p>
                 </div>
             </div>
+
             <div class="InfoCascader-footer">
                 <dsh-buttons
                     class="InfoCascader-footer-btns"
@@ -45,25 +46,26 @@
     export default {
         name: "InfoCascader",
         props: {
+            showModal: Boolean,
+
             value: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
-            propsObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            },
             data: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
-            showModal: Boolean
+            propsObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            }
         },
         data () {
             return {

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

@@ -104,7 +104,7 @@
 
             <div
                 v-else
-                class="control-nodata-text dsh-ellipsis"
+                class="control-notext dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>

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

@@ -3,158 +3,167 @@
         <Ctooltip
             :content="curValName"
             placement="top"
-            :transfer="true"
             maxWidth="200"
+            :transfer="true"
         >
             <!-- 编辑 -->
-            <div
-                v-if="canEdit"
-                class="DshCoordinates-wrap"
-                :class="commonClass"
-                @click="clickOpenModal"
-            >
+            <template v-if="canEdit">
                 <div
-                    v-if="curLnglat.length"
-                    class="DshCoordinates-text"
+                    :class="{
+                        ...commonClass,
+                        'DshCoordinates-edit': true
+                    }"
+                    @click="clickOpenModal"
                 >
-                    <span class="dsh-ellipsis">
-                        {{ curValName}}
-                    </span>
-                    <Icon
-                        v-if="finalCanEdit && selfPropsObj._clearable"
-                        class="DshCoordinates-text-icon"
-                        type="md-close"
-                        @click.stop="clickDelete"
-                    />
-                </div>
-
-                <span
-                    v-else
-                    class="DshCoordinates-notext"
-                >
-                    点击获取当前位置
-                    <i class="DshCoordinates-wrap-zuobiao bico-font bico-zuobiao"></i>
-                </span>
-            </div>
+                    <!-- 有值 -->
+                    <div
+                        v-if="!$isEmptyData(curVal)"
+                        class="value"
+                    >
+                        <span class="value-name">
+                            {{ curValName }}
+                        </span>
+                        <Icon
+                            v-if="selfPropsObj._clearable"
+                            class="value-icon"
+                            type="md-close"
+                            @click.stop="clickDelete"
+                        />
+                    </div>
 
-            <!-- 查看 -->
-            <span
-                v-else
-                :class="{
-                    ...commonClass,
-                    'DshCoordinates-show': !isUnitShow
-                }"
-            >
-                {{ curValName }}
-            </span>
-        </Ctooltip>
+                    <!-- 无值 -->
+                    <div
+                        v-else
+                        class="nodata"
+                    >
+                        点击获取当前位置
+                        <i class="nodata-icon bico-font bico-zuobiao"></i>
+                    </div>
 
-        <!-- 模态框 -->
-        <template v-if="canEdit">
-            <Modal
-                class="DshCoordinates-modal clearFlex-modal"
-                v-model="showModal"
-                title="选择位置"
-                :footer-hide="true"
-                :styles="modalStyles"
-                @on-cancel="clickCancel"
-            >
-                <div
-                    slot="header"
-                    class="DshCoordinates-modal-header"
-                >
-                    <Row
-                        v-if="finalCanEdit"
-                        type="flex"
-                        justify="center"
-                        align="bottom"
+                    <!-- 模态框 -->
+                    <Modal
+                        class="DshCoordinates-modal"
+                        v-model="showModal"
+                        title="选择位置"
+                        :footer-hide="true"
+                        :styles="modalStyles"
+                        @on-cancel="clickCancel"
                     >
-                        <Col span="8">
-                        <div>
-                            <RadioGroup v-model="formData.kind">
-                                <Radio label="keyword">按关键字搜索</Radio>
-                                <Radio label="coordinate">按坐标搜索</Radio>
-                            </RadioGroup>
+                        <div
+                            slot="header"
+                            class="DshCoordinates-modal-header"
+                        >
+                            <Row
+                                v-if="finalCanEdit"
+                                class="edit"
+                                type="flex"
+                                justify="center"
+                                align="bottom"
+                            >
+                                <Col span="8">
+                                <div>
+                                    <RadioGroup v-model="formData.kind">
+                                        <Radio label="keyword">按关键字搜索</Radio>
+                                        <Radio label="coordinate">按坐标搜索</Radio>
+                                    </RadioGroup>
+                                </div>
+                                <Row class="dsh-margin-top5">
+                                    <Col span="16">
+                                    <Input
+                                        v-model="formData.searchText"
+                                        placeholder="请输入..."
+                                        :clearable="true"
+                                        @on-enter="clickSearch"
+                                    />
+                                    <span class="edit-message">{{ searchMessage }}</span>
+                                    </Col>
+                                    <Col span="8">&nbsp;
+                                    <Button
+                                        type="primary"
+                                        @click="clickSearch"
+                                    >搜索</Button>
+                                    </Col>
+                                </Row>
+                                </Col>
+
+                                <Col span="8">
+                                <div class="edit-text">坐标获取结果</div>
+                                <Row class="dsh-margin-top5">
+                                    <Col span="16">
+                                    <Input
+                                        :value="curVal.name"
+                                        :readonly="true"
+                                        :clearable="true"
+                                        @on-clear="clickClear"
+                                        @click.native="clickMapFitView"
+                                    />
+                                    </Col>
+                                    <Col span="8">&nbsp;
+                                    <Button
+                                        type="primary"
+                                        @click="clickConfirm"
+                                    >确认</Button>
+                                    </Col>
+                                </Row>
+                                </Col>
+                            </Row>
+
+                            <Row
+                                v-else
+                                class="show"
+                            >
+                                <Col
+                                    span="6"
+                                    class="show-name"
+                                >
+                                当前位置：
+                                </Col>
+                                <Col span="12">
+                                <Input
+                                    :value="curVal.name"
+                                    :readonly="true"
+                                    @click.native="clickMapFitView"
+                                />
+                                </Col>
+                                <Col span="6">
+                                </Col>
+                            </Row>
                         </div>
-                        <Row class="dsh-margin-top5">
-                            <Col span="16">
-                            <Input
-                                v-model="formData.searchText"
-                                placeholder="请输入..."
-                                :clearable="true"
-                                @on-enter="clickSearch"
-                            />
-                            <span class="DshCoordinates-message">{{ searchMessage }}</span>
-                            </Col>
-                            <Col span="8">&nbsp;
-                            <Button
-                                type="primary"
-                                @click="clickSearch"
-                            >搜索</Button>
-                            </Col>
-                        </Row>
-                        </Col>
 
-                        <Col span="8">
-                        <div class="DshCoordinates-modal-header-text">坐标获取结果</div>
-                        <Row class="dsh-margin-top5">
-                            <Col span="16">
-                            <Input
-                                :value="curVal.name"
-                                :readonly="true"
-                                :clearable="true"
-                                @on-clear="clickClear"
-                                @click.native="clickMapFitView"
-                            />
-                            </Col>
-                            <Col span="8">&nbsp;
-                            <Button
-                                type="primary"
-                                @click="clickConfirm"
-                            >确认</Button>
-                            </Col>
-                        </Row>
-                        </Col>
-                    </Row>
+                        <transition>
+                            <div
+                                v-if="showModal"
+                                id="mapContain"
+                                class="DshCoordinates-modal-map"
+                            ></div>
+                        </transition>
 
-                    <Row v-else>
-                        <Col
-                            span="6"
-                            class="textRight dsh-padding-top10"
-                        >当前位置：</Col>
-                        <Col span="12">
-                        <Input
-                            :value="curVal.name"
-                            :readonly="true"
-                            @click.native="clickMapFitView"
-                        />
-                        </Col>
-                        <Col span="6">
-                        </Col>
-                    </Row>
+                        <div
+                            ref="divCoordinate"
+                            style="display: none; position:absolute;background:#fff;padding: 5px 10px"
+                        ></div>
+                    </Modal>
                 </div>
+            </template>
 
-                <transition>
-                    <div
-                        v-if="showModal"
-                        id="mapContain"
-                        class="DshCoordinates-map"
-                    ></div>
-                </transition>
-                <div
-                    ref="divCoordinate"
-                    style="display: none; position:absolute;background:#fff;padding: 5px 10px"
-                ></div>
-            </Modal>
-        </template>
+            <!-- 查看 -->
+            <template v-else>
+                <span :class="{
+                    ...commonClass,
+                    'DshCoordinates-show': true
+                }">
+                    {{ curValName || emptyShowVal }}
+                </span>
+            </template>
+        </Ctooltip>
     </div>
 </template>
 
 <script>
     import controlMixin from "../controlMixin.js";
+
     const plotStrokeColor = "#4575EF";
     const plotFillColor = "#4575EF";
-
     let polygonOpt = {
         fillColor: plotFillColor,
         fillOpacity: 0.4,
@@ -169,7 +178,9 @@
 
     export default {
         name: "DshCoordinates",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         computed: {
             curVal: {
                 get () {
@@ -237,7 +248,7 @@
         methods: {
             // 打开窗体
             clickOpenModal () {
-                if (this.canEdit || this.curLnglat.length) {
+                if (this.canEdit) {
                     this.showModal = true;
                     this.cloneValue = this.$deepCopy(this.curVal);
                     this.getMap();
@@ -339,7 +350,7 @@
                 this.mouseTool = new AMap.MouseTool(this.map);
                 this.mouseTool.on("draw", this.handleMouseToolCallback);
                 // 设置默认坐标
-                if (this.curLnglat.length) {
+                if (!this.$isEmptyData(this.curVal)) {
                     this.handleAddMarker(this.curLnglat, true);
 
                     if (this.kind === "multipleMarker") { // 多选打开绘图功能

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

@@ -75,7 +75,7 @@
 
 <script>
     import controlMixin from "../controlMixin.js";
-    import uploadMixin from "./ZUpload/uploadMixin.js";
+    import uploadMixin from "./BriUpload/uploadMixin.js";
     import E from "wangeditor";
 
     export default {

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

@@ -6,7 +6,8 @@
                 v-model="value[controlKey]"
                 :type="subType"
                 :placeholder="selfPropsObj._placeholder"
-                :disabled="!finalCanEdit"
+                :readonly="selfPropsObj._readonly"
+                :disabled="!finalCanEdit || selfPropsObj._disabled"
                 :clearable="selfPropsObj._clearable"
                 :size="selfPropsObj._size"
                 :rows="selfPropsObj._rows"
@@ -80,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
@@ -89,9 +92,11 @@
                 };
             },
             subType () {
-                return ["text", "password", "textarea", "url", "email", "number", "tel"].includes(this.selfPropsObj._type)
-                    ? this.selfPropsObj._type
-                    : undefined;
+                return ["serialNumber"].includes(this.selfPropsObj._type)
+                    ? "text"
+                    : ["text", "textarea", "password", "url", "email", "number", "tel"].includes(this.selfPropsObj._type)
+                        ? this.selfPropsObj._type
+                        : "text";
             }
         },
         created () {},

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

@@ -10,6 +10,7 @@
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
+                :numberAdjust="selfPropsObj._numberAdjust"
                 @on-change="change"
             >
                 <div
@@ -72,6 +73,7 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _numberAdjust: true,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };

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

@@ -98,7 +98,7 @@
             </div>
             <div
                 v-else
-                class="control-nodata-text dsh-ellipsis"
+                class="control-notext dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>

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,7 +29,7 @@ const componentNameMap = {
     regions: "DshCascader",
     cascader: "DshCascader",
     cascaders: "DshCascader",
-    file: "ZUpload",
+    file: "BriUpload",
     coordinates: "DshCoordinates",
     editor: "DshEditor",
     tag: "DshDivider",
@@ -49,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",
@@ -58,8 +57,8 @@ 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",

package/src/components/controls/controlMixin.js

@@ -45,14 +45,34 @@ export default {
         controlKey () {
             return this.propsObj._key;
         },
-        curVal () {
-            return this.value[this.controlKey];
+        // 值为不是[]类型用的
+        curVal: {
+            get () {
+                return this.value[this.controlKey];
+            },
+            set (val) {
+                this.value[this.controlKey] = val;
+            }
+        },
+        // 值为[]类型用的
+        curValList: {
+            get () {
+                return this.value[this.controlKey] || [];
+            },
+            set (val) {
+                this.value[this.controlKey] = val;
+                this.change();
+            }
         },
         emptyShowVal () {
-            return this.isUnitShow ? "-" : "暂无内容";
+            return this.canEdit
+                ? this.commonDealPropsObj._placeholder
+                : this.isUnitShow
+                    ? "--"
+                    : "暂无内容";
         },
         showText () {
-            return this.curVal || this.emptyShowVal;
+            return this.$isEmptyData(this.curVal) ? this.curVal : this.emptyShowVal;
         },
 
         isUnitShow () {
@@ -74,10 +94,11 @@ export default {
         commonClass () {
             return {
                 "dsh-ellipsis": true,
-                "control-edit": this.finalCanEdit,
-                "control-disabled": !this.finalCanEdit,
-                "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)
             };
         },
 
@@ -100,10 +121,10 @@ export default {
     },
     methods: {
         change (...params) {
-            this.$emit("change", this.curVal);
+            this.$emit("change", this.value[this.controlKey]);
         },
         refChange (...params) {
-            this.$emit("refChange", this.curVal);
+            this.$emit("refChange", this.value[this.controlKey]);
         }
     }
 };

package/src/components/list/BriTable.vue

@@ -136,7 +136,6 @@
             // 全选配置项
             checkboxOption () {
                 return {
-                    selectedRowKeys: [],
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
                         this.$emit(

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

@@ -76,9 +76,15 @@
                 }
             },
 
-            changedFields: Array,
             data: Array,
             columns: Array,
+            changedFields: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+
             fixTitle: {
                 type: Boolean,
                 default: true
@@ -143,26 +149,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshBox {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-
-        &-list {
-            width: 100%;
-            flex: 1;
-            min-height: 60px;
-            margin-bottom: 10px;
-            background: #fff;
-            overflow: auto;
-        }
-
-        &-page {
-            width: 100%;
-            height: 30px;
-        }
-    }
-</style>