imatrix-ui 2.8.5 → 2.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,
@@ -13,9 +13,11 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
+    "@tinymce/tinymce-vue": "^3.2.4",
     "@zxing/library": "^0.19.1",
     "js-cookie": "^2.2.0",
-    "sortablejs": "1.10.2"
+    "sortablejs": "1.10.2",
+    "tinymce": "^5.6.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "3.8.0",

package/src/i18n/langs/cn.js

@@ -40,7 +40,8 @@ const cn = {
     switchToAdvancedQuery: '切换为高级查询',
     isNull: '等于Null',
     isNotNull: '不等于Null',
-    previewImage: '预览图片'
+    previewImage: '预览图片',
+    fullScreen: '全屏'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: '是否确认删除',

package/src/i18n/langs/en.js

@@ -40,7 +40,8 @@ const en = {
     switchToAdvancedQuery: 'Switch To Advanced Query',
     isNull: 'Is Null',
     isNotNull: 'Is Not Null',
-    previewImage: 'Preview image'
+    previewImage: 'Preview image',
+    fullScreen: 'Full Screen'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: 'Whether To Confirm Deletion',

package/src/utils/calculator/calculator-factory.js

@@ -45,7 +45,7 @@ class NumberCalculator extends CalculatorFactory {
       this.result = true
     } else if (this.isEQEmptyValue(leftVale, operator, rightValue)) {
       this.result = true
-    } else if (leftVale === null) {
+    } else if (leftVale === undefined || leftVale === null) {
       this.result = false
     } else {
       const preOperand = Number(leftVale + '')
@@ -81,7 +81,7 @@ class TextCalculator extends CalculatorFactory {
       this.result = true
     } else if (this.isNotNullValue(leftVale, operator)) {
       this.result = true
-    } else if (leftVale === null) {
+    } else if (leftVale === undefined || leftVale === null) {
       this.result = false
     } else {
       if (operator === 'NET') {

package/src/utils/util.js

@@ -218,7 +218,7 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
       }
     }
     conditions += conditionResult + ' '
-    if (leftBracket && leftBracket !== null && leftBracket !== '') {
+    if (rightBracket && rightBracket !== null && rightBracket !== '') {
       conditions = conditions + rightBracket
       conditions = conditions + (' ')
       // conditions.append(rightBracket).append(' ')
@@ -237,8 +237,12 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
     }
   }
   console.log('parseCondition----conditions=', conditions)
-  // eslint-disable-next-line no-eval
-  return eval('(' + conditions + ')')
+  if (conditions) {
+    // eslint-disable-next-line no-eval
+    return eval('(' + conditions + ')')
+  } else {
+    return true
+  }
 }
 const REPLACE_DOT = '__'