cnhis-design-vue 2.1.87 → 2.1.89

package/es/tag/index.js

@@ -1083,7 +1083,7 @@ var create = __webpack_require__("8aef");
   name: 'checkable-tag',
   extends: tag_default.a.CheckableTag
 }));
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4913fd5d-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/tag/src/TagGroup.vue?vue&type=template&id=6159c636&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5221e509-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/tag/src/TagGroup.vue?vue&type=template&id=6159c636&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"label-wrap"},[_c('div',{staticClass:"left-label-wrap"},[_c('c-tabs',{class:['self-tabs', ("self-tabs-" + _vm.color)],attrs:{"hideAdd":"","activeKey":_vm.labelAnchorKey,"tab-position":"left"},on:{"change":_vm.labelAnchorTabsOnChange}},[_vm._l((_vm.labelList),function(v){return [_c('c-tab-pane',{key:v.curKey},[_c('span',{attrs:{"slot":"tab"},slot:"tab"},[_vm._v(" "+_vm._s(v.title)+" ")])])]})],2)],1),_c('div',{staticClass:"right-label-wrap"},[_c('a-anchor',{directives:[{name:"show",rawName:"v-show",value:(false),expression:"false"}],attrs:{"getContainer":_vm.anchorGetContainer},on:{"click":_vm.handleAnchorClick,"change":_vm.anchorOnChange}},[_vm._l((_vm.labelList),function(v,i){return [_c('a-anchor-link',{key:v.curKey,attrs:{"href":("#" + (v.curKey)),"title":i}})]})],2),_vm._l((_vm.labelList),function(v,k){return _c('div',{key:k,staticClass:"edit-label-content"},[_c('div',{staticClass:"edit-label",attrs:{"id":v.curKey}},[_vm._v(" "+_vm._s(v.title)+" "),_c('span',{staticClass:"edit-label-type"},[_vm._v("("+_vm._s(v.multipleChoice == 2 ? "单" : "多")+"选)")])]),_c('div',{staticClass:"edit-content"},[(!v.itemList)?_c('div',{staticClass:"label-disable-wrap"},[_c('p',{staticClass:"label-disable-title"},[_vm._v("无可选标签")]),_c('p',{staticClass:"label-disable-desc"},[_vm._v("请联系管理员进行标签管理设置")])]):_c('div',{staticClass:"label-content"},[_vm._l((v.itemList),function(item){return _c('a-checkable-tag',{key:item.labelId,class:[{ 'sys-label-tag': item.isPublic && item.isPublic == 1 }, ("label-tag-" + _vm.color)],on:{"change":function($event){return _vm.handleLabelChange($event, item, v, v.curKey)}},model:{value:(item.isSelect),callback:function ($$v) {_vm.$set(item, "isSelect", $$v)},expression:"item.isSelect"}},[_c('a-tooltip',{attrs:{"placement":"topLeft"}},[_c('template',{slot:"title"},[_c('span',[_vm._v(_vm._s(item.labelName))])]),_vm._v(" "+_vm._s(item.labelName)+" ")],2),_c('a-icon',{directives:[{name:"show",rawName:"v-show",value:(!(item.isPublic && item.isPublic == 1)),expression:"!(item.isPublic && item.isPublic == 1)"}],staticClass:"label-close",attrs:{"type":"close"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handleDelLabel(item, v)}}})],1)}),(_vm.isEdit && !v.isNoAdd)?_c('a-button',{directives:[{name:"show",rawName:"v-show",value:(!v.showAdd),expression:"!v.showAdd"}],class:['label-add', ("label-tag-" + _vm.color)],attrs:{"type":"dashed"},on:{"click":function($event){return _vm.handleAddLabel($event, v)}}},[_c('a-icon',{attrs:{"type":"plus"}}),_vm._v(" 标签 ")],1):_vm._e(),(_vm.isEdit && !v.isNoAdd)?_c('a-input',{directives:[{name:"show",rawName:"v-show",value:(v.showAdd),expression:"v.showAdd"}],class:['label-add', 'add-input', ("label-tag-" + _vm.color)],on:{"blur":function($event){return _vm.hanldeBlur($event, v, v.curKey)}},model:{value:(v.addVal),callback:function ($$v) {_vm.$set(v, "addVal", (typeof $$v === 'string'? $$v.trim(): $$v))},expression:"v.addVal"}},[_c('a-icon',{attrs:{"slot":"suffix","type":"close"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.clearaddVal($event, v)}},slot:"suffix"})],1):_vm._e()],2)])])})],2)])}
 var staticRenderFns = []
 

package/es/verification-code/index.js

@@ -801,7 +801,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4913fd5d-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/verification-code.vue?vue&type=template&id=39c11d42&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5221e509-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/verification-code.vue?vue&type=template&id=39c11d42&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"verification-code-container"},[_c('a-input',_vm._g(_vm._b({on:{"change":_vm.verifyCodeChange},model:{value:(_vm.verifyCode),callback:function ($$v) {_vm.verifyCode=$$v},expression:"verifyCode"}},'a-input',_vm.$attrs,false),_vm.$listeners),[_c('template',{slot:"addonAfter"},[_c('span',{staticClass:"captcha-wrap"},[_c('span',{class:['get-code', { disabled: _vm.count }],on:{"click":_vm.sendVerify}},[_vm._v(" "+_vm._s(_vm.getText)+" ")])])])],2)],1)}
 var staticRenderFns = []
 
@@ -967,7 +967,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var verification_code = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4913fd5d-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/SlideVerify.vue?vue&type=template&id=738bb298&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5221e509-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/SlideVerify.vue?vue&type=template&id=738bb298&scoped=true&
 var SlideVerifyvue_type_template_id_738bb298_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"slide"},[(_vm.title)?_c('div',{staticClass:"verify-title"},[_c('span',[_vm._v(_vm._s(_vm.title))]),_c('div',{staticClass:"right-icon",on:{"click":_vm.cancelVerify}},[_c('a-icon',{attrs:{"type":"close"}})],1)]):_vm._e(),_c('div',{staticClass:"verify-div"},[_c('div',{staticClass:"verify-container"},[_c('div',{staticClass:"slide-verify"},[_c('div',{staticClass:"bg-wrap"},[_c('img',{staticClass:"bg-img",style:(_vm.resourceStyle),attrs:{"src":_vm.resource.resourceImg,"alt":""}})]),_c('a-icon',{staticClass:"slide-verify-refresh-icon",attrs:{"type":"redo"},on:{"click":_vm.refresh}}),_c('img',{ref:"block",staticClass:"slide-verify-block",style:(_vm.puzzleStyle),attrs:{"src":_vm.resource.puzzleImg,"draggable":"false"},on:{"mousedown":_vm.sliderDown}}),_c('div',{staticClass:"slide-verify-slider",class:{
             'container-active': _vm.containerActive,
             'container-success': _vm.containerSuccess,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.87",
+  "version": "2.1.89",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -317,20 +317,22 @@ export default create({
       switch (Number(this.isTree)) {
         case 1:
         case 3:
+          // 同步树
           result = {
             children: 'childrenList',
             accordion: this.openOnly > 0,
             reserve: true
           };
           break;
-        case 2:
+        case 2:// 异步树
           result = {
             lazy: true,
             reserve: true,
             children: 'childrenList',
             hasChild: 'hasChildren',
             loadMethod: this.loadChildrenMethod,
-            accordion: this.openOnly > 0
+            accordion: this.openOnly > 0,
+            iconLoaded: 'iconfont icon-loading roll'
           };
           break;
         default:
@@ -2390,8 +2392,12 @@ export default create({
       let newRow = [];
       if (this.isTree != 0) {
         // 点击树形表格的按钮 不需要触发选中行
-        let { className } = $event.target || {};
+        let { className, parentElement } = $event.target || {};
         if (className && className.includes('vxe-tree--node-btn')) return;
+        // 点击父级箭头和文字，都能触发展开子节点 已经展开父级，只能点击小箭头进行收起
+        if(parentElement?.className && parentElement.className.includes('vxe-tree-cell')) {
+          this.toggleCellTreeExpand(data, table)
+        }
         // // 树表格 无法选中有子集的行
         // if (row.hasChildren) {
         //   table.setAllCheckboxRow(false);
@@ -2933,6 +2939,13 @@ export default create({
           });
       }
     },
+    toggleCellTreeExpand(data, table){
+      const {row} = data;
+      if(!row.hasChildren) return;
+      let isTreeExpandByRow = table.isTreeExpandByRow(row);
+      if(isTreeExpandByRow) return;
+      table.setTreeExpand(row, true)  
+    },
     // 懒加载树子节点
     loadChildrenMethod({ row }) {
       // vxe-table v2.x 未根据 checkMethod 禁用逻辑 直接根据父级决定子级checked状态

package/packages/big-table/src/assets/iconfont/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
-  font-family: "iconfont"; /* Project id  */
-  src: url('iconfont.ttf?t=1631151904509') format('truetype');
+  font-family: "iconfont"; /* Project id 4141620 */
+  src:url('iconfont.ttf?t=1687921861098') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-loading:before {
+  content: "\e689";
+}
+
 .icon-a-xitongtubiaotianjia:before {
   content: "\e9c3";
 }

package/packages/big-table/src/assets/style/table-base.less

@@ -252,6 +252,25 @@ body {
         display: none;
       }
     }
+    .vxe-tree--node-btn.icon-loading {
+      font-size: 14px;
+      width: 14px;
+      height: 14px;
+      color: #000;
+      line-height: 1;
+      &.roll {
+        animation: rollCircle 1s infinite linear;
+        transform-origin: center center;
+      }
+    }
+    @keyframes rollCircle {
+      0% {
+        transform: rotate(0deg);
+      }
+      100% {
+        transform: rotate(360deg);
+      }
+    }
   }
   /deep/ .filter-box {
     display: flex;