cnhis-design-vue 2.1.36 → 2.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.36",
+  "version": "2.1.39",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

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

@@ -88,8 +88,8 @@
       }"
       :row-style="getRowStyle"
       :edit-config="{ trigger: 'manual', mode: 'row', autoClear: false, showIcon: false }"
-      :scroll-x="{ enabled: false }"
-      :scroll-y="{ gt: 50 }"
+      :scroll-x="{ gt: 25 }"
+      :scroll-y="{ gt: 50, mode: 'wheel' }"
       :expand-config="{
         lazy: true,
         accordion: columnConfig && columnConfig.accordion,
@@ -782,14 +782,14 @@ export default create({
       // [{"dept_id":996,"dept_name":"高手","user_name":"我是李高手"}]
       let str = row[item.columnName];
       if (vexutils.isJSON(str)) {
-        let hasNameField = str.includes('user_name');
         let obj = JSON.parse(str);
         if (Array.isArray(obj)) {
           let len = obj.length;
+          let showName = obj[0]?.user_name || obj[0]?.name;
           if (len > 1) {
             return `已选${len}人`;
           } else if (len === 1) {
-            return (hasNameField && obj[0]?.user_name) || `已选${len}人`;
+            return (showName) || `已选${len}人`;
           }
         }
       }
@@ -905,7 +905,7 @@ export default create({
       const html = formatFieldText(row, item, this.columnConfig.fieldList, this.fieldListOriginal);
       let tips = this.handleValueTips(row, item);
 
-      const content = [isLink && html ? <a on-click={e => this.linkDetail(row, item, index, e)} domPropsInnerHTML={html} /> : <span class="domPropsInnerHTML-span" domPropsInnerHTML={html} />];
+      const content = [isLink && html ? <a class="c-field-content" on-click={e => this.linkDetail(row, item, index, e)} domPropsInnerHTML={html} /> : <span class="domPropsInnerHTML-span" domPropsInnerHTML={html} />];
 
       if (this.isCopy(item, row)) {
         return [

package/packages/big-table/src/assets/style/table-base.less

@@ -195,6 +195,15 @@ body {
     .vxe-cell .vxe-tree-cell {
       height: 100%;
     }
+    .vxe-cell {
+      .c-field-content {
+        max-width: 100%;
+        display: inline-block;
+        text-overflow: ellipsis;
+        word-break: keep-all;
+        overflow: hidden;
+      }
+    }
 
     .scan-multi-delete {
       color: #F06F64;

package/packages/fabric-chart/src/fabric-chart/FabricPolylines.vue

@@ -616,7 +616,7 @@ export default {
           // 拖动新增节点时默认所有节点可删除
           this.currentDelPoint = null;
         });
-        const lastPoint = this.addPointList.at(-1);
+        const lastPoint = this.addPointList[this.addPointList.length - 1];
         const position = this.polyline[point.polylineTypeId].position;
         const [firstPoint] = this.addPointList;
         // 如果是重合/连线节点

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

@@ -134,9 +134,6 @@
                 </a-button>
               </a-input-search>
             </li>
-            <a-button v-if="showRelatedSetting"  type="primary"  style="margin-right: 8px; margin-bottom: 8px" @click="relatedSetting" >
-              <a-icon type="setting" />
-            </a-button>
             <template v-if="rowTileBtnListTree && rowTileBtnListTree.length === 1">
               <a-button type="primary" style="margin-right: 8px; margin-bottom: 8px" @click="handleAddType(rowTileBtnListTree[0])">
                 {{ rowTileBtnListTree[0].alias || rowTileBtnListTree[0].name }}
@@ -789,9 +786,6 @@ export default create({
     },
     showBaseTabs() {
       return this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing;
-    },
-    showRelatedSetting() {
-      return !!this.relatedBaseInfo?.showSetting;
     }
   },
   data() {
@@ -1648,9 +1642,6 @@ export default create({
         console.log(error);
       }
     },
-    relatedSetting() {
-      this.$emit('relatedSetting')
-    },
     handleAddType(btn) {
       const btnObj = utils.getRowOperatorIdSetting({}, btn);
       let setData = JSON.parse(btnObj.setting);

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

@@ -426,12 +426,12 @@ export const outQuickSearchFn = {
           this.$set(el, "com", "SelectMui");
           this.$set(el, "comType", "SelectMui");
           this.$set(el, "value", tvalue);
-          const labelList = el.setting.showSetting.map(i => {
+          const labelList = el.setting?.showSetting.map(i => {
             i.labelName = i.change_text;
             return i;
           });
           this.$set(el, "labelList", labelList);
-        } else if (!this.$utils.isEmpty(el.setting.wordbook) && wordbookId) {
+        } else if (!this.$utils.isEmpty(el.setting?.wordbook) && wordbookId) {
           // TODO:
           // 存在映射 wordbook
           let isTree = "tree" === el?.setting?.wordbook?.showType;
@@ -507,7 +507,7 @@ export const outQuickSearchFn = {
               });
               this.$set(el, "labelList", list);
             } else {
-              this.handleSetLabelOptions(el.setting.labelType, el);
+              this.handleSetLabelOptions(el.setting?.labelType, el);
             }
           } else if ("PASSWORD" === attr) {
             this.$set(el, "con", el.fieldType === "NUMBER" ? "EQ" : textCon);

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

@@ -245,7 +245,7 @@
                       :placeholder="getI18nText('1.1.4.53', '开始时间')"
                       style="width: 120px"
                       allowClear
-                      :disabledDate="current => disabledDatePicker(current, item)"
+                      :disabledDate="current => disabledDatePicker(current, item, 'start')"
                     />
                      
                     <a-date-picker
@@ -257,7 +257,7 @@
                       v-model="item.DATE.end_val"
                       style="width: 120px"
                       allowClear
-                      :disabledDate="current => disabledDatePicker(current, item)"
+                      :disabledDate="current => disabledDatePicker(current, item, 'end')"
                     />
                   </div>
                 </a-radio-group>
@@ -360,7 +360,7 @@
               <a-checkbox-group
                 class="check-box"
                 v-else-if="item.con == 'CONVERT'"
-                :options="item.setting.showSetting"
+                :options="item.setting&&item.setting.showSetting"
                 v-model="item.CONVERT"
               />
             </slot>
@@ -606,7 +606,7 @@
                   <a-checkbox-group
                     class="check-box"
                     v-else-if="item.con == 'CONVERT'"
-                    :options="item.setting.showSetting"
+                    :options="item.setting&&item.setting.showSetting"
                     v-model="item.CONVERT"
                   />
                 </slot>
@@ -1040,7 +1040,7 @@ export default create({
           //  单选
            let optionSetting0  =String(advanceOptionSetting) == '0';
            let wordbookId = el?.setting?.wordbook?.id;
-          if (vexutils.anyNotEmpty(el.setting.wordbook) && wordbookId) {
+          if (vexutils.anyNotEmpty(el.setting?.wordbook) && wordbookId) {
             let isTree = "tree" === el?.setting?.wordbook?.showType;
             let comType = isTree ? 'treeSelect' : 'SelectMuiWordBook';
             let defVal = isTree ? [] : [];
@@ -1096,17 +1096,17 @@ export default create({
             return;
           }
         }
-        if (el.setting.attr === "LABEL") {
+        if (el.setting?.attr === "LABEL") {
           this.$set(el, "con", "CL"); // 2020-09-04 朱亚徽 EQ => CL
           this.$set(el, "LABELAttr", true);
           this.$set(el, "labelSelectList", []);
           this.$set(el, "inputVal", "");
           this.handleSetLabelOptions(el.setting.labelType, el);
-        } else if (el.setting.attr === "EVALUATE") {
+        } else if (el.setting?.attr === "EVALUATE") {
           this.$set(el, "con", "CL");
           this.$set(el, "selecteds", []);
           this.$set(el, "EVALUATEAttr", true);
-        } else if (el.setting.attr === "AGE" && el.fieldType != "NUMBER") {
+        } else if (el.setting?.attr === "AGE" && el.fieldType != "NUMBER") {
           // 年龄组件
           let format = el.setting.format || "YYYY-MM-DD";
           format = format.toUpperCase();
@@ -1114,7 +1114,7 @@ export default create({
           this.$set(el, "ageObj", {});
           this.$set(el, "format", format);
           this.$set(el, "AGEAttr", true);
-        } else if (el.setting.attr === "PASSWORD") {
+        } else if (el.setting?.attr === "PASSWORD") {
           this.$set(el, "comAttr", "PASSWORD");
           this.$set(el, "PASSWORDTYPE", true);
         } else if (el.fieldType == "NUMBER") {
@@ -1123,7 +1123,7 @@ export default create({
           this.$set(el, "NUMBERFiled", true);
           this.$set(el, "lessValue", "");
           this.$set(el, "bigValue", "");
-          if (el.setting.attr == "PERCENTAGE") {
+          if (el.setting?.attr == "PERCENTAGE") {
             this.$set(el, "inputUnit", "%");
           }
         } else if (el.fieldType.includes("DATE")) {
@@ -1233,18 +1233,18 @@ export default create({
        if (item.comType == "SelectMui" && String(item.advanceOptionSetting) === '0') return;
       if (open) {
         let obj = {};
-        if (item.setting.wordbook.params) {
-          item.setting.wordbook.params.forEach(item => {
+        if (item.setting?.wordbook?.params) {
+          item.setting?.wordbook?.params?.forEach(item => {
             obj[item.p_name] = item.p_value;
           });
         }
         if (item.settingObj.wordbook) {
           obj.autograph = item.settingObj.wordbook.autograph;
         }
-        this.curWordbookData = item.setting.wordbook;
+        this.curWordbookData = item.setting?.wordbook;
         this.curAutograph = item.settingObj.wordbook && item.settingObj.wordbook.autograph;
         this.searchItem = item;
-        this.getWordbookData(item.setting.wordbook, obj).then(({ data }) => {
+        this.getWordbookData(item.setting?.wordbook, obj).then(({ data }) => {
           this.handleWordbookData(item, data, obj);
         });
       }
@@ -1261,7 +1261,7 @@ export default create({
       let obj = {};
       let p = item?.setting?.wordbook?.params || undefined;
       if (p) {
-        item.setting.wordbook.params.forEach(item => {
+        item.setting?.wordbook?.params?.forEach(item => {
           obj[item.p_name] = item.p_value;
         });
       }
@@ -1864,19 +1864,27 @@ export default create({
     /**
      * 限制日期填写
      */
-    disabledDatePicker(current,item){
+    disabledDatePicker(current, item, t){
+      let f = false;
+      if(t=== 'start'){
+         const end_val = item?.DATE?.end_val;
+         f = end_val && current.valueOf() > end_val.valueOf();
+      } else if(t=== 'end') {
+        const start_val = item?.DATE?.start_val;
+         f = start_val && current.valueOf() <= start_val.valueOf();
+      }
       /**
        * 2 过去时间
        * 3 未来时间
        */
       let type = String(item?.advanceOptionSetting);
-      if(!['2','3'].includes(type)) return false;
+      if(!['2','3'].includes(type)) return f;
       if(type === '2'){
-         return current >= this.$moment().endOf('day');
+         return current >= this.$moment().endOf('day') || f;
       } else if(type==='3'){
-         return current && current < this.$moment().startOf('day');
+         return current && current < this.$moment().startOf('day') || f;
       }
-      return false
+      return f
     },
     /**
      * 限制时间