cnhis-design-vue 2.1.40 → 2.1.42

package/packages/select/src/Select/Select.vue

@@ -0,0 +1,231 @@
+<template>
+  <a-select ref="selectRef" v-bind="$attrs" v-on="$listeners" class="c-select" @deselect="onDeselect">
+    <template v-for="(i, name) in $slots" :slot="name">
+      <slot :name="name" />
+    </template>
+    <template #removeIcon v-if="!$slots.removeIcon">
+      <section class="c-select__tagIcons" v-check="{ options: [], editable: createdTagEditable }">
+        <a-icon type="edit" @click="edit" />
+        <a-icon type="close" />
+      </section>
+    </template>
+  </a-select>
+</template>
+
+<script>
+import { Icon, Select } from 'ant-design-vue';
+
+function isObject(target) {
+  return target !== null && typeof target === 'object';
+}
+
+function isString(target) {
+  return typeof target === 'string';
+}
+
+/**
+ * @param {string} target
+ * @param {string[]}matchers
+ * @returns {boolean}
+ */
+function includesList(target, matchers) {
+  return matchers.some(matcher => target.includes(matcher));
+}
+
+/**
+ * @param {HTMLElement} el
+ * @returns {null|HTMLElement}
+ */
+function findAncestorTag(el) {
+  let result = null;
+  let current = el.parentNode;
+  while (current) {
+    if (current.classList.contains('ant-select-selection__choice')) {
+      result = current;
+      break;
+    }
+    current = current.parentNode;
+  }
+  return result;
+}
+
+/**
+ * @param {HTMLElement} el
+ * @param {Array<Record<string,any>>} value
+ */
+function checkEditIcon(el, { value: { options, editable } }) {
+  if (!editable || !Array.isArray(options)) return;
+
+  const parentTag = findAncestorTag(el);
+
+  if (!parentTag) return;
+
+  if (notEditable()) {
+    parentTag.classList.remove('c-select--showEditIcon');
+  } else {
+    parentTag.classList.add('c-select--showEditIcon');
+  }
+
+  function notEditable() {
+    return false;
+    // return options.find(option => option.label === parentTag.innerText) || parentTag.querySelector('[uni-flag]');
+  }
+}
+
+export default {
+  model: { prop: 'value', event: 'change' },
+  directives: {
+    check: {
+      inserted: checkEditIcon,
+      update: checkEditIcon
+    }
+  },
+  props: {
+    createdTagEditable: { type: Boolean, default: false }
+  },
+  data() {
+    return {
+      isEdit: false
+    };
+  },
+  components: {
+    ASelect: Select,
+    AIcon: Icon
+  },
+  methods: {
+    edit() {
+      this.isEdit = true;
+    },
+    /**
+     * @param {string} value
+     */
+    onDeselect(value) {
+      if (!this.createdTagEditable) return;
+      try {
+        if (
+          // this.normalizedOptions().find(option => option.value === value)
+          !this.isEdit ||
+          !this.$el
+        )
+          return;
+
+        const inputELe = this.$el.querySelector('.ant-select-search__field');
+        if (!inputELe) return;
+
+        inputELe.value = value;
+        inputELe.dispatchEvent(new CustomEvent('input'));
+        inputELe.focus();
+      } finally {
+        this.isEdit = false;
+      }
+    },
+    /**
+     * @returns {Array<Record<string,string>>}
+     */
+    normalizedOptions() {
+      if (!this.createdTagEditable) return [];
+
+      if (Array.isArray(this.$attrs.options)) {
+        return this.$attrs.options;
+      }
+
+      if (!Array.isArray(this.$slots.default)) return [];
+
+      function traverse(optionVNodes, result = []) {
+        optionVNodes.forEach(node => {
+          if (!isObject(node) || !isString(node.tag)) return;
+
+          if (includesList(node.tag, ['select-option', 'SelectOption'])) {
+            return result.push(getOptionInfo(node));
+          }
+
+          if (includesList(node.tag, ['select-opt-group', 'SelectOptGroup'])) {
+            traverse(node.componentOptions?.children ?? [], result);
+          }
+        });
+        return result;
+      }
+
+      /**
+       * @param {VNode} node
+       * @returns {Record<string,string>}
+       */
+      function getOptionInfo(node) {
+        const value = node.componentOptions?.propsData?.value ?? node.key;
+        bindUniFlag(node);
+        return { value, label: findNodeLabel(node) };
+      }
+
+      const { $createElement } = this;
+
+      function bindUniFlag(node) {
+        if (Array.isArray(node.componentOptions?.children)) {
+          node.componentOptions.children = [
+            $createElement(
+              'div',
+              {
+                attrs: { 'uni-flag': '' }
+              },
+              node.componentOptions.children
+            )
+          ];
+        }
+      }
+
+      const optionLabelProp = this.$attrs.optionLabelProp ?? this.$attrs['option-label-prop'];
+
+      function findNodeLabel(node) {
+        if (isString(optionLabelProp)) {
+          if (optionLabelProp === 'label') {
+            return node.componentOptions?.propsData.label;
+          } else {
+            return node.data?.attrs?.[optionLabelProp];
+          }
+        }
+        return '';
+      }
+
+      return traverse(this.$slots.default);
+    }
+  }
+};
+</script>
+
+<style lang="less">
+.c-select {
+  .ant-select-selection__choice {
+    &__remove {
+      display: inline-flex;
+      align-items: center;
+      height: 100%;
+    }
+  }
+
+  .anticon-edit {
+    display: none;
+  }
+
+  .c-select--showEditIcon {
+    padding-right: 40px;
+
+    .anticon-edit {
+      display: inline;
+    }
+  }
+
+  &__tagIcons {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .anticon {
+      color: rgba(0, 0, 0, 0.45) !important;
+
+      &:hover {
+        color: rgba(0, 0, 0, 0.75) !important;
+      }
+    }
+  }
+}
+</style>

package/packages/select/src/{Select.jsx → Select/index.js}

@@ -3,8 +3,9 @@
  * @desc 全继承antd组件，后期再扩展
  * @time 2021-05-13
  */
-import { Select } from 'ant-design-vue';
+import Select from './Select.vue';
 import create from '@/core/create';
+
 export default create({
   name: 'select',
   extends: Select

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

@@ -116,6 +116,16 @@
             </a-button>
           </li>
 
+          <!-- 批量选择 -->
+          <li v-if="isCard">
+            <a-button v-if="isCardNewBatch" type="primary" @click="() =>changeCardNewBatch(false)" style="margin: 0 8px 8px 0">
+              取消批量选择
+            </a-button>
+            <a-button v-else type="primary" @click="() =>changeCardNewBatch(true)" style="margin: 0 8px 8px 0">
+              批量选择
+            </a-button>
+          </li>
+
           <!-- 平铺列表 tree -->
           <template v-if="showRelatedTreeBtn">
             <li v-if="showRelatedSearch" :class="[isRelatedSearchFold ? 'related-search-input' : 'related-search-input-expand']">
@@ -580,7 +590,9 @@ export default create({
     preventReTime: {
       type: Number,
       default: 1000
-    }
+    },
+    isCardNewBatch: {type: Boolean, deafult: false},
+    isBatchSelect: {type: [Number, Boolean, String], default: ''}
   },
   components: {
     [Button.name]: Button,
@@ -786,6 +798,9 @@ export default create({
     },
     showBaseTabs() {
       return this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing;
+    },
+    isCard() {
+      return this.TypeOfDisplay === 'cardNew' && this.isBatchSelect == 1
     }
   },
   data() {
@@ -1292,7 +1307,7 @@ export default create({
       if (!showButtonTop) return false;
 
       list.forEach(item => {
-        let relationBtnId = JSON.parse(item.setting).relationBtnId;
+        let relationBtnId = item.setting && JSON.parse(item.setting)?.relationBtnId;
         if (item.type === 'BATCH' && relationBtnId) {
           this.relationBtnBatchBtnIds.push(item.id);
           this.batchRelationBtnIds.push(relationBtnId);
@@ -1414,9 +1429,24 @@ export default create({
       //     }
       //   });
       // }
-      if (!this.rowBtnList?.length) return;
-      this.setBatchRelationBtnIds(this.rowBtnList);
       let rowBtnList = this.rowBtnList;
+      // 新卡片视图 有进入批量模式的按钮
+      if (this.isCard) {
+        if(this.isCardNewBatch) {
+          rowBtnList = rowBtnList.map(v => {
+            if(v.type == 'BATCH') return v
+            return null
+          }).filter(Boolean);
+        } else {
+          rowBtnList = rowBtnList.map(v => {
+            if(v.type != 'BATCH') return v;
+            return null;
+          }).filter(Boolean);
+        }
+      }
+      if (!rowBtnList?.length) return;
+      this.setBatchRelationBtnIds(rowBtnList);
+      
 
       // 子列表只留下行级按钮
       // if (this.isNestTableClick) {
@@ -1595,6 +1625,9 @@ export default create({
     handleReset() {
       this.$emit('handleReset', { targetType: 'outQuickSearchReset' });
     },
+    changeCardNewBatch(val) {
+      this.$emit('changeCardNewBatch', val)
+    },
     handleUploadChange(info) {
       const { file, fileList } = info;
       if (file.status !== 'uploading') {

package/src/utils/UniRTCv2.js

@@ -248,8 +248,8 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 
 	function _connect() {
 		// 创建链接
-		// _socket = io.connect('https://video.jsehealth.com:9999'); // 生产环境
-		_socket = io.connect('https://t.jsehealth.com:9997'); // 测试环境
+		_socket = io.connect('https://video.jsehealth.com:9999'); // 生产环境
+		// _socket = io.connect('https://t.jsehealth.com:9997'); // 测试环境
 		// _socket = io.connect('http://127.0.0.1:9090');
 		// _socket = io.connect("https://dli.xikang.com:9999");
 		// 注册事件处理函数