cnhis-design-vue 0.2.35-beta → 0.2.39-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.35-beta",
+  "version": "0.2.39-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/utils/batchEditing.js

@@ -480,7 +480,9 @@ export default {
     handleSubmitParams(batchFormData) {
       let arr = [];
       for (let key in batchFormData) {
-        let matchItem = this.oldtableData.find(v => v[this.primaryKey] === key);
+        // v[this.primaryKey] 可能为数字
+        // key 为字符串 用全等匹配不到 改为 == 
+        let matchItem = this.oldtableData.find(v => v[this.primaryKey] == key);
         let obj = batchFormData[key];
         if (matchItem) {
           obj = Object.assign({}, obj, {

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

@@ -130,7 +130,8 @@ export default {
               param = this.getMsgFieldValue(key, item, isTip);
             }
             if (value.mapping) {
-              param = this.getMappingHTML(value.mapping[param]);
+              // param = this.getMappingHTML(value.mapping[param]);
+              param = this.getMappingHTML(value.mapping.find( v => v.value == param) || {});
             }
             return param || '';
           });

package/packages/select-label/select-label.vue

@@ -376,7 +376,8 @@ export default create({
               showAdd: false,
               itemList: [],
               typeId: item.typeId,
-              typeName: item.typeName
+              typeName: item.typeName,
+              allowCreateByPersonal: item.allowCreateByPersonal
             },choiceTypes[item.typeName] || {}));
           });
           return;
@@ -389,7 +390,8 @@ export default create({
               showAdd: false,
               itemList: false,
               typeId: '',
-              typeName: key
+              typeName: key,
+              allowCreateByPersonal: choiceTypes[key]?.allowCreateByPersonal
             },{...(choiceTypes[key] || {})}));
           } else {
             // 非空，不允许

package/packages/table-filter/src/classification/Classification-com.vue

@@ -435,6 +435,11 @@ import create from '@/core/create';
 export default create({
   name: 'Classification',
   mixins: [filterApiFn],
+  provide() {
+    return {
+      root_isShowResetButton: this.isShowResetButton
+    };
+  },
   components: {
     // Search,
     [Icon.name]: Icon,
@@ -487,6 +492,7 @@ export default create({
     countCondition: { type: Number }, // 是否统计筛选分类，1统计筛选分类，0反之
     countTabCondition: { type: Number }, // 筛选页签是否进行数量统计，1统计筛选页签，0反之
     keyword: { type: String },
+    isShowResetButton: { type: Boolean, default: true }, // 是否显示  恢复默认设置 按钮
     fieldKeys: {
       type: Array,
       default: () => []

package/packages/table-filter/src/components/table-modal/TableModal.vue

@@ -25,7 +25,7 @@
       </div>
     </slot>
     <template #footer v-if="type == 'search'">
-      <a-popconfirm class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
+      <a-popconfirm v-if="isShowResetButton" class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
         <a-button>恢复默认设置</a-button>
       </a-popconfirm>
 
@@ -144,6 +144,7 @@ import draggable from 'vuedraggable';
 import svgIcon from '@/component/svg/index.vue';
 export default {
   mixins: [filterApiFn],
+  inject: { isShowResetButton: { from: 'root_isShowResetButton' } },
   props: {
     visibleIn: Boolean,
     loading: Boolean,

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

@@ -206,7 +206,7 @@
                       'font-family': item.PASSWORDTYPE ? 'text-security-disc' : 'inherit'
                     }"
                     v-model="item.EQ"
-                    :placeholder="item.isPreciseSearch ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
+                    :placeholder="item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
                     allowClear
                   >
                     <template slot="suffix" v-if="item.comAttr == 'PASSWORD'">
@@ -515,7 +515,7 @@
                         class="EQ-input"
                         style="width: 200px"
                         v-model="item.EQ"
-                        :placeholder="item.isPreciseSearch ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
+                        :placeholder="item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
                         allowClear
                       >
                       </a-input>