cnhis-design-vue 2.1.78 → 2.1.80

package/packages/big-table/src/utils/tableParse.js

@@ -1,234 +1,234 @@
-import vexutils from '@/utils/vexutils';
-
-// DURATION - 解析时长类型
-export function parseDurationValue(v, duration) {
-  // < 1 分钟 显示 X秒;< 60 分钟 显示 X分钟;< 24 * 60 分钟 显示 X 小时 X 分钟;< 30 * 24 * 60 分钟 显示X天X小时;< 365 * 24 * 60 显示 X个月X天
-  if (!v && v !== 0) return;
-  const unitList = {
-    day: 86400,
-    minute: 60,
-    hour: 3600,
-    second: 1
-  };
-  const unit = (duration && unitList[duration]) || 1;
-  const value = v * unit || 0;
-  const mu = 60;
-  if (value < mu) {
-    return `${value}秒`;
-  }
-  const hu = mu * 60;
-  if (value < hu) {
-    return `${Math.floor(value / 60)}分`;
-  }
-  const du = hu * 24;
-  if (value < du) {
-    const v2 = Math.floor(value / 60) % 60;
-    return `${Math.floor(value / hu)}小时${v2 ? v2 + '分' : ''}`;
-  }
-  const MU = du * 30;
-  if (value < MU) {
-    const v2 = Math.floor(value / hu) % 24;
-    return `${Math.floor(value / du)}天${v2 ? v2 + '小时' : ''}`;
-  }
-  const yu = du * 365;
-  if (value < yu) {
-    const unit = 30;
-    const v1 = Math.floor(value / du / unit);
-    const v2 = Math.floor((value - v1 * unit * du) / du);
-    return `${v1}个月${v2 ? v2 + '天' : ''}`;
-  }
-  return `${Math.floor(value / du / 365)}年`;
-}
-
-// COMBINATION - 解析组合组件value
-export function parseCombinationValue(value, setting) {
-  let data = value ? JSON.parse(value) : [];
-  if (!Array.isArray(data)) {
-    data = [data];
-  }
-  const { combinationField: key } = setting;
-  if (!key) return value; // <- 如果没有解析字段则直接返回原值
-  return data
-    .reduce((str, item) => {
-      const v = item[key];
-      typeof v !== 'undefined' && (str += `,${v}`);
-      return str;
-    }, '')
-    .slice(1);
-}
-
-// 格式化renderItem
-export function formatFieldText(row, field, fieldList, fieldListOriginal, isTimeAxisRenderNew, isTimeAxisExpand) {
-  const findField = (columnName, fieldList) => {
-    return fieldList.find(item => item.columnName === columnName);
-  };
-
-  const haveValue = val => val !== undefined && val !== '';
-
-  const formatText = text => (text ? text : String(text) === '0' ? '0' : '');
-
-  const parseMergedFeildExpression = function(mergedFeildExpression, config) {
-    const { row, fieldListOriginal, html } = config;
-    let passList = [];
-
-    // 合并字段
-    // 自定义合并规则，当主字段为空则不合并，任一拼接字段为空，则不合并所有拼接字段。
-    const regexp = /#{(.+?)\}/g;
-    let formatHtml = mergedFeildExpression.replace(regexp, (match, p1) => {
-      let findFieldItem = findField(p1, fieldListOriginal);
-      let hasVal = haveValue(row[p1]) && findFieldItem;
-      passList.push(hasVal);
-      // 格式化匹配到的合并字段对应的数据项
-      if (findFieldItem && this?.formatData) {
-        let cloneRow = JSON.parse(JSON.stringify(row));
-        let tableData = this.formatData({
-          tableList: [cloneRow],
-          fieldList: [findFieldItem],
-          btnList: [],
-          oldtableData: [row]
-        })[0];
-        return formatText(tableData[p1]);
-      }
-      return formatText(row[p1]);
-    });
-
-    let pass = passList.every(b => b);
-    // 如果任意次字段值为空 || 无字段权限 => 只展示主字段的值
-    if (!pass) {
-      return { pass: false, formatHtml: html };
-    }
-    return { pass: true, formatHtml };
-  };
-
-  // 分隔合并规则，当主字段为空则不合并，某拼接字段为空则不合并该拼接字段，允许输入空格。
-  const parseMergedSeparator = function(html, config) {
-    let { field, row } = config;
-    let { mergedFeild, mergedSeparator } = field.settingObj;
-    mergedSeparator = mergedSeparator ?? '';
-    mergedFeild = mergedFeild.split(',');
-    if (!mergedFeild.length) return html;
-    mergedFeild.unshift(field.columnName);
-    let feildRes = mergedFeild.map(v => row[v]).filter(v => !!v || v === 0);
-    return feildRes.join(mergedSeparator);
-  };
-
-  // 赋值原字段样式
-  const getOriginStyle = (formatHtml, config) => {
-    let { field, row, fieldList } = config;
-    let originColumnNameColorList = findField(field.columnName, fieldList)?.colorAndIcon || [];
-    let findC = originColumnNameColorList.find(c =>
-      vexutils.parseCondition(
-        c.condition,
-        {
-          form: {},
-          table: {
-            ...row
-          },
-          sys: {}
-        },
-        fieldList
-      )
-    );
-
-    let originColumnNameColor = findC?.color || 'inherit';
-    // const regexp2 = /color(:|;)(.+?)(;|")/g;
-    // formatHtml = formatHtml.replace(regexp2, (match, p1, p2, p3 = '') => {
-    //   return p3;
-    // });
-
-    formatHtml = `<span style="color: ${originColumnNameColor};">${formatHtml}</span>`;
-    return formatHtml;
-  };
-
-  // 轨迹组件需要重新处理 时间显示
-  if (isTimeAxisRenderNew && field.fieldType.includes('DATE')) {
-    let key = field.columnName;
-    if (!isTimeAxisExpand) {
-      key = field.columnName + '_fold';
-    }
-    let text = row[key];
-    return text;
-  }
-
-  let html = formatText(row[field.columnName]);
-
-  // 主字段没有值，则不展示
-  if (!haveValue(html)) {
-    return '';
-  }
-
-  // 合并策略
-  // mergedType 字符串 0-分隔符合并 1-自定义合并
-  // mergedSeparator 分隔合并规则，当主字段为空则不合并，某拼接字段为空则不合并该拼接字段，允许输入空格。
-  // mergedFeildExpression 自定义合并规则，当主字段为空则不合并，任一拼接字段为空，则不合并所有拼接字段。
-  const { mergedType, mergedSeparator, mergedFeild, mergedFeildExpression } = field.settingObj;
-  // 原来的规则只有mergedFeildExpression, mergedType/mergedSeparator是新加的
-  if (!mergedType && !mergedFeildExpression) return html;
-  if (mergedType === '1' && !mergedFeildExpression) return html;
-  if (mergedType === '0' && (!mergedFeild || !mergedSeparator)) return html;
-  let formatHtml = html;
-  if (mergedType === '0') {
-    formatHtml = parseMergedSeparator(html, { field, row });
-  } else if (mergedFeildExpression) {
-    let obj = parseMergedFeildExpression(mergedFeildExpression, { row, fieldListOriginal, html });
-    formatHtml = obj.formatHtml;
-    if (!obj.pass) return formatHtml;
-  }
-  if (mergedType || mergedFeildExpression) {
-    return getOriginStyle(formatHtml, { field, row, fieldList });
-  }
-
-  return formatHtml;
-}
-
-// imgs => imgArr
-export function imgs2imgArr(imgs) {
-  if (!imgs) return [];
-
-  return imgs
-    .replace(/(,)(data|http)/g, (match, p1, p2) => {
-      return `|${p2}`;
-    })
-    .split('|');
-}
-
-const getLen = value => {
-  const len = value.toString().split('.')?.[1]?.length || 0;
-  return len;
-};
-
-const myToFixed = (num, decimals) => {
-  if (!num) return num;
-  if (typeof num !== 'number') return num;
-  return num.toLocaleString('en-US', {
-    minimumFractionDigits: decimals,
-    maximumFractionDigits: decimals
-  });
-};
-
-export function parseNumberField(val, own) {
-  let attrType = own?.attrType || '';
-  let fieldType = own?.fieldType || '';
-  let { numShowType, numScale } = own.settingObj || {};
-  if (!numShowType || (!numScale && numScale !== 0)) {
-    return val;
-  }
-  let rVal = val;
-  if (vexutils.isPlainObject(val)) {
-    rVal = val.value;
-  }
-  if (!rVal) return rVal;
-  if (isNaN(+rVal)) return rVal;
-  rVal = +rVal;
-  numScale = +numScale;
-  numScale = numScale > 6 ? 6 : numScale < 0 ? 0 : numScale;
-  if (numShowType === 'fixed') {
-    return myToFixed(rVal, numScale);
-  }
-  let len = getLen(rVal);
-  if (numShowType === 'must') {
-    rVal = parseFloat(rVal);
-  }
-  if (len <= numScale) return rVal;
-  return myToFixed(rVal, numScale);
-}
+import vexutils from '@/utils/vexutils';
+
+// DURATION - 解析时长类型
+export function parseDurationValue(v, duration) {
+  // < 1 分钟 显示 X秒;< 60 分钟 显示 X分钟;< 24 * 60 分钟 显示 X 小时 X 分钟;< 30 * 24 * 60 分钟 显示X天X小时;< 365 * 24 * 60 显示 X个月X天
+  if (!v && v !== 0) return;
+  const unitList = {
+    day: 86400,
+    minute: 60,
+    hour: 3600,
+    second: 1
+  };
+  const unit = (duration && unitList[duration]) || 1;
+  const value = v * unit || 0;
+  const mu = 60;
+  if (value < mu) {
+    return `${value}秒`;
+  }
+  const hu = mu * 60;
+  if (value < hu) {
+    return `${Math.floor(value / 60)}分`;
+  }
+  const du = hu * 24;
+  if (value < du) {
+    const v2 = Math.floor(value / 60) % 60;
+    return `${Math.floor(value / hu)}小时${v2 ? v2 + '分' : ''}`;
+  }
+  const MU = du * 30;
+  if (value < MU) {
+    const v2 = Math.floor(value / hu) % 24;
+    return `${Math.floor(value / du)}天${v2 ? v2 + '小时' : ''}`;
+  }
+  const yu = du * 365;
+  if (value < yu) {
+    const unit = 30;
+    const v1 = Math.floor(value / du / unit);
+    const v2 = Math.floor((value - v1 * unit * du) / du);
+    return `${v1}个月${v2 ? v2 + '天' : ''}`;
+  }
+  return `${Math.floor(value / du / 365)}年`;
+}
+
+// COMBINATION - 解析组合组件value
+export function parseCombinationValue(value, setting) {
+  let data = value ? JSON.parse(value) : [];
+  if (!Array.isArray(data)) {
+    data = [data];
+  }
+  const { combinationField: key } = setting;
+  if (!key) return value; // <- 如果没有解析字段则直接返回原值
+  return data
+    .reduce((str, item) => {
+      const v = item[key];
+      typeof v !== 'undefined' && (str += `,${v}`);
+      return str;
+    }, '')
+    .slice(1);
+}
+
+// 格式化renderItem
+export function formatFieldText(row, field, fieldList, fieldListOriginal, isTimeAxisRenderNew, isTimeAxisExpand) {
+  const findField = (columnName, fieldList) => {
+    return fieldList.find(item => item.columnName === columnName);
+  };
+
+  const haveValue = val => val !== undefined && val !== '';
+
+  const formatText = text => (text ? text : String(text) === '0' ? '0' : '');
+
+  const parseMergedFeildExpression = function(mergedFeildExpression, config) {
+    const { row, fieldListOriginal, html } = config;
+    let passList = [];
+
+    // 合并字段
+    // 自定义合并规则，当主字段为空则不合并，任一拼接字段为空，则不合并所有拼接字段。
+    const regexp = /#{(.+?)\}/g;
+    let formatHtml = mergedFeildExpression.replace(regexp, (match, p1) => {
+      let findFieldItem = findField(p1, fieldListOriginal);
+      let hasVal = haveValue(row[p1]) && findFieldItem;
+      passList.push(hasVal);
+      // 格式化匹配到的合并字段对应的数据项
+      if (findFieldItem && this?.formatData) {
+        let cloneRow = JSON.parse(JSON.stringify(row));
+        let tableData = this.formatData({
+          tableList: [cloneRow],
+          fieldList: [findFieldItem],
+          btnList: [],
+          oldtableData: [row]
+        })[0];
+        return formatText(tableData[p1]);
+      }
+      return formatText(row[p1]);
+    });
+
+    let pass = passList.every(b => b);
+    // 如果任意次字段值为空 || 无字段权限 => 只展示主字段的值
+    if (!pass) {
+      return { pass: false, formatHtml: html };
+    }
+    return { pass: true, formatHtml };
+  };
+
+  // 分隔合并规则，当主字段为空则不合并，某拼接字段为空则不合并该拼接字段，允许输入空格。
+  const parseMergedSeparator = function(html, config) {
+    let { field, row } = config;
+    let { mergedFeild, mergedSeparator } = field.settingObj;
+    mergedSeparator = mergedSeparator ?? '';
+    mergedFeild = mergedFeild.split(',');
+    if (!mergedFeild.length) return html;
+    mergedFeild.unshift(field.columnName);
+    let feildRes = mergedFeild.map(v => row[v]).filter(v => !!v || v === 0);
+    return feildRes.join(mergedSeparator);
+  };
+
+  // 赋值原字段样式
+  const getOriginStyle = (formatHtml, config) => {
+    let { field, row, fieldList } = config;
+    let originColumnNameColorList = findField(field.columnName, fieldList)?.colorAndIcon || [];
+    let findC = originColumnNameColorList.find(c =>
+      vexutils.parseCondition(
+        c.condition,
+        {
+          form: {},
+          table: {
+            ...row
+          },
+          sys: {}
+        },
+        fieldList
+      )
+    );
+
+    let originColumnNameColor = findC?.color || 'inherit';
+    // const regexp2 = /color(:|;)(.+?)(;|")/g;
+    // formatHtml = formatHtml.replace(regexp2, (match, p1, p2, p3 = '') => {
+    //   return p3;
+    // });
+
+    formatHtml = `<span style="color: ${originColumnNameColor};">${formatHtml}</span>`;
+    return formatHtml;
+  };
+
+  // 轨迹组件需要重新处理 时间显示
+  if (isTimeAxisRenderNew && field.fieldType.includes('DATE')) {
+    let key = field.columnName;
+    if (!isTimeAxisExpand) {
+      key = field.columnName + '_fold';
+    }
+    let text = row[key];
+    return text;
+  }
+
+  let html = formatText(row[field.columnName]);
+
+  // 主字段没有值，则不展示
+  if (!haveValue(html)) {
+    return '';
+  }
+
+  // 合并策略
+  // mergedType 字符串 0-分隔符合并 1-自定义合并
+  // mergedSeparator 分隔合并规则，当主字段为空则不合并，某拼接字段为空则不合并该拼接字段，允许输入空格。
+  // mergedFeildExpression 自定义合并规则，当主字段为空则不合并，任一拼接字段为空，则不合并所有拼接字段。
+  const { mergedType, mergedSeparator, mergedFeild, mergedFeildExpression } = field.settingObj;
+  // 原来的规则只有mergedFeildExpression, mergedType/mergedSeparator是新加的
+  if (!mergedType && !mergedFeildExpression) return html;
+  if (mergedType === '1' && !mergedFeildExpression) return html;
+  if (mergedType === '0' && (!mergedFeild || !mergedSeparator)) return html;
+  let formatHtml = html;
+  if (mergedType === '0') {
+    formatHtml = parseMergedSeparator(html, { field, row });
+  } else if (mergedFeildExpression) {
+    let obj = parseMergedFeildExpression(mergedFeildExpression, { row, fieldListOriginal, html });
+    formatHtml = obj.formatHtml;
+    if (!obj.pass) return formatHtml;
+  }
+  if (mergedType || mergedFeildExpression) {
+    return getOriginStyle(formatHtml, { field, row, fieldList });
+  }
+
+  return formatHtml;
+}
+
+// imgs => imgArr
+export function imgs2imgArr(imgs) {
+  if (!imgs) return [];
+
+  return imgs
+    .replace(/(,)(data|http)/g, (match, p1, p2) => {
+      return `|${p2}`;
+    })
+    .split('|');
+}
+
+const getLen = value => {
+  const len = value.toString().split('.')?.[1]?.length || 0;
+  return len;
+};
+
+const myToFixed = (num, decimals) => {
+  if (!num) return num;
+  if (typeof num !== 'number') return num;
+  return num.toLocaleString('en-US', {
+    minimumFractionDigits: decimals,
+    maximumFractionDigits: decimals
+  });
+};
+
+export function parseNumberField(val, own) {
+  let attrType = own?.attrType || '';
+  let fieldType = own?.fieldType || '';
+  let { numShowType, numScale } = own.settingObj || {};
+  if (!numShowType || (!numScale && numScale !== 0)) {
+    return val;
+  }
+  let rVal = val;
+  if (vexutils.isPlainObject(val)) {
+    rVal = val.value;
+  }
+  if (!rVal) return rVal;
+  if (isNaN(+rVal)) return rVal;
+  rVal = +rVal;
+  numScale = +numScale;
+  numScale = numScale > 6 ? 6 : numScale < 0 ? 0 : numScale;
+  if (numShowType === 'fixed') {
+    return myToFixed(rVal, numScale);
+  }
+  let len = getLen(rVal);
+  if (numShowType === 'must') {
+    rVal = parseFloat(rVal);
+  }
+  if (len <= numScale) return rVal;
+  return myToFixed(rVal, numScale);
+}

package/packages/breadcrumb/index.js

@@ -1,21 +1,21 @@
-// 导入组件
-import Base from '../base';
-import Breadcrumb from './src/Breadcrumb';
-import BreadcrumbItem from './src/BreadcrumbItem';
-import BreadcrumbSeparator from './src/BreadcrumbSeparator';
-
-// 为组件提供 install 安装方法，供按需引入
-Breadcrumb.install = function(Vue) {
-  Vue.use(Base);
-  Vue.component(Breadcrumb.name, Breadcrumb);
-  Vue.component(BreadcrumbItem.name, BreadcrumbItem);
-  Vue.component(BreadcrumbSeparator.name, BreadcrumbSeparator);
-};
-
-Object.assign(Breadcrumb, {
-  BreadcrumbItem,
-  BreadcrumbSeparator
-});
-
-// 默认导出组件
-export default Breadcrumb;
+// 导入组件
+import Base from '../base';
+import Breadcrumb from './src/Breadcrumb';
+import BreadcrumbItem from './src/BreadcrumbItem';
+import BreadcrumbSeparator from './src/BreadcrumbSeparator';
+
+// 为组件提供 install 安装方法，供按需引入
+Breadcrumb.install = function(Vue) {
+  Vue.use(Base);
+  Vue.component(Breadcrumb.name, Breadcrumb);
+  Vue.component(BreadcrumbItem.name, BreadcrumbItem);
+  Vue.component(BreadcrumbSeparator.name, BreadcrumbSeparator);
+};
+
+Object.assign(Breadcrumb, {
+  BreadcrumbItem,
+  BreadcrumbSeparator
+});
+
+// 默认导出组件
+export default Breadcrumb;

package/packages/breadcrumb/src/Breadcrumb.jsx

@@ -1,11 +1,11 @@
-/**
- * @author pengpeng
- * @desc 全继承antd组件，后期再扩展
- * @time 2021-05-13
- */
-import { Breadcrumb } from 'ant-design-vue';
-import create from '@/core/create';
-export default create({
-  name: 'breadcrumb',
-  extends: Breadcrumb
-});
+/**
+ * @author pengpeng
+ * @desc 全继承antd组件，后期再扩展
+ * @time 2021-05-13
+ */
+import { Breadcrumb } from 'ant-design-vue';
+import create from '@/core/create';
+export default create({
+  name: 'breadcrumb',
+  extends: Breadcrumb
+});

package/packages/breadcrumb/src/BreadcrumbItem.jsx

@@ -1,11 +1,11 @@
-/**
- * @author pengpeng
- * @desc 全继承antd组件，后期再扩展
- * @time 2021-05-13
- */
-import { Breadcrumb } from 'ant-design-vue';
-import create from '@/core/create';
-export default create({
-  name: 'breadcrumb-item',
-  extends: Breadcrumb.Item
-});
+/**
+ * @author pengpeng
+ * @desc 全继承antd组件，后期再扩展
+ * @time 2021-05-13
+ */
+import { Breadcrumb } from 'ant-design-vue';
+import create from '@/core/create';
+export default create({
+  name: 'breadcrumb-item',
+  extends: Breadcrumb.Item
+});

package/packages/breadcrumb/src/BreadcrumbSeparator.jsx

@@ -1,11 +1,11 @@
-/**
- * @author pengpeng
- * @desc 全继承antd组件，后期再扩展
- * @time 2021-05-13
- */
-import { Breadcrumb } from 'ant-design-vue';
-import create from '@/core/create';
-export default create({
-  name: 'breadcrumb-separator',
-  extends: Breadcrumb.Separator
-});
+/**
+ * @author pengpeng
+ * @desc 全继承antd组件，后期再扩展
+ * @time 2021-05-13
+ */
+import { Breadcrumb } from 'ant-design-vue';
+import create from '@/core/create';
+export default create({
+  name: 'breadcrumb-separator',
+  extends: Breadcrumb.Separator
+});

package/packages/button/index.js

@@ -1,21 +1,21 @@
-// 导入组件
-import Base from '../base';
-import Button from './src/Button';
-import ButtonGroup from './src/ButtonGroup';
-import ButtonPrint from './src/ButtonPrint';
-
-// 为组件提供 install 安装方法，供按需引入
-Button.install = function(Vue) {
-  Vue.use(Base);
-  Vue.component(Button.name, Button);
-  Vue.component(ButtonGroup.name, ButtonGroup);
-  Vue.component(ButtonPrint.name, ButtonPrint);
-};
-
-Object.assign(Button, {
-  ButtonGroup,
-  ButtonPrint
-});
-
-// 默认导出组件
-export default Button;
+// 导入组件
+import Base from '../base';
+import Button from './src/Button';
+import ButtonGroup from './src/ButtonGroup';
+import ButtonPrint from './src/ButtonPrint';
+
+// 为组件提供 install 安装方法，供按需引入
+Button.install = function(Vue) {
+  Vue.use(Base);
+  Vue.component(Button.name, Button);
+  Vue.component(ButtonGroup.name, ButtonGroup);
+  Vue.component(ButtonPrint.name, ButtonPrint);
+};
+
+Object.assign(Button, {
+  ButtonGroup,
+  ButtonPrint
+});
+
+// 默认导出组件
+export default Button;

package/packages/button/src/Button.jsx

@@ -1,11 +1,11 @@
-/**
- * @author ruanlin
- * @desc 全继承antd按钮组件，后期再扩展
- * @time 2021-05-13
- */
-import { Button } from 'ant-design-vue';
-import create from '@/core/create';
-export default create({
-  name: 'button',
-  extends: Button
-});
+/**
+ * @author ruanlin
+ * @desc 全继承antd按钮组件，后期再扩展
+ * @time 2021-05-13
+ */
+import { Button } from 'ant-design-vue';
+import create from '@/core/create';
+export default create({
+  name: 'button',
+  extends: Button
+});