bri-components 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.5",
+    "version": "1.2.7",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -31,6 +31,7 @@
     },
     "dependencies": {
         "axios": "^0.23.0",
+        "ali-oss": "^6.13.1",
         "bri-datas": "^1.0.8-0",
         "jshint": "^2.12.0",
         "minio": "^7.0.26",

package/src/components/controls/base/BriUpload/uploadMixin.js

@@ -1,7 +1,8 @@
 import axios from "axios";
-
+import Oss from "ali-oss";
 const minio = require("minio");
 const stream = require("stream");
+
 export default {
     props: {
         groupKey: {
@@ -150,7 +151,7 @@ export default {
                 callbackBodyType: "application/json",
                 callbackBody: this.transferCallBody(callbackBody)
             };
-            new this.$aliOss(res.ossConfig).multipartUpload(remoteName, file, {
+            new Oss(res.ossConfig).multipartUpload(remoteName, file, {
                 progress: (percentage) => {
                     this.inProgress(Number((percentage * 100).toFixed(0)));
                     this.handleProgress && this.handleProgress(percentage, file);
@@ -291,7 +292,7 @@ export default {
                 refreshSTSTokenInterval: 3600 * 1000
             };
 
-            new this.$aliOss(newOss).multipartUpload(remoteName, file, {
+            new Oss(newOss).multipartUpload(remoteName, file, {
                 progress: (percentage) => {
                     this.inProgress(Number((percentage * 100).toFixed(0)));
                     this.handleProgress && this.handleProgress(percentage, file);

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

@@ -20,7 +20,7 @@
                 </div>
 
                 <!-- 图标 -->
-                <template>
+                <template v-if="canEdit">
                     <Icon
                         v-if="!$isEmptyData(curVal) && selfPropsObj._clearable && isHover"
                         class="icon-close"

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

@@ -166,6 +166,12 @@
                         numbers: [1],
                         dateTypes: ["date", "datetime", "daterange", "datetimerange"]
                     },
+                    {
+                        _key: "last_month_start",
+                        name: "上月初",
+                        numbers: [0],
+                        dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
+                    },
                     {
                         _key: "dyn_month_start",
                         name: "月初",

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

@@ -5,7 +5,7 @@
             <Input
                 class="DshInput-edit"
                 v-model="value[controlKey]"
-                :type="subType"
+                :type="inputType"
                 :placeholder="selfPropsObj._placeholder"
                 :readonly="selfPropsObj._readonly"
                 :disabled="!finalCanEdit || selfPropsObj._disabled"
@@ -38,7 +38,7 @@
         <!-- 查看 -->
         <template v-else>
             <!-- 查看页 的textarea单独处理 -->
-            <template v-if="!isUnitShow && subType === 'textarea' && !$isEmptyData(curVal)">
+            <template v-if="inputType === 'textarea' && !$isEmptyData(curVal) && !isUnitShow">
                 <p
                     class="DshInput-show-textarea"
                     v-text="showVal"
@@ -57,7 +57,19 @@
                         'DshInput-unit': isUnitShow,
                         'DshInput-show': !isUnitShow
                     }">
-                        {{ showVal }}
+                        <!-- 有值 -->
+                        <a
+                            v-if="inputType === 'url' && !$isEmptyData(curVal)"
+                            class="text"
+                            @click="goHttpWindow($event)"
+                        >
+                            {{ showVal }}
+                        </a>
+
+                        <!-- 无值 -->
+                        <template v-else>
+                            {{ showVal }}
+                        </template>
                     </div>
                 </bri-tooltip>
             </template>
@@ -82,8 +94,9 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _readonly: ["serialNumber"].includes(this.propsObj._type),
-                    // _disabled: ["serialNumber"].includes(this.propsObj._type),
+                    _textType: "default",
+                    _readonly: ["serialNumber"].includes(this.controlType),
+                    _disabled: ["serialNumber"].includes(this.controlType),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
                         minRows: 2
@@ -93,12 +106,18 @@
                     ...this.commonDealPropsObj
                 };
             },
+            inputType () {
+                return ["textarea", "password", "email", "url", "number", "tel"].includes(this.controlType)
+                    ? this.controlType
+                    : ["text"].includes(this.controlType) && ["url"].includes(this.subType)
+                        ? "url"
+                        : ["serialNumber"].includes(this.controlType)
+                            ? "text"
+                            : "text";
+            },
+            // 子类型，只在type="text"有效
             subType () {
-                return ["serialNumber"].includes(this.selfPropsObj._type)
-                    ? "text"
-                    : ["text", "textarea", "password", "url", "email", "number", "tel"].includes(this.selfPropsObj._type)
-                        ? this.selfPropsObj._type
-                        : "text";
+                return this.selfPropsObj._textType;
             }
         },
         created () {},
@@ -127,6 +146,12 @@
             },
             onClear () {
                 this.change();
+            },
+
+            // 超链接跳转
+            goHttpWindow (e) {
+                e.stopPropagation();
+                window.open(this.curVal);
             }
         }
     };

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

@@ -28,7 +28,6 @@
                                 {{ item.name || item._name }}
                             </span>
                         </Radio>
-
                     </template>
 
                     <div
@@ -121,6 +120,7 @@
                     _filterable: true,
                     _transfer: true,
                     _data: [],
+                    _customData: [],
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
@@ -153,46 +153,24 @@
                 };
             },
             showVal () {
-                return this.$isEmptyData(this.curValList)
+                return this.$isEmptyData(this.curVal)
                     ? this.emptyShowVal
                     : this.curValObj.name || this.curValObj._name;
             }
         },
         created () {
-            this.initData();
+            this.init();
         },
         methods: {
-            initData () {
-                if (this.selfPropsObj._customData && this.selfPropsObj._customData.length) {
-                    this.selfPropsObj._customData.forEach(item => {
-                        this.getListData(item);
-                    });
-                }
-            },
-            getListData (_customData) {
-                this.$https({
-                    url: _customData.url,
-                    params: {
-                        ..._customData.params
-                    },
-                    callback: data => {
-                        this.initListData.push(
-                            ...data.list.map(item => (
-                                {
-                                    _key: item[_customData._key || "_key"],
-                                    name: item[_customData._name || "name"]
-                                }
-                            ))
-                        );
-                    }
-                });
+            init () {
+
             },
+
             // 取消flat模式的选择项
             cancelSelect (item) {
                 if (item._disabled !== true && this.selfPropsObj._clearable !== false) {
                     if (item._key === this.curVal) {
                         this.value[this.controlKey] = "";
-
                         this.change();
                     }
                 }
@@ -221,6 +199,27 @@
             // 获取某项的置灰状态
             getItemDisabled (item) {
                 return !!(!this.finalCanEdit || item._disabled);
+            },
+
+            // 接口 -获取自定义的接口数据
+            getListData () {
+                this.selfPropsObj._customData.forEach(item => {
+                    this.$https({
+                        url: item.url,
+                        params: item.params,
+                        callback: data => {
+                            this.initListData = [
+                                ...this.initListData,
+                                ...data.list.map(item =>
+                                    ({
+                                        _key: item[item._key || "_key"],
+                                        name: item[item._name || "name"]
+                                    })
+                                )
+                            ];
+                        }
+                    });
+                });
             }
         }
     };

package/src/components/controls/senior/selectDepartments.vue

@@ -6,67 +6,70 @@
             maxWidth="200"
             :transfer="true"
         >
-            <!-- 编辑模式 -->
-            <div
-                v-if="canEdit"
-                :class="{
-                    ...commonClass,
-                    'selectDepartments-edit': true
-                }"
-                @mouseenter="isHover = true"
-                @mouseleave="isHover = false"
-                @click="clickInput"
-            >
-                <!-- 有值 -->
-                <template v-if="!$isEmptyData(curValList)">
-                    <dsh-tags
-                        class="text"
-                        :list="curValList"
-                        :propsObj="{
-                            disabled: !finalCanEdit,
-                            closable: true
+            <div @click.stop="clickInput">
+                <slot>
+                    <!-- 编辑模式 -->
+                    <div
+                        v-if="canEdit"
+                        :class="{
+                            ...commonClass,
+                            'selectDepartments-edit': true
                         }"
-                        @delete="clickDeleteItem"
-                    ></dsh-tags>
-                </template>
-                <!-- 无值 -->
-                <template v-else>
-                    {{ emptyShowVal }}
-                </template>
+                        @mouseenter="isHover = true"
+                        @mouseleave="isHover = false"
+                    >
+                        <!-- 有值 -->
+                        <template v-if="!$isEmptyData(curValList)">
+                            <dsh-tags
+                                class="text"
+                                :list="curValList"
+                                :propsObj="{
+                                    disabled: !finalCanEdit,
+                                    closable: true
+                                }"
+                                @delete="clickDeleteItem"
+                            ></dsh-tags>
+                        </template>
+                        <!-- 无值 -->
+                        <template v-else>
+                            {{ emptyShowVal }}
+                        </template>
 
-                <!-- 图标 -->
-                <template>
-                    <Icon
-                        v-if="!$isEmptyData(curValList) && selfPropsObj._clearable && isHover"
-                        class="icon-close"
-                        type="ios-close-circle"
-                        @click.stop="clickClear"
-                    />
-                    <Icon
-                        v-else
-                        class="icon-default"
-                        :type="inputIcon"
-                    />
-                </template>
-            </div>
+                        <!-- 图标 -->
+                        <template>
+                            <Icon
+                                v-if="!$isEmptyData(curValList) && selfPropsObj._clearable && isHover"
+                                class="icon-close"
+                                type="ios-close-circle"
+                                @click.stop="clickClear"
+                            />
+                            <Icon
+                                v-else
+                                class="icon-default"
+                                :type="inputIcon"
+                            />
+                        </template>
+                    </div>
 
-            <!-- 查看模式 -->
-            <div
-                v-else
-                :class="{
-                    ...commonClass,
-                    'selectDepartments-show': true
-                }"
-            >
-                <dsh-tags
-                    v-if="!$isEmptyData(curValList)"
-                    class="text"
-                    :list="curValList"
-                ></dsh-tags>
+                    <!-- 查看模式 -->
+                    <div
+                        v-else
+                        :class="{
+                            ...commonClass,
+                            'selectDepartments-show': true
+                        }"
+                    >
+                        <dsh-tags
+                            v-if="!$isEmptyData(curValList)"
+                            class="text"
+                            :list="curValList"
+                        ></dsh-tags>
 
-                <template v-else>
-                    {{ emptyShowVal }}
-                </template>
+                        <template v-else>
+                            {{ emptyShowVal }}
+                        </template>
+                    </div>
+                </slot>
             </div>
         </bri-tooltip>
 

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

@@ -46,7 +46,9 @@
                 :propsObj="pagePropsObj"
                 @changePage="changePage"
                 @changePageSize="changePageSize"
-            ></dsh-page>
+            >
+                <slot name="page"></slot>
+            </dsh-page>
         </div>
     </div>
 </template>

package/src/components/list/DshPage.vue

@@ -17,7 +17,9 @@
         :disabled="obj.disabled"
         @on-change="changePage"
         @on-page-size-change="changePageSize"
-    />
+    >
+        <slot></slot>
+    </Page>
 </template>
 
 <script>
@@ -32,7 +34,7 @@
                 }
             },
             total: {
-                type: Number,
+                type: [Number, String],
                 default: 0
             },
             propsObj: {

package/src/styles/components/list/DshPage.less

@@ -1,15 +1,15 @@
 .DshPage {
     width: 100%;
-    text-align: right;
-    font-size: 14px;
-    color: #666;
     height: 24px;
     line-height: 24px;
-    .ivu-page-total{
+    text-align: right;
+    font-size: 14px;
+
+    .ivu-page-total {
         float: left;
     }
-    .ivu-select-selection{
-        border: 0px !important;
+    .ivu-select-selection {
+        border: 0px!important;
     }
     .ivu-page-item-active {
         a,
@@ -29,12 +29,11 @@
     .ivu-page-item {
         height: 24px!important;
         line-height: 24px!important;
-        // background: @white;
         background: transparent;
         display: inline-block;
         vertical-align: middle;
     }
-    .ivu-select-single .ivu-select-selection .ivu-select-selected-value{
+    .ivu-select-single .ivu-select-selection .ivu-select-selected-value {
         height: 24px!important;
         line-height: 24px!important;
     }
@@ -46,7 +45,6 @@
         a {
             color: #000;
             font-weight: bold;
-            // font-size: 14px;
         }
     }
     .ivu-page-item {