cnhis-design-vue 2.1.98 → 2.1.100

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

@@ -152,17 +152,21 @@ export default {
 
         // 左键松开鼠标-批量删除
         this.isSelectArea = false;
-        if (event.button === 1 && !event.target && this.selectArea) {
+        if (event.button === 1 && this.selectArea) {
           const points = this.selectArea.ponits;
-          const delList = this.getAreaPonits(points);
-          delList.length === 0 && this.removeSelectArea();
-          if (delList.length > 0 && this.selectArea) {
-            this.$emit('pointOperation', 'delete', delList);
+          const { polylineList, otherList } = this.getAreaPonits(points);
+          !polylineList.length && !otherList.length && this.removeSelectArea();
+          if (polylineList.length > 0 && this.selectArea) {
+            this.$emit('pointOperation', 'delete', polylineList);
+            this.currentDelPoint = null;
+          }
+          if (otherList.length > 0 && this.selectArea) {
+            Bus.$emit('deleteOther', otherList);
             this.currentDelPoint = null;
           }
         }
       });
-      let selectAreaOrigin = { left: 0, top: 0 };
+      const selectAreaOrigin = { left: 0, top: 0 };
       this.canvas.on('mouse:down', event => {
         if (event.button !== 1) return;
 
@@ -234,36 +238,52 @@ export default {
     },
     // 获取选区内包含的节点
     getAreaPonits(points) {
-      const delList = [];
+      const polylineList = [];
+      let otherList = [];
       const [x1, y1, x2, y2] = points;
       this.canvas.forEachObject(obj => {
-        const { id, left, top } = obj;
+        const { id, left, top, currentDelPoint } = obj;
         const isArea = left >= x1 && left <= x2 && top >= y1 && top <= y2;
-        if (id && /_polyline(Point)_/.test(id) && !id.includes('isTitle') && isArea) {
-          if (this.currentDelPoint) {
-            const { polylineIndex } = this.currentDelPoint;
-            if (polylineIndex == obj.polylineIndex) {
-              delList.push(this.getDataById(id));
+        if (isArea && this.isGridLimit(left, top) && id) {
+          if (/_polyline(Point)_/.test(id)) {
+            const data = this.getDataById(id);
+            if (currentDelPoint) {
+              if (currentDelPoint.polylineIndex == obj.polylineIndex) {
+                polylineList.push(data);
+              }
+            } else {
+              polylineList.push(data);
             }
-          } else {
-            delList.push(this.getDataById(id));
+          }
+          if (id.includes('_other') && obj.type === 'list' && !this.currentDelPoint) {
+            const data = {
+              type: obj.type,
+              index: obj.index,
+              dataIndex: obj.dataIndex
+            };
+            otherList.push(data);
           }
         }
       });
-      return delList;
+      if (polylineList.length > 0) {
+        otherList = [];
+      }
+      return { polylineList, otherList };
     },
     // 创建选区
     createSelectArea(event, selectAreaOrigin) {
       this.selectArea && this.canvas.remove(this.selectArea);
+      const [x1, y1] = [selectAreaOrigin.left, selectAreaOrigin.top];
+      const [x2, y2] = [event.pointer.x, event.pointer.y];
       this.selectArea = new this.fabric.Rect({
         ...defaultVaule.style,
         fill: '#CAF982',
         opacity: 0.4,
-        left: selectAreaOrigin.left,
-        top: selectAreaOrigin.top,
-        width: event.pointer.x - selectAreaOrigin.left,
-        height: event.pointer.y - selectAreaOrigin.top,
-        ponits: [selectAreaOrigin.left, selectAreaOrigin.top, event.pointer.x, event.pointer.y]
+        left: x1,
+        top: y1,
+        width: x2 - x1,
+        height: y2 - y1,
+        ponits: x1 < x2 ? [x1, y1, x2, y2] : [x2, y2, x1, y1]
       });
       this.canvas.add(this.selectArea);
     },
@@ -1010,7 +1030,7 @@ export default {
           polylineTypeId,
           polylineIndex: point.polylineIndex,
           scaleX: point.scale || 1,
-          scaleY: point.scale || 1,
+          scaleY: point.scale || 1
         });
         clonedObj.hasControls = clonedObj.hasBorders = false;
         point.prePoints = [point.left, point.top];

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

@@ -124,6 +124,8 @@ export default {
           }
         }
       });
+
+      Bus.$on('deleteOther', otherList => this.$emit('deleteOther', otherList));
     },
     // 打开右键菜单
     openRightModal() {

package/packages/index.js

@@ -89,6 +89,7 @@ import { default as FormTable } from './form-table';
 import { default as ShortcutSetter } from './shortcut-setter';
 import { default as Ellipsis } from './ellipsis';
 import { default as ScaleContainer } from './scale-container';
+import { default as ShortcutProvider } from './shortcut-provider';
 
 const req = require.context('ant-design-vue/es/locale', true, /.js$/);
 const locales = {};
@@ -187,7 +188,8 @@ const components = [
   FormTable,
   ShortcutSetter,
   Ellipsis,
-  ScaleContainer
+  ScaleContainer,
+  ShortcutProvider
 ];
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
@@ -304,7 +306,8 @@ export {
   FormTable,
   ShortcutSetter,
   Ellipsis,
-  ScaleContainer
+  ScaleContainer,
+  ShortcutProvider
 };
 
 export default {

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

@@ -126,7 +126,7 @@ import { Icon, Checkbox, Tree, Tooltip, Input, Spin } from 'ant-design-vue';
 import searchTree from './search-tree';
 import create from '@/core/create';
 import vexutils from '@/utils/vexutils';
-import { filterTree, deepTraversalFirst, getAllParentId } from '@/utils';
+import { filterTree, deepTraversalFirst, getAllParentId, matchWdAndPy } from '@/utils';
 
 /**
  * 查询没有部门的分类时，parent_id_obj 为 undefined a-tree 展示异常。
@@ -1301,7 +1301,7 @@ export default create({
       copyData = copyData.filter(item => item.visible);
       const expandedKeys = [];
       vexutils.searchTree(copyData, item => {
-        if (item.visible && item.title.indexOf(this.title) !== -1) {
+        if (item.visible && (item.title.indexOf(this.title) !== -1 || matchWdAndPy(this.title, item))) {
           const allParentIds = getAllParentId(copyData, item.key).filter(Boolean);
           expandedKeys.push(...allParentIds);
         }

package/packages/shortcut-provider/index.js

@@ -0,0 +1,10 @@
+// 导入组件
+import ShortcutProvider from './src/ShortcutProvider.vue';
+
+// 为组件提供 install 安装方法，供按需引入
+ShortcutProvider.install = function(Vue) {
+  Vue.component(ShortcutProvider.name, ShortcutProvider);
+};
+
+// 默认导出组件
+export default ShortcutProvider;

package/packages/shortcut-provider/src/ShortcutProvider.vue

@@ -0,0 +1,33 @@
+<script>
+import create from '@/core/create';
+import { ShortcutManager } from './hooks';
+
+export default create({
+  name: 'shortcut-provider',
+  props: {},
+  provide() {
+    return {
+      $manager: () => this.manager
+    };
+  },
+  data() {
+    return {
+      manager: new ShortcutManager().start()
+    };
+  },
+  methods: {
+    getManager() {
+      return this.manager;
+    }
+  },
+  mounted() {},
+  beforeDestroy() {
+    this.manager.destroy();
+  },
+  render(h) {
+    return this.$slots.default ? h('div', this.$slots.default) : undefined;
+  }
+});
+</script>
+
+<style lang="less"></style>

package/packages/shortcut-provider/src/constants/index.js

@@ -0,0 +1,4 @@
+export const ShortcutStatus = {
+  INACTIVE: 0,
+  ACTIVE: 1
+};

package/packages/shortcut-provider/src/hooks/index.js

@@ -0,0 +1 @@
+export * from './useShortcuts';

package/packages/shortcut-provider/src/hooks/useShortcuts.js

@@ -0,0 +1,129 @@
+import { findAncestor } from '@/utils';
+import { ShortcutStatus } from '../constants';
+import { pick, omit } from 'xe-utils';
+
+import { getDisplaySignature, getKeySignature, isInvalidKeyboardEvent, isInvalidSignature, isKeyboardEvent, isShortcutProvider, normalizeSignatureInfo } from '~/shortcut-provider/src/utils';
+
+export const GlobalShortcutProvider = Symbol('Glob');
+const ShortcutManagerCacheMap = new Map();
+
+export class ShortcutManager {
+  shortcutCallbackMap = new Map([]);
+
+  shortcutCache = {};
+
+  environmentEle;
+
+  handle = null;
+
+  disabled = false;
+
+  static log(message, dryRun = false) {
+    const _message = `[ShortcutManager] ${message}`;
+    !dryRun && console.warn(_message);
+    return _message;
+  }
+
+  constructor(environmentEle = window, scope = GlobalShortcutProvider) {
+    this.environmentEle = environmentEle;
+    ShortcutManagerCacheMap.set(scope, this);
+  }
+
+  get traverse() {
+    return [...Object.values(this.shortcutCache)].sort((a, b) => (a.order || 0) - (b.order || 0));
+  }
+
+  query(key) {
+    return this.shortcutCache[key];
+  }
+
+  async update(key, info) {
+    const oldKeySignature = this.query(key)?.currentKeySignature;
+
+    info && checkSignature(this.shortcutCache, info);
+
+    const item = this.query(key);
+    if (!item) return;
+    await item.onUpdate?.(key, info ? normalizeSignatureInfo(info) : undefined);
+    checkSignature(this.shortcutCache, info);
+    item.currentKeySignature = getKeySignature(info);
+    item.shortcutSignature = normalizeSignatureInfo(info);
+    this.shortcutCallbackMap.set(item.currentKeySignature, this.shortcutCallbackMap.get(oldKeySignature));
+    this.shortcutCallbackMap.delete(oldKeySignature);
+
+    function checkSignature(shortcutCache, info) {
+      if (oldKeySignature === getKeySignature(info)) return;
+      if (Object.values(shortcutCache).some(v => v.currentKeySignature === getKeySignature(info))) {
+        throw `重复的快捷键=> ${getDisplaySignature(info)}`;
+      }
+      if (isInvalidSignature(info)) {
+        throw `非法的快捷键=>${info.key}`;
+      }
+    }
+  }
+
+  register(shortcutItem) {
+    const item = this.query(shortcutItem.key);
+    if (item) {
+      item.status = ShortcutStatus.ACTIVE;
+      this.shortcutCallbackMap.set(item.currentKeySignature, shortcutItem.callback);
+      Object.assign(item, pick(shortcutItem, ['debounce', 'debounceOption', 'label', 'order', 'key']));
+      return createHandler(item);
+    }
+
+    this.shortcutCache[shortcutItem.key] = omit(shortcutItem, ['callback']);
+    this.shortcutCallbackMap.set(shortcutItem.currentKeySignature, shortcutItem.callback);
+
+    return createHandler(this.shortcutCache[shortcutItem.key]);
+
+    function createHandler(shortcut) {
+      return {
+        stop: () => {
+          shortcut.status = ShortcutStatus.INACTIVE;
+        },
+        start: () => {
+          shortcut.status = ShortcutStatus.ACTIVE;
+        },
+        signature: () => shortcut.currentKeySignature
+      };
+    }
+  }
+
+  start() {
+    if (this.handle) {
+      ShortcutManager.log(`请勿重复启动=>${this}`);
+      return this;
+    }
+
+    this.handle = event => {
+      if (!isKeyboardEvent(event) || this.disabled) return;
+      const providerWrapper = findAncestor(event.target, isShortcutProvider);
+
+      if ((providerWrapper && providerWrapper !== this.environmentEle) || isInvalidKeyboardEvent(event)) {
+        return;
+      }
+      const keySignature = getKeySignature(event);
+
+      const callback = this.shortcutCallbackMap.get(keySignature);
+      if (!callback) return;
+      event.preventDefault();
+      const shortcutItem = Object.values(this.shortcutCache).find(item => item.currentKeySignature === keySignature);
+      if (!shortcutItem || shortcutItem.status !== ShortcutStatus.ACTIVE || shortcutItem.disabled) return;
+      callback(event);
+    };
+
+    this.environmentEle.addEventListener('keyup', this.handle, { capture: true });
+    return this;
+  }
+
+  destroy() {
+    this.handle && this.environmentEle.removeEventListener('keyup', this.handle, { capture: true });
+    this.handle = undefined;
+    this.clear();
+  }
+
+  clear() {
+    this.shortcutCallbackMap.clear();
+    this.shortcutCache = {};
+  }
+}

package/packages/shortcut-provider/src/utils/index.js

@@ -0,0 +1,107 @@
+import { isString } from 'xe-utils';
+
+function isAlphanumeric(key) {
+  return /^[\dA-Za-z]$/.test(key);
+}
+
+function isPunctuation(key) {
+  return /^[，。；‘【】、\-=|+,./;’[\]\\ ]$/.test(key);
+}
+
+function isFnNumberChar(key) {
+  return /^[!@#$%^&*()_+|~！¥…（）—｜～]$/.test(key);
+}
+
+export function isKeyboardEvent(event) {
+  return Reflect.get(event, 'view') === window && Reflect.get(event, 'shiftKey') != undefined;
+}
+
+export function normalizeSignatureInfo(info) {
+  let ctrl, shift, alt;
+  const key = info.key?.toUpperCase() ?? '';
+
+  if (isKeyboardEvent(info)) {
+    ctrl = info.ctrlKey;
+    shift = info.shiftKey;
+    alt = info.altKey;
+  } else {
+    ctrl = !!info.ctrl;
+    shift = !!info.shift;
+    alt = !!info.alt;
+  }
+
+  return { ctrl, shift, alt, key };
+}
+
+export function getKeySignature(info) {
+  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
+
+  return `${ctrl ? 'Ctrl_' : ''}${shift ? 'Shift_' : ''}${alt ? 'Alt_' : ''}${key}`;
+}
+
+const keyBlackList = ['CONTROL', 'ALT', 'SHIFT'];
+
+export function inKeyBlackList(key) {
+  if (!isString(key)) return false;
+  return keyBlackList.includes(key.toUpperCase());
+}
+
+export function isInvalidKeyboardEvent(event) {
+  const target = event.target;
+  if (target.tagName !== 'INPUT') return false;
+  return isInvalidSignatureAtInput(event);
+}
+
+function isInvalidSignatureAtInput(info) {
+  const target = info.target;
+  if (target.classList.contains('shortcut-setter-item')) return true;
+  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
+  if (ctrl || alt) return false;
+  if (shift) return isFnNumberChar(key);
+  return isAlphanumeric(key) || isPunctuation(key);
+}
+
+export function isInvalidSignature(info) {
+  const { key } = normalizeSignatureInfo(info);
+  // if (!ctrl && !shift && !alt) return /^F\d$/.test(key);
+  return inKeyBlackList(key);
+}
+
+export function getDisplaySignature(info) {
+  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
+
+  return `${ctrl ? 'Ctrl + ' : ''}${alt ? 'Alt + ' : ''}${shift ? 'Shift + ' : ''}${inKeyBlackList(key) ? '' : displaySignatureEscape(key.replace(' ', 'SPACE'))}`;
+}
+
+function displaySignatureEscape(key) {
+  const escapeMap = {
+    '!': '1',
+    '！': '1',
+    '@': '2',
+    '#': '3',
+    $: '4',
+    '¥': '4',
+    '%': '5',
+    '…': '6',
+    '^': '6',
+    '&': '7',
+    '*': '8',
+    '（': '9',
+    '(': '9',
+    '）': '0',
+    ')': '0'
+  };
+
+  return escapeMap[key] || key;
+}
+
+export function transformKey2DisplaySignature(keySignature) {
+  return keySignature
+    .replace(' ', 'SPACE')
+    .replace(/[^_]$/, key => displaySignatureEscape(key))
+    .replace(/_/g, ' + ');
+}
+
+export function isShortcutProvider(ele) {
+  return ele && ele.getAttribute('is-shortcut-capture') != undefined;
+}

package/packages/shortcut-setter/src/ShortcutSetterItem.vue

@@ -3,10 +3,12 @@
     <label>
       {{ source.label ? `${source.label}:` : '' }}
       <a-input
+        :allowClear="source.clearable"
         v-bind="source.inputProps"
         ref="inputRef"
         :placeholder="parsedPlaceholder"
         :value="parsedContent"
+        @change="onChange"
         @focus.stop="onFocus"
         @blur.stop="onBlur"
         @keydown.stop.prevent="onKeydown"
@@ -40,7 +42,7 @@ export default {
     },
     async onKeyup(event) {
       try {
-        if(this.currentContent===getDisplaySignature(event)) return
+        if (this.currentContent === getDisplaySignature(event)) return;
         await new Promise((resolve, reject) => {
           this.$emit('shortcutChange', { key: this.source.key, info: event, resolve, reject });
         });
@@ -58,6 +60,16 @@ export default {
       this.$refs.inputRef?.blur();
       this.isEdit = false;
       this.editContent = '';
+    },
+    onChange(event) {
+      if (!event || event.target.value !== '') return;
+      this.currentContent = '';
+      this.$emit('shortcutChange', {
+        key: this.source.key,
+        info: { key: '' },
+        resolve: () => null,
+        reject: () => null
+      });
     }
   },
   computed: {

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

@@ -251,7 +251,7 @@
                         {{ item.alias || item.name }}
                       </template>
                     </a-button>
-                    <a-upload v-if="item.isImportGuage" method="post" :show-upload-list="false" :action="`${axios.defaults.baseURL}/guage/importGuage`" @change="handleUploadChange">
+                    <a-upload v-if="item.isImportGuage" method="post" :customRequest="importGaugeCustomRequest" :show-upload-list="false">
                       <!-- 上传配置文件 -->
                       <a-button
                         class="btn-custom-class"
@@ -412,6 +412,7 @@ import PrintBtn from '~/button/src/ButtonPrint/index';
 
 import outQuickSearch from '../components/out-quick-search/out-quick-search';
 import utils from '@/utils/utils-map';
+import { isFunction } from 'xe-utils';
 import { durationMixin, $utils, filterApiFn, outQuickSearchFn, outQuickSearchDefCommon } from '../mixins/mixins';
 import tableSearchCon from '../mixins/tableSearchCon';
 import OutQuickMethod from '../mixins/out-quick-method'
@@ -566,6 +567,7 @@ export default create({
         action: ''
       })
     },
+    importGuageRequest: Function,
 
     /**
      * 打印配置
@@ -1685,6 +1687,32 @@ export default create({
     changeCardNewBatch(val) {
       this.$emit('changeCardNewBatch', val)
     },
+    // 兼容二次开发平台
+    importGaugeMethod(params, name) {
+      let url =  this.importGuageConfig?.action || `${this.axios.defaults.baseURL}/guage/importGuage`
+      this.axios.post(url, params).then(({data}) => {
+        if(data.result !== 'SUCCESS') {
+          this.$message.error(data.resultMsg || `${name}导入失败`)
+          return;
+        }
+        this.$message.success(`${name}导入成功`);
+        this.$emit('importUpdate');
+      })
+    },
+    // 量表导入自定义上传方法
+    importGaugeCustomRequest(options) {
+      let { file } = options;
+      let formData = new FormData();
+      formData.append("file", file);
+
+      this.$set(file, "status", "uploading");
+      let curMehod = this.importGaugeMethod
+      if(this.importGuageRequest && isFunction(this.importGuageRequest)) {
+        curMehod = this.importGuageRequest
+      }
+      curMehod(formData, file.name)
+    },
+    // @change="handleUploadChange"
     handleUploadChange(info) {
       const { file, fileList } = info;
       if (file.status !== 'uploading') {

package/src/utils/index.js

@@ -91,3 +91,13 @@ export const matchWdAndPy = (keyword, item) => {
   const wbCodeMatch = wbCode?.indexOf(keyword) > -1; // 五笔匹配
   return pyCodeMatch || wbCodeMatch;
 };
+
+export function findAncestor(ele, finder) {
+  if (!ele) return ele;
+  if (finder(ele)) return ele;
+  let next = ele.parentElement;
+  while (next && !finder(next)) {
+    next = next.parentElement;
+  }
+  return next;
+}