@nstc-business/imes 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,6 @@
     "element-ui": "^2.15.6",
     "jquery": "^3.6.0",
     "moment": "^2.30.1",
-    "n20-common-lib": "2.5.18",
     "qrcode": "^1.5.0",
     "resize-detector": "^0.3.0",
     "swiper": "^11.1.14",
@@ -40,6 +39,7 @@
     "src/index.js"
   ],
   "devDependencies": {
+    "n20-common-lib": "2.5.18",
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-flow-comments": "^7.14.5",
     "@vue/cli-plugin-babel": "~4.5.0",

package/src/components/common.js

@@ -1,138 +1,4 @@
-import { N } from 'n20-common-lib'
-
-export function formatDate(date, fmt) {
-  date = new Date(date)
-  if (/(y+)/.test(fmt)) {
-    fmt = fmt.replace(
-      RegExp.$1,
-      (date.getFullYear() + '').substr(4 - RegExp.$1.length)
-    )
-  }
-  let o = {
-    'M+': date.getMonth() + 1,
-    'd+': date.getDate(),
-    'h+': date.getHours(),
-    'm+': date.getMinutes(),
-    's+': date.getSeconds()
-  }
-  for (let k in o) {
-    if (new RegExp(`(${k})`).test(fmt)) {
-      let str = o[k] + ''
-      fmt = fmt.replace(
-        RegExp.$1,
-        RegExp.$1.length === 1 ? str : padLeftZero(str)
-      )
-    }
-  }
-  return fmt
-}
-function padLeftZero(str) {
-  return ('00' + str).substr(str.length)
-}
-
-/**
- * 公式转换，支持复杂运算逻辑
- * @param {array} statisticItems 数据映射数组
- * @param {string} formula 公式
- * @returns {object} codeFormula cod公式,randomFormula 随机数公式
- */
-export const replaceStatsNameWithCode = (statisticItems, formula) => {
-  // 创建statsName到code的映射
-  const nameToCodeMap = statisticItems.reduce((map, item) => {
-    if (item.formula) {
-      map[item.statsName] = {
-        formula: item.formula
-      }
-    } else {
-      map[item.statsName] = item.code
-    }
-
-    return map
-  }, {})
-
-  // 创建statsName到随机数的映射
-  const nameToRandomMap = statisticItems.reduce((map, item) => {
-    if (item.formula) {
-      map[item.statsName] = {
-        formula: item.formula
-      }
-    } else {
-      map[item.statsName] = Math.random().toFixed(10)
-    }
-    return map
-  }, {})
-
-  // 增强的正则表达式，支持多层嵌套的复杂表达式
-  const complexPattern =
-    /(?:\([^()]*\)|[\u4e00-\u9fa5a-zA-Z0-9-]+)(?:\s*[+\-*/]\s*(?:\([^()]*\)|[\u4e00-\u9fa5a-zA-Z0-9-]+))*/g
-
-  // 生成code公式
-  const codeFormula = formula.replace(complexPattern, match => {
-    // 处理带括号的表达式
-    const hasParentheses = match.startsWith('(') && match.endsWith(')')
-    const content = hasParentheses ? match.slice(1, -1) : match
-
-    // 先替换括号内的内容
-    const innerReplaced = content.replace(
-      /[\u4e00-\u9fa5a-zA-Z0-9-]+/g,
-      part =>
-        typeof nameToCodeMap[part] === 'object'
-          ? nameToCodeMap[part]?.formula
-          : nameToCodeMap[part] === undefined
-            ? part
-            : `#${nameToCodeMap[part]}#`
-    )
-
-    // 再处理运算符
-    const result = innerReplaced
-      .split(/([+\-*/()])/)
-      .map(part => {
-        const trimmed = part.trim()
-        return nameToCodeMap[trimmed] ? `#${nameToCodeMap[trimmed]}#` : part
-      })
-      .join('')
-
-    return hasParentheses ? `(${result})` : result
-  })
-
-  // 生成随机数公式
-  const randomFormula = formula.replace(complexPattern, match => {
-    // 处理带括号的表达式
-    const hasParentheses = match.startsWith('(') && match.endsWith(')')
-    const content = hasParentheses ? match.slice(1, -1) : match
-
-    // 先替换括号内的内容
-    const innerReplaced = content.replace(
-      /[\u4e00-\u9fa5a-zA-Z0-9-]+/g,
-      part => {
-        const random = nameToRandomMap[part]
-        return typeof random === 'object'
-          ? random.formula
-          : random === undefined
-            ? part
-            : random
-      }
-    )
-
-    // 再处理运算符
-    const result = innerReplaced
-      .split(/([+\-*/()])/)
-      .map(part => {
-        const trimmed = part.trim()
-        const random = nameToRandomMap[trimmed]
-        return random === undefined ? part : random
-      })
-      .join('')
-
-    return hasParentheses ? `(${result})` : result
-  })
-
-  return {
-    codeFormula,
-    randomFormula
-  }
-}
-
+import {N} from 'n20-common-lib'
 /**
  * 设置表格合并行的公共方法
  * @param {any[]} list 表格数据
@@ -142,6 +8,8 @@ export const replaceStatsNameWithCode = (statisticItems, formula) => {
  * @param {String} field 表头取值的字段名
  */
 
+
+
 export function setMergeCells({
   list = [],
   columns = [],
@@ -224,146 +92,6 @@ export const formatFloat2 = (num, digit3 = 2) => {
   return parseFloat(N.subFixed(num, digit3))
 }
 
-/**
- * 校验Table每行字段是否为空
- * @param {Object} requiredFields 字段映射对象，例：{minVal: '最小值', maxVal: '最大值', score: '分数'}
- * @param {Array} data 要验证的数据数组
- * @returns {Error|null} 验证通过返回null，失败返回Error对象
- */
-export const validateFieldPresence = (requiredFields = {}, data = []) => {
-  // 添加参数有效性检查
-  if (!Array.isArray(data)) return new Error('数据参数必须为数组')
-
-  for (const [index, row] of data.entries()) {
-    // 遍历字段映射对象的键
-    for (const field of Object.keys(requiredFields)) {
-      // 添加字段存在性检查
-      if (!Object.prototype.hasOwnProperty.call(row, field)) {
-        return new Error(`第${index + 1}条规则：当前行缺少必要字段[${field}]`)
-      }
-
-      // 加强空值判断
-      if (row[field] === '' || row[field] == null) {
-        return new Error(
-          `第${index + 1}条规则：${requiredFields[field] || field}不能为空`
-        )
-      }
-    }
-  }
-
-  // 明确返回验证通过状态
-  return null
-}
-
-/**
- * 校验数字格式
- * @param {Object} options 配置项
- * @param {Object} options.requiredFields 字段映射对象 {minVal: '最小值', maxVal: '最大值'}
- * @param {Array} options.data 要验证的数据数组
- * @param {RegExp} options.validRegex 验证正则，默认/^-?\d+(?:\.\d{1,6})?$/
- * @returns {Error|null}
- */
-export const validateNumberFormat = ({
-  requiredFields = {},
-  data = [],
-  validRegex = /^-?\d+(?:\.\d{1,6})?$/
-} = {}) => {
-  if (!Array.isArray(data)) return new Error('数据参数必须为数组')
-
-  for (const [index, row] of data.entries()) {
-    for (const [field, fieldName] of Object.entries(requiredFields)) {
-      const value = String(row[field] ?? '') // 处理undefined/null
-
-      if (!validRegex.test(value)) {
-        return new Error(`第${index + 1}条规则：${fieldName}格式不正确`)
-      }
-    }
-  }
-  return null
-}
-
-/**
- * 校验区间重叠
- * @param {Array} data
- * @param {Object} requiredFields = {},
- * @returns
- */
-export const validateRangeOverlap = (
-  data = [],
-  requiredFields = {
-    minVal: '下限',
-    maxVal: '上限'
-  }
-) => {
-  if (!Array.isArray(data)) return new Error('数据参数必须为数组')
-  // 增强参数校验
-  const fields = Object.keys(requiredFields)
-  if (fields.length !== 2) {
-    return new Error('字段映射对象必须且只能包含两个字段[minKey, maxKey]')
-  }
-  const [minKey, maxKey] = fields
-
-  for (let i = 0; i < data.length; i++) {
-    const current = data[i]
-
-    // 合并字段存在性检查
-    for (const key of [minKey, maxKey]) {
-      // 修复属性检查方式，增加对象类型判断
-      if (
-        !current ||
-        typeof current !== 'object' ||
-        !Object.prototype.hasOwnProperty.call(current, key)
-      ) {
-        return new Error(`第${i + 1}条规则：缺少${requiredFields[key]}字段`)
-      }
-      // 空值检查添加到此处
-      if (current[key] === '' || current[key] == null) {
-        return new Error(`第${i + 1}条规则：${requiredFields[key]}不能为空`)
-      }
-    }
-    // 增强数值转换
-    const [minVal, maxVal] = [Number(current[minKey]), Number(current[maxKey])]
-    if (isNaN(minVal)) {
-      return new Error(`第${i + 1}条规则：${requiredFields[minKey]}值无效`)
-    }
-    if (isNaN(maxVal)) {
-      return new Error(`第${i + 1}条规则：${requiredFields[maxKey]}值无效`)
-    }
-    if (minVal >= maxVal) {
-      return new Error(
-        `第${i + 1}条规则：${requiredFields[minKey]}不能大于等于${requiredFields[maxKey]}`
-      )
-    }
-
-    // 优化区间检查性能
-    for (let j = i + 1; j < data.length; j++) {
-      const other = data[j]
-      // 添加对other行的校验
-      if ([minKey, maxKey].some(k => !Object.prototype.hasOwnProperty.call(other, k))) continue
-
-      if (isRangeOverlap(current, other, minKey, maxKey)) {
-        return new Error(`第${i + 1}条和第${j + 1}条规则存在区间重叠`)
-      }
-    }
-  }
-  return null
-}
-
-export const isRangeOverlap = (a, b, minKey = 'minVal', maxKey = 'maxVal') => {
-  const aMin = Number(a[minKey])
-  const aMax = Number(a[maxKey])
-  const bMin = Number(b[minKey])
-  const bMax = Number(b[maxKey])
-
-  return (
-    !isNaN(aMin) &&
-    !isNaN(aMax) &&
-    !isNaN(bMin) &&
-    !isNaN(bMax) &&
-    Math.max(aMin, bMin) < Math.min(aMax, bMax)
-  )
-}
-
 export function toFixedTrunc(num, decimals) {
   if (isNaN(num) || num === undefined || num === null) return num
 
@@ -379,41 +107,4 @@ export function toFixedTrunc(num, decimals) {
 
 export function addThousands(data) {
   return N.addThousands(data)
-}
-
-/**
- * 深度克隆
- * @param target
- * @return {}
- */
-export const deepClone = (target, map = new Map()) => {
-  // 检测数据的类型
-  if (typeof target === 'object' && target !== null) {
-    // 克隆数据之前, 进行判断, 数据之前是否克隆过
-    const cache = map.get(target)
-    if (cache) {
-      return cache
-    }
-    // 判断目标数据的类型
-    const isArray = Array.isArray(target)
-    // 创建一个容器
-    const result = isArray ? [] : {}
-    // 将新的结果存入到容器中
-    map.set(target, result)
-    // 如果目标数据为数组
-    if (isArray) {
-      // forEach 遍历
-      target.forEach((item, index) => {
-        result[index] = deepClone(item, map)
-      })
-    } else {
-      // 如果是对象, 获取所有的键名, 然后 forEach 遍历
-      Object.keys(target).forEach((key) => {
-        result[key] = deepClone(target[key], map)
-      })
-    }
-    return result
-  } else {
-    return target
-  }
-}
+}

package/src/components/{model-calculate/index.vue → model-calculate.vue}

@@ -51,8 +51,8 @@
 
 <script>
 import {N, Page, ExpandablePane, Descriptions} from 'n20-common-lib'
-import tree from './tree.vue'
-import modelCalcTest from './modelCalcTest.vue'
+import tree from './model-calculate/tree.vue'
+import modelCalcTest from './model-calculate/modelCalcTest.vue'
 
 export default {
   props: {