cnhis-design-vue 0.1.81-beta → 0.1.85-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.1.81-beta",
+  "version": "0.1.85-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/big-table/src/BigTable.vue

@@ -285,6 +285,9 @@ export default create({
       }
       return this.primaryKey || 'theUniqueKey';
     },
+    handlePrimaryKey() {
+      return this.isTree > 0 ? this.primaryKey || "theUniqueKey" : "theUniqueKey";
+    },
     handleName() {
       return function(item, key = 'name') {
         return item.alias || item[key];
@@ -1465,6 +1468,8 @@ export default create({
       };
     },
     setFilterStatus() {
+      // 表头没有过滤字段 不需要设置
+      if(!this.filterFields || !Object.keys(this.filterFields).length) return;
       let val = this.quickSearchConfig;
 
       if (!val || !val.length) {
@@ -1477,17 +1482,22 @@ export default create({
       // 修复 val长度和this.filterFields个数对不上 会少清空选中项
       for (let key in this.filterFields) {
         let item = this.filterFields[key];
-        this.$set(item, 'CONVERT', []);
+        item && this.$set(item, 'CONVERT', []);
       }
 
       val.forEach(item => {
-        if (!this.filterFields[item.field_key]) {
-          this.$set(this.filterFields[item.field_key], 'CONVERT', []);
-          return false;
-        }
+        let itemKey = item.field_key;
+        // 参与搜索的字段必须在 filterFields中
+        if (itemKey in this.filterFields) {
 
-        let value = item.value.map(item => JSON.stringify(item));
-        this.$set(this.filterFields[item.field_key], 'CONVERT', value);
+          if (!this.filterFields[item.field_key]) {
+            this.$set(this.filterFields[item.field_key], 'CONVERT', []);
+            return false;
+          }
+  
+          let value = item.value.map(item => JSON.stringify(item));
+          this.$set(this.filterFields[item.field_key], 'CONVERT', value);
+        }
       });
     },
     handlerInitSearchItem(arr) {
@@ -2619,7 +2629,7 @@ export default create({
       this.$refs.xGrid.setCurrentRow(row);
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
-      this.$emit('linkDetail', row, col, row[this.handleRowId], null, false, index);
+      this.$emit('linkDetail', row, col, row[this.handlePrimaryKey], null, false, index);
     },
     // 按钮事件
     clickBtn(row, btn, index, e, j) {
@@ -2628,7 +2638,7 @@ export default create({
       this.recordClickBtnInfo(row, index);
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
-      this.$emit('clickBtn', row, btn, row[this.handleRowId], index);
+      this.$emit('clickBtn', row, btn, row[this.handlePrimaryKey], index);
       // this.handleTopBtnTracher(btn, j);
     },
     recordClickBtnInfo(row, index) {

package/packages/multi-chat/chat/chatFooter.vue

@@ -167,6 +167,7 @@ import QuickReply from './quickReply';
 import voice from './voice';
 import ModalUserTransfer from '../components/modal-user-transfer';
 import ModalRefuseReason from '../components/modal-refuse-reason';
+import vexutils from '@/utils/vexutils';
 export default {
   inject: ['store', 'i18nText', 'dispatchEvent', 'registerEvent', 'unregisterEvent'],
   components: {
@@ -226,7 +227,9 @@ export default {
       curToolbarItem: {},
       showVoice: false,
       transferVisible: false,
-      refuseVisible: false
+      refuseVisible: false,
+
+      apiResult: {}, // 前置条件的返回值
     };
   },
   computed: {
@@ -307,9 +310,9 @@ export default {
     },
     // 拦截url
     accessInterceptUrl() {
-      const { accessInterceptObj: obj } = this;
+      const { accessInterceptObj: obj, apiResult } = this;
       if (obj) {
-        return this.getLinkAddress(obj);
+        return this.getLinkAddress(obj,{result:apiResult});
       }
       return '';
     },
@@ -830,18 +833,25 @@ export default {
       this.modalShow = false;
       window.removeEventListener('message', this.iframeEvent);
     },
-    getLinkAddress(item) {
+    getLinkAddress(item,paramsData= {}) {
+      let t = {talbe:{},form:{},sys:{}};
+      Object.assign(t,paramsData ||{})
       let { address = '', params = [] } = item;
       let urlParams = [];
       params.forEach(({ p_name, p_value }) => {
         let value;
         if (p_value.startsWith('form.')) {
           value = this.clientParams[p_value.slice(5)];
+        } else if( /\${result.(.*?)\}/g.test(p_value)) {
+          value = vexutils.handleSysParams(p_value,t)
         } else {
           value = p_value;
         }
         urlParams.push(`${p_name}=${value}`);
       });
+      if(/\${result.(.*?)\}/g.test(address)){
+        address = vexutils.handleSysParams(address,t)
+      }
       let { actionType } = this.curToolbarItem;
       actionType && urlParams.push(`actionType=${actionType}`);
       if (address.includes('?')) {
@@ -1033,6 +1043,7 @@ export default {
     },
     /* 客服点击接入按钮进入会话 */
     async handleAccess() {
+      this.apiResult = {};
       let accessInterceptValidate = this.handleAccessInterceptValue();
       let data = null; // 接口参数
       if (accessInterceptValidate && this.accessInterceptUrl) {
@@ -1087,12 +1098,14 @@ export default {
           data
         };
       }
+      this.apiResult = {};
       const accessInterceptSetting = this.assemblySetting.accessInterceptSetting || [];
       const setting = accessInterceptSetting.find(item => item.source == 'PC' && item.isChecked == 'Y' && item.precondition);
       if (setting) {
         const precondition = setting.precondition;
         try {
-          const res = await this.requestPreCondition(precondition);
+          let res = await this.requestPreCondition(precondition);
+          this.apiResult = res?.data?.map || {};
           if (res.data.result === 'SUCCESS') {
             let value = res.data.map?.result;
             value = value ? JSON.parse(value) : {};

package/packages/multi-chat/chat/scrollList.vue

@@ -380,7 +380,7 @@ export default {
       const dateParams = this.dateParams;
       if (dateParams?.length) {
         const fmt = 'YYYY-MM-DD';
-        params.beginDate = dateParams[0].format(fmt) + ' 00:00:00';
+        params.startDate = dateParams[0].format(fmt) + ' 00:00:00';
         params.endDate = dateParams[1].format(fmt) + ' 23:59:59';
       }
       return params;

package/packages/scale-view/formitem/r-choice.vue

@@ -79,7 +79,7 @@
       :disabled="isLock"
       @search="handleSearch"
       @change="handleSelectChange"
-      :getPopupContainer="triggerNode => triggerNode.parentNode"
+      :getPopupContainer="getPopupContainer"
       :filterOption="filterOption"
       :notFoundContent="fetching ? undefined : '暂无数据'"
     >
@@ -131,6 +131,7 @@ export default {
       type: Function,
       default: () => Promise.resolve([])
     },
+    openType: { type: String, default: "" }
   },
   components: {
     // TextOverTooltip,
@@ -428,6 +429,12 @@ export default {
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    },
+    getPopupContainer(triggerNode) {
+      if(this.openType == 'formIframe') {
+        return document.body;
+      }
+      return triggerNode.parentNode;
     }
   }
 };

package/packages/scale-view/scaleView.vue

@@ -153,6 +153,7 @@
                       :item="item"
                       :isLock="componentDisable"
                       :curIndex="index"
+                      :openType="openType"
                       @change="handleChoice($event, item)"
                       @radioChange="radioChange"
                       @checkboxChange="checkboxChange"
@@ -313,7 +314,8 @@ export default create({
         small: 1,
         extrasmall: 0.9
       })
-    }
+    },
+    openType: { type: String, default: "" }
   },
   components: {
     MyChoice,
@@ -1294,19 +1296,31 @@ export default create({
         this.confirmSubmit("确认要提交吗？");
         return;
       }
+
       // 包含测评组件，不包含考试时长，点击提交，弹出二次确认对话框，确认要结束测评吗？
       // 判断有无测评配置 并且在测评时间内
-      // 无倒计时
       let { evaluateResultSetting } = this.config;
-      let countdownDom = this.$refs.evaluateCountdown;
       if (
         !evaluateResultSetting ||
-        (!Object.keys(evaluateResultSetting).length && !this.showEvaluateEntry) ||
-        !countdownDom?.showEvaluateCountdown
+        (!Object.keys(evaluateResultSetting).length && !this.showEvaluateEntry)
       ) {
         this.confirmSubmit("确认要结束测评吗？");
         return;
       }
+
+      // 表单内嵌量表, 没有开始答题, 不需要调用保存接口
+      if (this.openType == "formIframe" && this.showEvaluateEntry) {
+        this.$emit("submitNoRequest");
+        return;
+      }
+
+      // 无倒计时
+      let countdownDom = this.$refs.evaluateCountdown;
+      if(!countdownDom?.showEvaluateCountdown) {
+        this.confirmSubmit("确认要结束测评吗？");
+        return;
+      }
+
       // 在倒计时内
       let message = "确认要提前结束测评吗？";
       let setAnswered = this.$refs.evaluateCountdown?.setAnswered;

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

@@ -1773,7 +1773,7 @@ export default create({
       try {
         const print = { formatId, number };
         // 执行打印后置条件
-        const result = await this.postStepRule(printBtn.settingObj, {
+        const result = await this.printConfig.postStepRule(printBtn.settingObj, {
           result: res,
           print: print
         });

package/packages/table-filter/src/components/multi-select/multi-select.vue

@@ -24,7 +24,7 @@
         v-for="(sea, k) in item.dataSource"
         :key="item.sid + sea.myName"
         :value="sea.myName"
-        :title="sea.showKeys || sea.myName"
+        :title="sea._show_title || sea.showKeys || sea.myName"
         :disabled="k === 0 && hasShowKeys && item.hasFieldList"
       >
         <div
@@ -37,7 +37,7 @@
           <span style="flex: 1;" v-for="(v1, k1) in sea.showKeys.split('<&=&>')" :key="k1" class="c-s-content-item">{{ v1 }}</span>
         </div>
         <span v-else>
-          {{ sea.showKeys || sea.myName }}
+          {{sea._show_title || sea.showKeys || sea.myName }}
         </span>
       </a-select-option>
     </template>

package/packages/table-filter/src/mixins/wordBookutils.js

@@ -40,7 +40,8 @@ const formatWordbookDataUtils = {
         let name = vexutils.stringToValue(row[item.setting.wordbook.field_key],'value')
         return Object.assign(row, {
           myName: name,
-          showKeys: showKeysStr.join(SYMBOL)
+          showKeys: showKeysStr.join(SYMBOL),
+          _show_title: showKeysStr.join(" ")
         });
       });
       // 数组对象去重

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -975,7 +975,7 @@ export default create({
         if (el.setting) {
           // el.seting 可能是 string / object
           el.setting = typeof el.setting == "string" ? JSON.parse(el.setting) : el.setting;
-          if (!this.$utils.isEmpty(el.setting.wordbook)) {
+          if (!vexutils.isEmpty(el.setting.wordbook)) {
             this.$set(el, "con", "QUOTE");
             this.$set(el, "dataSource", []);
             this.$set(el, "QUOTE", []);
@@ -1261,12 +1261,12 @@ export default create({
           if (item.EVALUATEAttr) {
             value = item.selecteds.join("|#|");
           }
-        } else if (item.con == "QUOTE" && !this.$utils.isEmpty(item.value)) {
+        } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           // value = item.QUOTE.join("|#|");
           value = item.value.join("|#|");
-        } else if (!this.$utils.isEmpty(item.CONVERT)) {
+        } else if (!vexutils.isEmpty(item.CONVERT)) {
           value = item.CONVERT.map(item => {
-            if (item && this.$utils.isJSON(item)) {
+            if (item && vexutils.isJSON(item)) {
               return JSON.parse(item);
             }
             return item;
@@ -1301,7 +1301,7 @@ export default create({
 
           // 校验
           if (item.BIRTHDAY.start_val) {
-            let res = this.$utils.validateBirthday(
+            let res = vexutils.validateBirthday(
               item.BIRTHDAY.start_val,
               item.title,
               item.BIRTHDAY.unit
@@ -1309,7 +1309,7 @@ export default create({
             if (!res) return;
           }
           if (item.BIRTHDAY.end_val) {
-            let res = this.$utils.validateBirthday(
+            let res = vexutils.validateBirthday(
               item.BIRTHDAY.end_val,
               item.title,
               item.BIRTHDAY.unit
@@ -1349,7 +1349,7 @@ export default create({
           }
         }
         // 删除字符串前后空格
-        if (value && this.$utils.isString(value)) {
+        if (value && vexutils.isString(value)) {
           value = value.trim();
         }
         let temp = {
@@ -1519,10 +1519,10 @@ export default create({
         if (item.EQ || item.CL) {
           item.EQ = "";
           item.CL = "";
-        } else if (item.con == "QUOTE" && !this.$utils.isEmpty(item.value)) {
+        } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           item.QUOTE = [];
           item.value = [];
-        } else if (!this.$utils.isEmpty(item.CONVERT)) {
+        } else if (!vexutils.isEmpty(item.CONVERT)) {
           item.CONVERT = [];
         } else if (item.DATE) {
           item.showDate = false;

package/src/utils/vexutils.js

@@ -698,6 +698,76 @@ XEUtils.mixin({
       }
     return item;
   },
+
+  notEmpty(text) {
+    return XEUtils.isBoolean(text) || String(text) === "0" || !!text;
+  },
+
+    /**
+   * 变量转换
+   * @param {string} str
+   * @param {object} obj
+   * @param {string | number} noval // 没有值，默认赋值
+   */
+     handleSysParams(str, obj = {}, noval = "") {
+      let p = {
+        ...obj
+      };
+      const that = this;
+      // 解析变量
+      const getValList = (plsList = [], obj = {}) => {
+        var l = [];
+        var o = obj;
+        plsList.forEach(v => {
+          let c = v;
+          // xx.xx
+          if (v.includes(".")) {
+            try {
+              // 使用 eval 解析 'result.map.map.filed'
+              eval(`c=o.${v}`);
+            } catch (error) {
+              c = "";
+            }
+          }
+          if (XEUtils.notEmpty(c)) {
+            l.push(c);
+          }
+        });
+        return l;
+      };
+      const getVal = (t, r, k) => {
+        return t.replace(r, function() {
+          var pKey = arguments[1];
+          // 切割
+          var pls = pKey.split("!");
+          // 取值
+          var l = getValList(pls, p);
+          var f = l.find(v => XEUtils.notEmpty(v));
+          var res = f;
+          res = XEUtils.notEmpty(res) ? res : noval;
+          return res;
+        });
+      };
+      if (typeof str === "string") {
+        if (str.includes("form")) {
+          str = getVal(str, /\${(.*?)\}/g, "form");
+        }
+        if (str.includes("sys")) {
+          str = getVal(str, /\${(.*?)\}/g, "sys");
+        }
+        if (str.includes("db")) {
+          str = getVal(str, /\${(.*?)\}/g, "db");
+        }
+        if (str.includes("table")) {
+          str = getVal(str, /\${(.*?)\}/g, "table");
+        }
+        if (str.includes("result")) {
+          str = getVal(str, /\${(.*?)\}/g, "result");
+        }
+      }
+      return str;
+    },
+
 });
 
 export default XEUtils;