cnhis-design-vue 0.2.28-beta → 0.2.32-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.28-beta",
+  "version": "0.2.32-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

@@ -396,6 +396,7 @@ export default create({
       if (this.isNestTable) return;
       if (Object.keys(this.columnConfig).length > 0) {
         this.loadColumn(this.columnConfig);
+        this.loadData(this.data);
         this.setTalbeScrollTo();
       }
     },

package/packages/drag-layout/drag-layout.vue

@@ -422,6 +422,9 @@ export default create({
   created() {},
   mounted() {
     this.mountedInit();
+    this.$nextTick().then(() => {
+      this.$el.querySelector('.text-area').style.height = this.$el.clientHeight + 'px';
+    });
   },
   methods: {
     mountedInit() {
@@ -722,6 +725,7 @@ export default create({
       align-items: flex-start;
       padding: 0 12px 12px;
       box-sizing: border-box;
+      align-content: flex-start;
       li {
         width: 49%;
         text-align: center;

package/packages/editor/src/Editor.vue

@@ -18,6 +18,17 @@ export default create({
     config: {
       type: Object,
       default: () => {}
+    },
+    isDisabled: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: String
+    },
+    uploadImgUrl: {
+      type: String,
+      default: '/hospitalUpload/picture'
     }
   },
   components: {},
@@ -26,7 +37,8 @@ export default create({
   data() {
     return {
       editor: null,
-      editorWrapId:'editorWrapId'
+      editorWrapId: 'editorWrapId',
+      newHtml: ''
     };
   },
   mounted() {
@@ -48,11 +60,70 @@ export default create({
           return str;
         });
       };
-      
+
       this.editor.config.colors = this.editor.config.colors.concat(colors);
-      this.editor.config = Object.assign({}, this.editor.config, this.config);
+      this.editor.config = Object.assign(
+        {},
+        this.editor.config,
+        {
+          customUploadImg: this.customUploadImg,
+          onchange: this.onchange
+        },
+        this.config
+      );
       this.editor.create();
-      this.$emit('ready')
+      this.$emit('ready');
+      this.setWatch();
+    },
+    setWatch() {
+      this.setContent(this.value || '');
+
+      this.disable(this.isDisabled);
+
+      this.$watch('isDisabled', val => {
+        this.disable(val);
+      });
+      this.$watch('value', val => {
+        if (this.newHtml != val) {
+          this.setContent(val);
+        }
+      });
+    },
+    /**
+     * 自定义图片上传
+     */
+    customUploadImg(resultFiles, insertImgFn) {
+      // resultFiles 是 input 中选中的文件列表
+      // insertImgFn 是获取图片 url 后，插入到编辑器的方法
+      // 上传图片，返回结果，将图片插入到编辑器中
+      let [file] = resultFiles || [];
+      let params = new FormData();
+      params.append('file', file);
+      console.log(this.axios, '-----------');
+      this.axios
+        .post(this.uploadImgUrl, params)
+        .then(({ data }) => {
+          if (data.result === 'SUCCESS') {
+            console.log(data);
+            let url = data?.map?.url;
+            url && insertImgFn(url);
+          } else {
+            this.$message.error(data.resultMsg || '上传失败！');
+          }
+        })
+        .catch(err => {
+          this.$message.error(err.resultMsg || '上传失败！');
+        });
+    },
+    /**
+     * 内容发生改变
+     */
+    onchange(newHtml) {
+      console.log('change 之后最新的 html', newHtml);
+      let res = newHtml;
+      this.newHtml = newHtml;
+      this.$emit('change', res);
+      this.$emit('input', res);
     },
     setContent(content) {
       this.editor.txt.html(content);
@@ -92,11 +163,7 @@ export default create({
     },
 
     randomId(len) {
-      return (
-       'id'+ Math.random()
-          .toString(36)
-          .substr(3, len) + new Date().getTime()
-      );
+      return 'id' + Math.random().toString(36).substr(3, len) + new Date().getTime();
     }
   },
   beforeDestroy() {

package/packages/multi-chat/store/actions.js

@@ -412,9 +412,10 @@ export default {
         commit("setOuting", cloneOuting);
       }
     };
-    commit("setUniRTC", uniRTC);
-    setTimeout(async () => {
-      console.log('本机设备token->', uniRTC.deviceToken);
+    
+    let timer = null;
+    let n = 0;
+    const registerDeviceToken = async () => {
       const res = await fetch.post('/chat/service/registerDeviceToken', qs.stringify({
         ...params,
         deviceToken: uniRTC.deviceToken,
@@ -422,6 +423,23 @@ export default {
       if (res.data?.result !== 'SUCCESS') {
         console.log(res.data.resultMsg);
       }
-    }, 1500);
+    };
+
+    timer && clearInterval(timer);
+    timer = setInterval(() => {
+      console.log('轮询本机设备token->', uniRTC.deviceToken);
+      n++;
+      if (!uniRTC.deviceToken) {
+        if (n > 60) {
+          timer && clearInterval(timer);
+          return;
+        }
+        uniRTC.reconnect();
+      } else {
+        timer && clearInterval(timer);
+        registerDeviceToken();
+      }
+    }, 1000);
+    commit("setUniRTC", uniRTC);
   }
 };

package/packages/scale-view/scaleView.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="r-scale">
     <slot v-if="spinning">
-      <a-spin :indicator="indicator" />
+      <a-spin :indicator="indicator" tip="加载中..." />
     </slot>
-    <slot v-else>
+    <slot v-if="!spinning && !hasFrontAddress">
       <div v-if="noData">暂无数据</div>
       <!-- <NoData v-if="noData" :noDataImg="noDataImg" :noDataTip="noDataTip"></NoData> -->
       <template v-else>
@@ -598,7 +598,8 @@ export default create({
       isFinished: false,
       maxScore: 0,
       originConfig: {},
-      paramsEvaluate: null
+      paramsEvaluate: null,
+      hasFrontAddress: true
     };
   },
   mounted() {
@@ -618,6 +619,7 @@ export default create({
         this.initForm(configData);
       } catch (error) {
         this.spinning = false;
+        this.hasFrontAddress = false;
         this.setNoData(true, error?.resultMsg, error?.result);
       }
     },
@@ -627,7 +629,11 @@ export default create({
     },
     initForm(data) {
       let { list = [], map = {}, isFinished = false } = data;
-      this.handleFrontAddress(list);
+      let curUrl = this.handleFrontAddress(list);
+      if (curUrl) {
+        window.location.href = curUrl;
+        return;
+      }
       map.maxScore && (this.maxScore = map.maxScore);
       this.isFinished = isFinished;
       if (data.isLackCustomer) {
@@ -670,13 +676,14 @@ export default create({
       this.rules = this.formatRules(this.formArray);
       this.fontSize = data.fontSize;
       this.spinning = false;
+      this.hasFrontAddress = false;
     },
     handleFrontAddress(list) {
       if (!list || !list.length) return;
       let matchItem = list.find(item => item.type === "FRONT_ADDRESS");
       if (!matchItem || !Object.keys(matchItem).length) return;
       let setting;
-      if (matchItem.setting && this.$utils.isJSON(matchItem.setting)) {
+      if (matchItem.setting && utils.isJSON(matchItem.setting)) {
         setting = JSON.parse(matchItem.setting);
       }
       if (!setting || !Object.keys(setting).length) return;
@@ -691,7 +698,7 @@ export default create({
           preStr = "&";
         }
         let curUrl = `${frontAddress}${preStr}redirect_url=${encodeURIComponent(urlHref)}`;
-        window.location.href = curUrl;
+        return curUrl;
       }
     },
     handleBtnParamsEvaluate(params) {

package/packages/select-label/labelFormContent.vue

@@ -200,7 +200,8 @@ export default create({
     },
     SelectedList() {
       const { labelSelectedList = [], labelSelectedEdit = [] } = this;
-      return labelSelectedList.concat(labelSelectedEdit);
+      let list = [].concat(labelSelectedEdit, labelSelectedList);
+      return this.uniqArrObj(list,'labelId')
     },
     selectLabelId() {
       const list = this?.SelectedList || [];
@@ -239,6 +240,14 @@ export default create({
         .substr(3, len);
     },
 
+    uniqArrObj(arr, name) {
+      let obj = {};
+      return arr.reduce((cur, next) => {
+        obj[next[name]] ? '' : (obj[next[name]] = true && cur.push(next));
+        return cur;
+      }, []);
+    },
+
     handleLabelInit() {
       if (this.isLock) return;
       this.cacheLabelConfig = { ...this.labelConfig };
@@ -248,8 +257,9 @@ export default create({
         // let olbKey = this?.cacheLabelConfig[key]?.curKey
         let typeId = copy[key]?.typeId || '';
         Object.assign(copy[key], {
-          curKey: `${key}_${typeId}~${this.randomId()}`
+          curKey: `${key}_${typeId}}`
         });
+        // ~${this.randomId()
       }
       this.$set(this, 'labelConfig', copy);
       this.$nextTick(() => {
@@ -264,7 +274,7 @@ export default create({
     },
 
     hanldeBackfill() {
-      const { labelConfig, SelectedList = [], selectLabelId} = this;
+      const { labelConfig, SelectedList = [], selectLabelId } = this;
       this.$set(this, 'labelSelectedEdit', SelectedList);
       if (typeof labelConfig === 'object') {
         let keys = Object.keys(labelConfig || {});
@@ -487,7 +497,7 @@ export default create({
       if (v.itemList?.length) {
         parentColor = v.itemList[0].parentColor || v.parentColor || '';
       } else {
-        parentColor = v?.parentColor || "";
+        parentColor = v?.parentColor || '';
       }
 
       const params = {
@@ -740,26 +750,25 @@ export default create({
         > .ant-tabs-bar {
           border-color: #fff;
           .ant-tabs-tab {
-            margin-right:0;
-            border-radius:0;
+            margin-right: 0;
+            border-radius: 0;
             line-height: 30px;
             height: 30px;
 
-            border-right: 1px solid #e8e8e8!important;
+            border-right: 1px solid #e8e8e8 !important;
             border-bottom: 1px solid #e8e8e8;
             border-top: none;
 
             // border-color: transparent;
-            background: #F9F9F9;
-            &:first-of-type{
-               border-left: 1px solid #e8e8e8;
+            background: #f9f9f9;
+            &:first-of-type {
+              border-left: 1px solid #e8e8e8;
             }
             &.ant-tabs-tab-active {
-             border-bottom-color: #fff;
-             background: #fff;
-          }
+              border-bottom-color: #fff;
+              background: #fff;
+            }
           }
-
         }
 
         .ant-tabs-bar;

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

@@ -308,7 +308,7 @@ export default create({
     },
 
     async handleGetLabelData(v, update) {
-      const { rows, results } = await this.getLabelList(v);
+      const { rows, results } = await this.getLabelList(v, {update: update});
       // console.log(rows, results)
       const labelList = rows || [];
       const labelObj = {};

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

@@ -102,7 +102,7 @@ export default {
     // 有没有分页配置
     isnoPages(){
      const { searchPageConfig } = this.item || {};
-     if(!searchPageConfig) return;
+     if(!searchPageConfig) return true;
 
       return searchPageConfig.page <= 1 && !searchPageConfig.hasNextPage;
     },

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

@@ -80,7 +80,19 @@ export const $utils = {
     $utils() {
       return {
         filterOption(input, option) {
-          return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          try {
+            let text = option.componentOptions.children[0].text;
+            let lowText = text.toLowerCase();
+            let lowInput = input.toLowerCase();
+            let flag = false;
+            var reg = /^[a-zA-Z]+$/;
+            if (typeof text === 'string' && reg.test(input) && ''._toPinYin) {
+              flag = lowText._toPinYin().indexOf(lowInput) >= 0;
+            }
+            return flag || lowText.indexOf(lowInput) >= 0;
+          } catch (error) {
+            return false;
+          }
         },
         /**
          * 获取按钮自定义颜色

package/src/utils/utils-map.js

@@ -89,7 +89,19 @@ export default {
   },
 
   filterOption(input, option) {
-    return option.componentOptions.children[0]?.text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    try {
+      let text = option.componentOptions.children[0].text;
+      let lowText = text.toLowerCase();
+      let lowInput = input.toLowerCase();
+      let flag = false;
+      var reg = /^[a-zA-Z]+$/;
+      if (typeof text === 'string' && reg.test(input) && ''._toPinYin) {
+        flag = lowText._toPinYin().indexOf(lowInput) >= 0;
+      }
+      return flag || lowText.indexOf(lowInput) >= 0;
+    } catch (error) {
+      return false;
+    }
   },
 
   // color 获取 alpha
@@ -415,9 +427,9 @@ export default {
 
   /**
    * 转换含有###的值
-   * @param {*} item 
+   * @param {*} item
    * @param {*} k key
-   * @returns 
+   * @returns
    */
   paramsToValue(item, k = "value") {
     if (this.isEmpty(item)) return;

package/src/utils/vexutils.js

@@ -680,7 +680,19 @@ XEUtils.mixin({
       .split('|');
   },
   filterOption(input, option) {
-    return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    try {
+      let text = option.componentOptions.children[0].text;
+      let lowText = text.toLowerCase();
+      let lowInput = input.toLowerCase();
+      let flag = false;
+      var reg = /^[a-zA-Z]+$/;
+      if (typeof text === 'string' && reg.test(input) && ''._toPinYin) {
+        flag = lowText._toPinYin().indexOf(lowInput) >= 0;
+      }
+      return flag || lowText.indexOf(lowInput) >= 0;
+    } catch (error) {
+      return false;
+    }
   },
 
   /**