cnhis-design-vue 2.1.110 → 2.1.111

package/package.json

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

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

@@ -1465,8 +1465,8 @@ export default create({
         let filterField = item?.fieldSetting?.mapping?.type === 'manual' && item.isMerge != 1 && item.notParticipatingSearch != 1;
         // 是否排序 1 不可排序
         let notParticipatingSort = item?.fieldSetting?.notParticipatingSort || '';
-        // 有子列表fixed会遮盖 所以主表不设置fixed
-        let fixed = this.isAboutNestTable ? '' : item.isFixed ? (item.isFixed == 1 ? 'left' : 'right') : '';
+        // 有子列表fixed会遮盖 所以主表不设置fixed,子表可设置
+        let fixed = this.isAboutNestTable && !this.isNestTable  ? '' : item.isFixed ? (item.isFixed == 1 ? 'left' : 'right') : '';
         let sortable = this.isTableEdit ? false : this.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
         let treeNode = this.isNestTable ? false : this.isTree != 0 ? index === 0 : false;
         let type = index === 0 && this.showNestTable ? 'expand' : '';

package/packages/fabric-chart/src/FabricChart.vue

@@ -98,8 +98,8 @@ export default create({
         case 'increasePointBatch':
           this.$emit('increasePointBatch', value);
           break;
-        case 'set':
-          this.$emit('setPoint', value);
+        default:
+          this.$emit('operate', type, value);
           break;
       }
     },

package/packages/fabric-chart/src/fabric-chart/FabricCanvas.vue

@@ -235,7 +235,7 @@ export default {
       return this.templateData.table?.eventStyle || { selectable: true, evented: true };
     },
     operable() {
-      return this.templateData.table?.operable || { set: false, connect: false, lockMovementX: false };
+      return this.templateData.table?.operable || { set: false, detail: false, connect: false, lockMovementX: false };
     },
     fabricLinesInstances() {
       return this.$slots.default.find(VNode => /fabric-lines/.test(VNode.tag))?.componentInstance;

package/packages/fabric-chart/src/fabric-chart/FabricPolylines.vue

@@ -47,7 +47,8 @@ const isEffectiveNode = node => {
 };
 const rightClickNode = [
   { name: '新增节点', type: 'add' },
-  { name: '检测项设置', type: 'set' },
+  { name: '监测项设置', type: 'set' },
+  { name: '体征数据详情', type: 'detail' },
   { name: '删除节点', type: 'delete' }
 ];
 const rightClickNodeConnect = [
@@ -1165,10 +1166,11 @@ export default {
       const target = this.activeEvent.target;
       const id = target?.id || '';
       this.$nextTick(() => {
+        const { operable } = this.propItems;
         if (id && id.includes('_polylinePoint_')) {
           this._currentPoint = target;
           let nodeConnect = [];
-          if (this.propItems.operable.connect) {
+          if (operable.connect) {
             if (!target.line2 && target.nextPoint) {
               nodeConnect = rightClickNodeConnect.slice(0, 1);
             }
@@ -1187,9 +1189,15 @@ export default {
           );
           this.isRightVisible = true;
         } else if (!id) {
-          const { operable } = this.propItems;
           this._currentPoint = null;
-          this.rightClickNode = Object.freeze(operable.set ? rightClickNode.slice(0, 2) : rightClickNode.slice(0, 1));
+          this.rightClickNode = rightClickNode.slice(0, 1);
+
+          ['set', 'detail'].forEach(key => {
+            if (operable[key]) {
+              const item = rightClickNode.find(node => node.type === key);
+              this.rightClickNode.push(item);
+            }
+          });
           this.isRightVisible = true;
         }
       });

package/packages/select-person/select-person.vue

@@ -893,6 +893,7 @@ export default create({
         this.checkedKeys.temp = [];
         this.autoExpandParent = true;
       }
+      this.indeterminate = false;
     },
 
     checkAllSearchTree(type) {
@@ -1501,7 +1502,7 @@ export default create({
       }
     },
     handleData() {
-      this.useData = vexutils.clone(this.data, true)
+      this.useData = vexutils.clone(this.data, true);
       vexutils.searchTree(this.useData, item => {
         if (this.titleAddCode && item.code) {
           item.title = `${item.title}(${item.code})`;
@@ -1513,7 +1514,7 @@ export default create({
 </script>
 <style lang="less" scoped>
 @primary-color: #2563f4;
-.people-tree {
+/deep/.people-tree {
   display: flex;
   .people-tree-item {
     flex-shrink: 0;
@@ -1526,6 +1527,10 @@ export default create({
       display: flex;
       flex-direction: column;
     }
+    .ant-checkbox-indeterminate .ant-checkbox-inner {
+      background-color: #fff !important;
+      border-color: #d9d9d9 !important;
+    }
     /deep/ .person-search {
       // .ant-input-affix-wrapper .ant-input:not(:last-child),
       // .ant-input-affix-wrapper .ant-input:not(:first-child) {

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -827,7 +827,7 @@ export default create({
           return item.formTitle || item.alias || item.title;
         })
         .filter(Boolean);
-      if (!strList?.length) return '';
+      if (!strList?.length) return '请输入关键字搜索';
       str = '输入' + strList.join('/');
       return str || '请输入关键字搜索';
     },

package/packages/table-filter/src/components/search-condition/SearchCondition.vue

@@ -13,11 +13,12 @@
           class="edit-tag"
           v-for="(item, index) in parentNames"
           :key="index"
-          @dblclick="e => editParentName(e, item)"
+          @dblclick="e => editParentName(e, item, index)"
           @click="handleParentNameSelect(item, index)"
           :class="{ 'edit-tag-select': item.selected && item.disabled }"
         >
-          <a-input style="width: 100px" :value="item" :disabled="item.disabled" @blur="() => (item.disabled = true)" v-model="item.value" :maxLength="10" />
+          <a-input :ref="`${item.value}-${index}`" style="width: 100px" :value="item" :disabled="item.disabled" @blur="() => (item.disabled = true)" v-model="item.value" :maxLength="10" />
+          <div v-if="item.disabled" class="disabled-mask" @click="maskClick"></div>
           <a-icon slot="suffix" type="close" @click="handleParentNamesRemove(index, item)" />
         </div>
         <template v-if="!parentNamesHasAdd">
@@ -1460,10 +1461,13 @@ export default create({
       });
       this.addVal = '';
     },
-    editParentName(e, item) {
+    editParentName(e, item, index) {
       item.disabled = false;
+      let inputRef = `${item.value}-${index}`
+      let inputDom = this.$refs[inputRef]?.[0]
+      if(!inputDom) return;
       setTimeout(() => {
-        e.target.focus();
+        inputDom.focus();
       }, 0);
     },
     handleParentNameSelect(item, index) {
@@ -1475,6 +1479,7 @@ export default create({
       });
       item.selected = !item.selected;
     },
+    maskClick() {},
     handleParentNamesRemove(index, item) {
       // this.parentNames.splice(index, 1);
       this.handleParent(index, item);
@@ -1710,11 +1715,21 @@ export default create({
       position: relative;
       margin-right: 10px;
       margin-bottom: 10px;
+      .disabled-mask {
+        position: absolute;
+        right: 0;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        border-radius: 4px;
+      }
+
       /deep/ .anticon-close {
         position: absolute;
         right: 5px;
         line-height: 36px;
         color: #2d7aff;
+        font-size: 12px;
       }
       /deep/ .ant-input-disabled {
         color: #2d7aff;