bri-components 1.2.13 → 1.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.13",
+    "version": "1.2.15",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -36,7 +36,7 @@
         "jshint": "^2.12.0",
         "minio": "^7.0.26",
         "stream": "^0.0.2",
-        "view-design": "4.6.0",
+        "view-design": "^4.6.0",
         "viewerjs": "^1.10.2",
         "vue-codemirror": "^4.0.6",
         "vue-cropperjs": "^4.1.0",

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

@@ -144,7 +144,22 @@ export default {
                 callbackBodyType: "application/json",
                 callbackBody: this.transferCallBody(callbackBody)
             };
-            new Oss(res.ossConfig).multipartUpload(remoteName, file, {
+
+            let newOss = {
+                ...res.ossConfig,
+                refreshSTSToken: async () => {
+                    // 向您搭建的STS服务获取临时访问凭证。
+                    return {
+                        accessKeyId: res.ossConfig.accessKeyId, // 自己账户的accessKeyId或临时秘钥
+                        accessKeySecret: res.ossConfig.accessKeySecret, // 自己账户的accessKeySecret或临时秘钥
+                        stsToken: res.ossConfig.stsToken //  从STS服务获取的安全令牌（SecurityToken）。
+                    };
+                },
+                // 刷新临时访问凭证的时间间隔，单位为毫秒。
+                refreshSTSTokenInterval: 3600 * 1000
+            };
+
+            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/DshCheckbox.vue

@@ -43,7 +43,6 @@
                     <div
                         v-else
                         class="dsh-subtip"
-                        style="backgroundColor: #f3f3f3;"
                     >-- 无选择项 --</div>
                 </CheckboxGroup>
             </template>

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

@@ -33,7 +33,6 @@
                     <div
                         v-else
                         class="dsh-subtip"
-                        style="backgroundColor: #f3f3f3;"
                     >-- 无选择项 --</div>
                 </RadioGroup>
 

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

@@ -5,9 +5,9 @@
             v-if="isUnitShow"
             class="cascaderTable-unit"
         >
-            <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
+            <dsh-icons :list="$getOperationList(['canLink'])"></dsh-icons>
             <span class="cascaderTable-unit-text">
-                {{ value[controlKey] && value[controlKey].tree.length || 0 }}行
+                {{ curVal && curVal.tree.length }}行
             </span>
         </span>
 
@@ -18,7 +18,7 @@
                     :canEdit="finalCanEdit"
                     :treeColumns="treeColumns"
                     :subColumns="subColumns"
-                    :data="value[controlKey]"
+                    :data="curVal"
                     :propsObj="propsObj"
                     @change="change"
                 ></dsh-cascader-table>
@@ -39,7 +39,7 @@
                     :canEdit="finalCanEdit"
                     :treeColumns="treeColumns"
                     :subColumns="subColumns"
-                    :data="value[controlKey]"
+                    :data="curVal"
                     :propsObj="propsObj"
                     @change="change"
                 ></dsh-cascader-table>
@@ -51,12 +51,12 @@
                     :propsObj="modalPropsObj"
                 >
                     <dsh-cascader-table
-                        v-if="value[controlKey] && isEnlarge"
+                        v-if="curVal && isEnlarge"
                         useCol
                         :canEdit="finalCanEdit"
                         :treeColumns="treeColumns"
                         :subColumns="subColumns"
-                        :data="value[controlKey]"
+                        :data="curVal"
                         :propsObj="propsObj"
                         @change="change"
                     ></dsh-cascader-table>
@@ -68,13 +68,18 @@
 
 <script>
     import controlMixin from "../controlMixin.js";
+    import DshBtnModal from "../../small/DshBtnModal.vue";
+    import DshCascaderTable from "../../list/DshCascaderTable.vue";
 
     export default {
         name: "cascaderTable",
         mixins: [
             controlMixin
         ],
-        components: {},
+        components: {
+            DshBtnModal,
+            DshCascaderTable
+        },
         props: {},
         data () {
             return {
@@ -97,16 +102,17 @@
                         btnType: "text",
                         event: "clickEnlarge"
                     },
-                    link: {
+                    canLink: {
                         customIcon: "bico-Cascadetable"
                     }
                 }
             };
         },
         computed: {
+            // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
             treeColumns () {
-                return this.value[this.controlKey] && this.value[this.controlKey]._treeForm
-                    ? this.value[this.controlKey]._treeForm
+                return this.curVal && this.curVal._treeForm
+                    ? this.curVal._treeForm
                     : this.propsObj._treeForm;
             },
             subColumns () {

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

@@ -9,7 +9,7 @@
                 customIcon: 'bico-internaltable'
             }]"></dsh-icons>
             <span class="flatTable-unit-text">
-                {{ val.list.length }}行
+                {{ curVal.list.length }}行
             </span>
         </span>
 
@@ -19,8 +19,8 @@
                 <bri-flat-table
                     :canEdit="finalCanEdit"
                     :columns="columns"
-                    :data="val.list"
-                    :rowDefault="val.rowDefault"
+                    :data="curVal.list"
+                    :rowDefault="curVal.rowDefault"
                     :outObj="value"
                     :propsObj="propsObj"
                     @change="change"
@@ -41,9 +41,9 @@
                     ref="dshFatTable"
                     :canEdit="finalCanEdit"
                     :columns="columns"
-                    :data="val.list"
-                    :oldData="val.oldList"
-                    :rowDefault="val.rowDefault"
+                    :data="curVal.list"
+                    :oldData="curVal.oldList"
+                    :rowDefault="curVal.rowDefault"
                     :outObj="value"
                     :propsObj="propsObj"
                     @change="change"
@@ -56,12 +56,12 @@
                     :propsObj="modalPropsObj"
                 >
                     <bri-flat-table
-                        v-if="value[controlKey] && isEnlarge"
+                        v-if="isEnlarge"
                         :canEdit="finalCanEdit"
                         :columns="columns"
-                        :data="val.list"
-                        :oldData="val.oldList"
-                        :rowDefault="val.rowDefault"
+                        :data="curVal.list"
+                        :oldData="curVal.oldList"
+                        :rowDefault="curVal.rowDefault"
                         :outObj="value"
                         :propsObj="propsObj"
                         @change="change"
@@ -74,13 +74,18 @@
 
 <script>
     import controlMixin from "../controlMixin.js";
+    import DshBtnModal from "../../small/DshBtnModal.vue";
+    import BriFlatTable from "../../list/BriFlatTable.vue";
 
     export default {
         name: "flatTable",
         mixins: [
             controlMixin
         ],
-        components: {},
+        components: {
+            DshBtnModal,
+            BriFlatTable
+        },
         props: {},
         data () {
             return {
@@ -99,7 +104,7 @@
             };
         },
         computed: {
-            val () {
+            curVal () {
                 // TODO: 待定处理
                 return this.value[this.controlKey] || {
                     list: [],

package/src/components/list/BriTable.vue

@@ -34,14 +34,11 @@
         ></ve-table>
 
         <!-- loading -->
-        <bri-loading v-if="isLoading" />
-        <!-- empty -->
-        <div
-            v-else-if="!data.length"
+        <bri-loading
             class="bri-table-empty"
-        >
-            <slot name="empty">{{ noDataText }}</slot>
-        </div>
+            :value="isLoading ? 1 : data.length? 0 : 2"
+            :noText="noDataText"
+         />
     </div>
 </template>
 
@@ -75,6 +72,7 @@
                     rowKeyFieldName: "_id",
                     scrollWidth: "0",
                     borderY: true,
+                    fixedHeader: true,
                     cellSelectionOption: {
                         enable: false
                     },

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

@@ -66,8 +66,8 @@
                             .split("/")
                             .map(item => item.length * (operationItem.size === "small" ? 12 : 14))
                     ) + (
-                        operationItem.icon || operationItem.customIcon ? 20 : 0) + (
-                            operationItem.size === "small" ? 8 : 16); // 按钮的padding,故意多了2px保留余地
+                        operationItem.icon || operationItem.customIcon ? 25 : 0
+                    );
                 };
 
                 return this.operationList.map(operationItem => {
@@ -126,8 +126,8 @@
                                             // 漏在外部按钮的宽度
                                             this.selfOperationList
                                                 .slice(0, this.selfOperationList.length > maxBtnNum ? maxBtnNum - 1 : this.selfOperationList.length)
-                                                .reduce((total, operationItem) => total + operationItem.width, 0) +
-                                                (this.selfOperationList.length > maxBtnNum ? 70 : 0) + // 出现更多按钮的宽度
+                                                .reduce((total, operationItem) => total + operationItem.width + 16, 0) +
+                                                (this.selfOperationList.length > maxBtnNum ? 69 : 0) + // 出现更多按钮的宽度
                                                 (this.selfOperationList.length > 0 ? 40 : 0) + // 操作列的padding
                                                 4 // 留出4px空间，避免麻烦问题
                                             , 80
@@ -147,6 +147,7 @@
                                             // TODO: 注意此处totalOperationList用的一定是表格行显示最多的操作按钮数组，有改动注意看此备注！！！
                                             return h("dsh-buttons", {
                                                 props: {
+                                                    class: "table-operation",
                                                     list: totalOperationList,
                                                     maxFlatNum: maxBtnNum - 1,
                                                     itemClass: "table-operation-btn"

package/src/components/unit/DshFormItem.vue

@@ -137,7 +137,9 @@
             formControlClass: String
         },
         data () {
-            return {};
+            return {
+                showTipModal: false // tipsRender使用，不可删除
+            };
         },
         computed: {},
         created () {},

package/src/index.js

@@ -11,11 +11,10 @@ import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
-
-import BriFlatTable from "./components/list/BriFlatTable.vue";
 import BriTable from "./components/list/BriTable.vue";
-import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 import DshPage from "./components/list/DshPage.vue";
+import BriFlatTable from "./components/list/BriFlatTable.vue";
+// import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 
 // form
 import DshForm from "./components/form/DshForm.vue";
@@ -34,22 +33,15 @@ import DshCheckbox from "./components/controls/base/DshCheckbox.vue";
 import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue";
 
 // other
-import BriCode from "./components/other/BriCode.vue";
 import BriLoading from "./components/other/BriLoading.vue";
+import BriSvg from "./components/other/BriSvg.vue";
 import DshAvatar from "./components/other/DshAvatar.vue";
-import DshBtnModal from "./components/other/DshBtnModal.vue";
-import DshColorPanel from "./components/other/DshColorPanel.vue";
-import DshEditPanel from "./components/other/DshEditPanel.vue";
-import DshMenu from "./components/other/DshMenu.vue";
-import DshMenuNav from "./components/other/DshMenuNav.vue";
 
 // small
 import BriButton from "./components/small/BriButton.vue";
 import BriDrawer from "./components/small/BriDrawer.vue";
 import BriTooltip from "./components/small/BriTooltip.vue";
 import DshButtons from "./components/small/DshButtons.vue";
-import DshCrumbs from "./components/small/DshCrumbs.vue";
-import DshCrumbsItem from "./components/small/DshCrumbsItem.vue";
 import DshDropdown from "./components/small/DshDropdown.vue";
 import DshIcons from "./components/small/DshIcons.vue";
 import DshModal from "./components/small/DshModal.vue";
@@ -91,9 +83,15 @@ import DshBack from "./components/controls/special/DshBack.vue";
 import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 
 // other
+import DshMenuNav from "./components/other/DshMenuNav.vue";
+import BriCode from "./components/other/BriCode.vue";
 import BriCollapseTree from "./components/other/BriCollapseTree.vue";
 import BriGantt from "./components/other/BriGantt.vue";
 import BriIframe from "./components/other/BriIframe.vue";
+import DshColorPanel from "./components/other/DshColorPanel.vue";
+
+// small
+import DshBtnModal from "./components/small/DshBtnModal.vue";
 
 // ！！！！！！挂载全局的组件，不是别写在这
 const map = {
@@ -104,10 +102,7 @@ const map = {
     DshBox,
     DshTable,
     DshList,
-
-    BriFlatTable, // 可取消全局
     BriTable,
-    DshCascaderTable, // 可取消全局
     DshPage,
 
     // form
@@ -129,19 +124,12 @@ const map = {
     // other
     BriLoading,
     DshAvatar,
-    DshBtnModal,
-    DshEditPanel,
-    DshColorPanel,
-    DshMenu,
-    DshMenuNav,
 
     // small
     BriButton,
     BriDrawer,
     BriTooltip,
     DshButtons,
-    DshCrumbs,
-    DshCrumbsItem,
     DshDropdown,
     DshIcons,
     DshModal,
@@ -193,14 +181,14 @@ export {
     DshBox,
     DshTable,
     DshList,
+    BriTable,
+    DshPage,
+    BriFlatTable,
+    // DshCascaderTable,
 
     BriCard,
-    BriFlatTable,
-    BriTable,
     BriTree,
     BriTreeItem,
-    DshCascaderTable,
-    DshPage,
 
     // form
     DshForm,
@@ -234,26 +222,22 @@ export {
     selectDepartments,
 
     // other
-    BriCode,
     BriLoading,
+    BriSvg,
     DshAvatar,
-    DshBtnModal,
-    DshColorPanel,
-    DshEditPanel,
-    DshMenu,
-    DshMenuNav,
 
+    DshMenuNav,
+    BriCode,
     BriCollapseTree,
     BriGantt,
     BriIframe,
+    DshColorPanel,
 
     // small
     BriButton,
     BriDrawer,
     DshButtons,
     BriTooltip,
-    DshCrumbs,
-    DshCrumbsItem,
     DshDropdown,
     DshIcons,
     DshModal,
@@ -262,5 +246,7 @@ export {
     DshTags,
     DshTitle,
     DshRender,
-    DshTdRender
+    DshTdRender,
+
+    DshBtnModal
 };

package/src/styles/common/text.less

@@ -18,11 +18,10 @@
 }
 .dsh-subtip {
     width: 100%;
-    // padding: 10px 5px;
     text-align: center;
     font-size: 12px;
     font-weight: 500;
-    color: @textColor;
+    color: @placeholderColor;
     // background-color: #f3f3f3;
 }
 // 出现三个点

package/src/styles/components/controls/base/DshCascader/DshCascader.less

@@ -2,19 +2,19 @@
     width: 100%;
 
     &-edit {
+
         // 多选
         &-multiple {
             width: 100%;
-            
-            &-edit {
 
-            }
+            &-edit {}
         }
 
         // 单选 -新模式
         &-custom {
             width: 100%;
         }
+
         // 单选 -默认模式
         &-single {
             width: 100%;
@@ -23,22 +23,18 @@
 
     // 查看
     &-show {
-        &-multiple {
-            
-        }
+        &-multiple {}
 
-        &-single {
-
-        }
+        &-single {}
     }
 
     // 多选类型且独自一行时
     &-row {
-        &-edit {
+        &-edit {}
 
-        }
         &-show {
             height: auto;
+
             .text,
             .overflow {
                 width: 100%;
@@ -66,7 +62,6 @@
         .ivu-cascader-menu {
             max-height: 400px;
             height: auto;
-            max-width: 300px;
         }
     }
 }

package/src/styles/components/controls/base/DshCheckbox.less

@@ -11,7 +11,6 @@
 
         &-color {
             .ivu-checkbox-border {
-                margin-bottom: 5px;
                 margin-right: 16px;
                 height: 32px;
                 border: none;
@@ -75,19 +74,15 @@
         }
     }
 
-    &-item {
+    &-item {}
 
-    }
-
-    &-show {
-
-    }
+    &-show {}
 
     .ivu-select-multiple {
         .ivu-select-selection {
             height: 32px;
             .dsh-flex-row-between-center();
-            
+
             & > div {
                 width: 100%;
                 height: 100%;