resolver-egretimp-plus 0.0.8 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "交付体验渲染",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -11,7 +11,7 @@
   "scripts": {
     "build:package": "webpack --config scripts/webpack.config.js",
     "build:theme": "gulp -f scripts/gulpfile.mjs",
-    "build": "pnpm run build:package && pnpm run build:theme"
+    "build": "npm run build:package && npm run build:theme"
   },
   "author": "caowb",
   "license": "ISC",
@@ -21,8 +21,14 @@
     "@vue/babel-plugin-jsx": "^1.2.2",
     "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/compiler-sfc": "^3.4.29",
+    "@vueuse/core": "^10.11.1",
+    "axios": "^1.7.7",
     "babel-loader": "^9.1.3",
     "consola": "^3.2.3",
+    "core-js-pure": "^3.38.1",
+    "css-loader": "^7.1.2",
+    "dayjs": "^1.11.13",
+    "element-plus": "^2.7.6",
     "gulp": "^4.0.0",
     "gulp-autoprefixer": "^9.0.0",
     "gulp-clean-css": "^4.3.0",
@@ -32,15 +38,12 @@
     "lodash-es": "^4.17.21",
     "mini-css-extract-plugin": "^2.9.0",
     "node-sass": "^9.0.0",
-    "sass": "^1.53.0",
+    "sass": "1.77.6",
     "sass-loader": "^14.2.1",
     "vue-loader": "^17.4.2",
+    "vue-style-loader": "^4.1.3",
+    "vue3-quill": "^0.3.1",
     "webpack": "^5.90.0",
     "webpack-cli": "^5.1.4"
-  },
-  "dependencies": {
-    "@vueuse/core": "^10.11.0",
-    "axios": "^1.7.7",
-    "vue3-quill": "^0.3.1"
   }
 }

package/scripts/gulpfile.mjs

@@ -30,7 +30,7 @@ function buildThemeChalk() {
   const sass = gulpSass(dartSass)
   const stream = src(path.resolve(__dirname, '../src/theme/element/index.scss'))
     .pipe(sass({
-      includePaths: ['../node_modules'] // 添加 
+      includePaths: [path.resolve(__dirname, '../node_modules')] // 添加 
     }))
     .pipe(autoprefixer({ cascade: false }))
     .pipe(

package/scripts/webpack.config.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const { VueLoaderPlugin } = require('vue-loader')
+const { VueLoaderPlugin, default: loader } = require('vue-loader')
 
 module.exports = {
   mode: 'production',
@@ -24,7 +24,16 @@ module.exports = {
       },
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
+        use: [
+          {
+            loader: 'vue-loader',
+            options: {
+              compilerOptions: {
+                isCustomElement: tag => tag.startsWith('cmi-')
+              }
+            }
+          }
+        ],
       },
       {
         test: /\.less$/,
@@ -58,6 +67,7 @@ module.exports = {
   },
   externals: {
     vue: 'vue',
+    'cmid-dev': 'cmid-dev',
     'element-plus': 'element-plus',
     'vue-router': 'vue-router',
     'element-plus/es/hooks/index.mjs': 'element-plus/es/hooks/index.mjs',

package/src/index.jsx

@@ -5,7 +5,6 @@ import { usePageConfig } from './hooks/pageConfig'
 import { toValidate } from './utils/valid.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
-
 export default {
   name: 'Resolver',
   props: {

package/src/rules/parseCondition.js

@@ -276,10 +276,22 @@ export function parseRuleForRefCodeAndEvents(rule) {
   const expressObj = JSON.parse(eventExpress)
   const { conditions = [] } = expressObj
   conditions.forEach(condition => {
-    codeRules.push({
-      key: tabpanelCode ? `${tabpanelCode}->${condition.refCode || condition.refValue}` : condition.refCode || condition.refValue,
-      rules: [rule]
-    })
+    if (condition.refType == conditionType.COMPONENT || condition.targetType == conditionType.COMPONENT) {
+      if (condition.refType == conditionType.COMPONENT) {
+        codeRules.push({
+          key: tabpanelCode ? `${tabpanelCode}->${condition.refCode || condition.refValue}` : condition.refCode || condition.refValue,
+          rules: [rule]
+        })
+      }
+      if (condition.targetType == conditionType.COMPONENT) {
+        codeRules.push({
+          key: tabpanelCode ? `${tabpanelCode}->${condition.targetValue}` : condition.targetValue,
+          rules: [rule]
+        })
+      }
+    } else {
+      
+    }
   });
   return codeRules
 }

package/src/rules_b/events.js

@@ -0,0 +1,412 @@
+/**
+ * event：
+ * {
+ *   "targetEventId":"1001",
+ *   "relId":"100000000000005",
+ *   "eventId":"0",
+ *   "eventCode":null,
+ *   "actionType":"0",
+ *   "targetObj":"xiangmuxinxi->CustomerName",
+ *   "targetObjVal":null,
+ *   "targetMsg":null,
+ *   "targetMsgEn":null,
+ *   "state":"1",
+ *   "createTime":"2023-04-13 19:32:01",
+ *   "createOperId":"72523",
+ *   "updateTime":"2023-04-13 19:32:01",
+ *   "updateOperId":"72523"
+ * }
+ */
+import { DISPLAY_HIDDEN, DISPLAY_SHOW } from '../utils'
+import { 
+  getConfigValue,
+  getCurrentComp,
+  greaterThan,
+  setFormVal,
+  lessThan
+} from './ruleUtils'
+
+const eventsMap = {
+  0: 'setHidden',
+  1: 'setRequired',
+  2: 'setDisable',
+  3: 'setClear',
+  4: 'setDefaultValue',
+  5: 'limitDataRange',
+  6: 'setPopup',
+  7: 'openThePage',
+  8: 'setShow',
+  9: 'setNoRequired',
+  10: 'setNoDisable',
+  11: 'setDisableNotEffect',
+  12: 'setRequiredNotEffect',
+  13: 'setNoRequiredNotEffect',
+  14: 'setNoDisableNotEffect',
+  16: 'setProps'
+}
+
+const allInitEvents = {
+  setHidden(event, isInit) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
+    setTimeout(() => {
+      configs.forEach(labelInfo => {
+        labelInfo && (labelInfo.displayType = DISPLAY_HIDDEN)
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = DISPLAY_HIDDEN)
+      })
+    }, 0)
+    
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach((labelInfo) => {
+        labelInfo && (labelInfo.displayType = DISPLAY_SHOW)
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = DISPLAY_SHOW)
+      })
+    }
+  },
+  setRequired(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    configs.forEach(labelInfo => {
+      labelInfo && (labelInfo.requiredFlag = '1')
+      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '1')
+
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach(labelInfo => {
+        labelInfo && (labelInfo.requiredFlag = '0')
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
+      })
+    }
+  },
+  setDisable(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    configs.forEach(labelInfo => {
+      labelInfo && (labelInfo.editFlag = '0')
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach(labelInfo => {
+        labelInfo && (labelInfo.editFlag = '1')
+      })
+    }
+  },
+  setClear(event, isInit, tabpanelCode) {
+    if (isInit) {
+      return
+    }
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    configs.forEach(labelInfo => {
+      if (!labelInfo) return
+      let val = ''
+      if (valArrTypes.includes(labelInfo.labelType)) {
+        val = []
+      }
+      if (valBooleanTypes.includes(labelInfo.labelType)) {
+        val = false
+      }
+      hasOwn(labelInfo, 'refValue') && (labelInfo.refValue = val)
+    })
+  },
+  setDefaultValue(event, isInit, tabpanelCode) {
+    const { targetObj: target, targetObjVal } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    let val = ''
+    try {
+      val = JSON.parse(targetObjVal)
+    } catch (err) {
+      val = targetObjVal
+    }
+    if (typeof val === 'number') {
+      val = `${val}`
+    }
+    if (val === ARG_FLAGS.REF_VAL) {
+      const { config } = this
+      val = config?.bindValue
+    }  else {
+      const _absoluteTarget = /^_absoluteTarget:(.+)$/
+      const matchs = val.match(_absoluteTarget)
+      if (typeof val === 'string' && matchs?.[1]) {
+        const { dynamicMapComp } = this
+        const targetConfig = dynamicMapComp?.[matchs[1]]
+        val = targetConfig?.bindValue || ''
+      } else {
+        const curVal = getConfigValue.call(this, targetObj, true)
+        if (curVal || curVal == '0') {
+          val = curVal
+        }
+      }
+    }
+    setFormVal.call(this, targetObj, val)
+  },
+  limitDataRange(event, isInit, tabpanelCode) {
+    const { targetObj: target, targetObjVal = '' } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const range = targetObjVal.split('~')
+    if (range && range.length) {
+      const min = range[0]
+      const max = range[1]
+      const currentVal = getConfigValue.call(this, targetObj, true)
+      if (min && lessThan(currentVal, min)) {
+        setFormVal.call(this, targetObj, min)
+      }
+      if (max && greaterThan(currentVal, max)) {
+        setFormVal.call(this, targetObj, max)
+      }
+    }
+  },
+  setPopup(event, isInit, tabpanelCode) {
+    const { targetMsg, targetMsgEn } = event
+    const msg = this.lang.value.indexOf('zh') > -1 ? targetMsg : targetMsgEn
+    this.$alert(msg, '', {
+      showCancelButton: false,
+    });
+    // commModal({
+      // msg: storage.get('aid-language').indexOf('zh') !== -1 ? targetMsg : targetMsgEn
+    // })
+    // document && document.body && document.body.click()
+  },
+  openThePage(event, isInit, tabpanelCode) {
+    const { targetObjVal } = event
+    if (targetObjVal) {
+      window.open(targetObjVal, '_blank')
+    }
+  },
+  setShow(event, isInit, tabpanelCode, rule) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    // if (target.indexOf('isSpecialPriceingApproval') > -1) {
+    //   console.log('rule===:', rule)
+    //   debugger
+    // }
+    const configs = getCurrentComp.call(this, targetObj)
+    // const oldDisplayTypes = []
+    // if (target.indexOf('amountBilled') > -1) {
+    //   debugger
+    // }
+    configs.forEach((labelInfo) => {
+      // const oldDisplayType = labelInfo && labelInfo.displayType
+      // oldDisplayTypes.push(oldDisplayType)
+      labelInfo && (labelInfo.displayType = '1')
+      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
+      return setTimeout(() => {
+        // if (target.indexOf('isSpecialPriceingApproval') > -1) {
+        //   console.log('rule===:', rule)
+        //   debugger
+        // }
+        configs.forEach((labelInfo, idx) => {
+          // const oldDisplayType = oldDisplayTypes[idx]
+          labelInfo && (labelInfo.displayType = '0')
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
+        })
+      }, 0)
+    }
+  },
+  setNoRequired(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+
+    const callFns = []
+    configs.forEach(labelInfo => {
+      if (labelInfo && labelInfo.requiredFlag != '0') {
+        labelInfo && (labelInfo.requiredFlag = '0')
+        // 有的事件在不满足条件的情况下，需要进行恢复
+        callFns.push(() => {
+          labelInfo && (labelInfo.requiredFlag = '1')
+        })
+      }
+    })
+    return () => {
+      callFns.forEach(fn => fn())
+    }
+  },
+  setNoDisable(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    configs.forEach((labelInfo) => {
+      labelInfo && (labelInfo.editFlag = '1')
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach((labelInfo) => {
+        labelInfo && (labelInfo.editFlag = '0')
+      })
+    }
+  },
+  setDisableNotEffect(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    const oldEditFlags = []
+    configs.forEach(labelInfo => {
+      const oldEditFlag = labelInfo && labelInfo.editFlag
+      oldEditFlags.push(oldEditFlag)
+      labelInfo && (labelInfo.editFlag = '0')
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach((labelInfo, idx) => {
+        const oldEditFlag = oldEditFlags[idx]
+        labelInfo && (labelInfo.editFlag = oldEditFlag)
+      })
+    }
+  },
+  setRequiredNotEffect(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+
+    const oldRequiredFlags = []
+    configs.forEach(labelInfo => {
+      const oldRequiredFlag = labelInfo && labelInfo.requiredFlag
+      oldRequiredFlags.push(oldRequiredFlag)
+      labelInfo && (labelInfo.requiredFlag = '1')
+      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '1')
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach((labelInfo, idx) => {
+        const oldRequiredFlag = oldRequiredFlags[idx]
+        labelInfo && (labelInfo.requiredFlag = oldRequiredFlag)
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = oldRequiredFlag)
+      })
+    }
+  },
+  setNoRequiredNotEffect(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+
+    const oldRequiredFlags = []
+    configs.forEach(labelInfo => {
+      const oldRequiredFlag = labelInfo && labelInfo.requiredFlag
+      oldRequiredFlags.push(oldRequiredFlag)
+      labelInfo && (labelInfo.requiredFlag = '0')
+    })
+    
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach((labelInfo, idx) => {
+        const oldRequiredFlag = oldRequiredFlags[idx]
+        labelInfo && (labelInfo.requiredFlag = oldRequiredFlag)
+      })
+    }
+  },
+  setNoDisableNotEffect(event, isInit, tabpanelCode) {
+    const { targetObj: target } = event
+    if (!target) return
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const configs = getCurrentComp.call(this, targetObj)
+    const oldEditFlags = []
+    configs.forEach((labelInfo) => {
+      const oldEditFlag = labelInfo && labelInfo.editFlag
+      oldEditFlags.push(oldEditFlag)
+      labelInfo && (labelInfo.editFlag = '1')
+    })
+    
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      configs.forEach((labelInfo, idx) => {
+        const oldEditFlag = oldEditFlags[idx]
+        labelInfo && (labelInfo.editFlag = oldEditFlag)
+      })
+    }
+  },
+  setProps(event, isInit, tabpanelCode, rule) {
+    const { targetObj: target, targetObjVal } = event
+    if (!target) return
+
+    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const { config } = this
+    let val = ''
+    try {
+      val = parseExtendAttr(
+        {
+          extendAttr: targetObjVal,
+          metaCode: `event setPorps code:${config.metaCode}`
+        },
+        config?.bindValue
+      )
+    } catch (err) {
+      val = ''
+    }
+    if (!isPlainObject(val)) return
+
+    const configs = getCurrentComp.call(this, targetObj)
+    const oldPorpsList = []
+    const porpsKeys = Object.keys(val)
+    // if (target.indexOf('amountBilled') > -1) {
+    //   debugger
+    // }
+    configs.forEach((labelInfo) => {
+      let updateFlag = false
+      const oldProps = {}
+      if (!labelInfo) return
+      porpsKeys.forEach(key => {
+        oldProps[key] = labelInfo[key]
+        if (!hasOwn(labelInfo, key)) {
+          // 如果有一个属性没有，就需要更新下组件，防止渲染不及时
+          updateFlag = true
+        }
+        if ((typeof val[key]) === 'string') {
+          const { config } = this
+          const bindValue = config?.bindValue
+          labelInfo[key] = val[key].replace(/\{([^}]+)\}/g, (originVal, matchVal) => {
+            if (matchVal.trimEnd().trimStart() === ARG_FLAGS.REF_VAL) {
+              return bindValue
+            }
+            if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE) {
+              return formatDate(new Date(), 'yyyy-MM-dd')
+            }
+            return originVal
+          })
+        } else {
+          labelInfo[key] = val[key]
+        }
+      })
+      oldPorpsList.push(oldProps)
+      if (updateFlag) {
+        labelInfo?.wrapVm?.ctx?.$forceUpdate?.()
+      }
+    })
+    // 有的事件在不满足条件的情况下，需要进行恢复
+    return () => {
+      // 需要晚点触发，才能正常执行清空等一些列需要组件操作
+      return setTimeout(() => {
+        configs.forEach((labelInfo, idx) => {
+          const oldProps = oldPorpsList[idx]
+          if (!labelInfo) return
+          porpsKeys.forEach(key => {
+            labelInfo[key] = oldProps[key]
+          })
+        })
+      }, 0)
+    }
+  },
+}

package/src/rules_b/index.js

@@ -0,0 +1,13 @@
+
+
+class RuleDriver {
+  constructor() {
+
+  }
+  executeRule(rule) {
+
+  }
+  executeRules(rules) {
+
+  }
+}

package/src/utils/render.jsx

@@ -488,7 +488,7 @@ function generateFormItemPc (config, lang, compProps, params,) {
       return node
     }
 
-    if (!config.needformItem && !config.showFromItem) {
+    if (!config.needformItem && !config.showFormItem) {
       return node
     }
     const slots = {}
@@ -504,7 +504,7 @@ function generateFormItemPc (config, lang, compProps, params,) {
 
 function generateFormItemH5(config, lang, compProps, params) {
   return node => {
-    if (!config.needformItem && !config.showFromItem) {
+    if (!config.needformItem && !config.showFormItem) {
       return node
     }
     const props = {