centaline-data-driven-v3 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/app/TextBox.vue

@@ -9,7 +9,7 @@
             </template>
         </van-field>
         <van-field clearable :type="model.inputType" :rows="model.rows" v-bind="model.attrs" v-model="model.code1"
-            :readonly="model.readonly" :disabled="model.locked" :maxlength="model.maxValue1"
+            :readonly="model.readonly" :disabled="model.locked" :maxlength="model.controlType !== Enum.ControlType.NumericTextBox ? model.maxValue1 : ''"
             :show-word-limit="model.showWordLimit" :label-align="model.inputType == 'textarea' ? 'top' : 'left'"
             @input="input()" @blur="change()" class="ct-text" autocomplete="off">
             <template #label v-if="model.showLabel && model.controlLabel">
@@ -44,6 +44,18 @@ const props = defineProps({
     source: Object,
 })
 const model = initData(props, TextBox)
+model.value.selfValidExcute = () => {
+    model.value.valid = true;
+    if (model.value.controlType === Enum.ControlType.NumericTextBox) {
+        if (model.value.minValue1 && model.value.code1 < parseFloat(model.value.minValue1)) {
+            model.value.validMessage = "最小值为" + model.value.minValue1 + "";
+            model.value.valid = false;
+            return false;
+        }
+
+    }
+    return model.value.valid;
+}
 //弹出选择列表
 function popupSearchListHandle() {
     let isSingle = model.value.moreActionRouter.isSingle

package/src/components/web/ComboBox.vue

@@ -1,11 +1,12 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <el-select-v2 ref="refselect" :key="model.itemKey" v-model="model.value" :options="model.options" :no-data-text="nodatatext"
-                :props="model.optionAttrs" v-bind="model.attrs" :disabled="model.locked" clearable @change="change"
-                :placeholder="model.placeholder" @visible-change="visibleChange" @clear="clear"
-                :filterable="model.filterable" :multiple="model.multiple" class="fieldControl" :height="300"
-                @click="clickHandler" :class="[model.moreActionRouter ? 'selectmore' : '', open ? 'open' : '']"
+            <el-select-v2 ref="refselect" :key="model.itemKey" v-model="model.value" :options="model.options"
+                :no-data-text="nodatatext" :props="model.optionAttrs" v-bind="model.attrs" :disabled="model.locked"
+                clearable @change="change" :placeholder="model.placeholder" @visible-change="visibleChange"
+                @clear="clear" :filterable="model.filterable" :multiple="model.multiple" class="fieldControl"
+                :height="300" @click="clickHandler"
+                :class="[model.moreActionRouter ? 'selectmore' : '', open ? 'open' : '']"
                 :filter-method="debouncedRemoteMethod" @compositionstart="handleCompositionStart"
                 @compositionend="handleCompositionEnd">
                 <template #default="{ item }">
@@ -27,9 +28,8 @@
             </el-select-v2>
             <template v-if="model.flagaFterText">
                 <el-input type="text" v-model="model.code2" v-bind="model.attrs" @change="changeHandler(model, emit)"
-                    :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
-                    :maxlength="model.maxValue1" :show-word-limit="model.showWordLimit" clearable
-                    class="fieldControl ml10">
+                    :disabled="model.locked" :rows="model.rows" :readonly="model.readonly" :maxlength="model.maxValue1"
+                    :show-word-limit="model.showWordLimit" clearable class="fieldControl ml10">
                 </el-input>
             </template>
         </template>
@@ -61,17 +61,17 @@ const refselect = ref()
 const open = ref(false)
 const isComposing = ref(false);
 const nodatatext = ref('    ')
-model.value.itemKey=Math.random();
+model.value.itemKey = Math.random();
 let cancelTokenSource = null; // 用于存储取消令牌
 
-const qrtimer=ref(null)
-onBeforeUnmount(()=>{
-  model.value=null
-  refselect.value=null
-  if (qrtimer.value) {
-    clearTimeout(qrtimer.value);
-    qrtimer.value = null;
-  }
+const qrtimer = ref(null)
+onBeforeUnmount(() => {
+    model.value = null
+    refselect.value = null
+    if (qrtimer.value) {
+        clearTimeout(qrtimer.value);
+        qrtimer.value = null;
+    }
 })
 
 //下拉框出现/隐藏时触发
@@ -97,55 +97,55 @@ function visibleChange(visible) {
 //获取数据列表
 function getOptions(key) {
     if (cancelTokenSource) {
-      // 取消上一次未完成的请求
-      cancelTokenSource.cancel('取消上一次请求');
+        // 取消上一次未完成的请求
+        cancelTokenSource.cancel('取消上一次请求');
     }
 
     // 创建新的取消令牌
     cancelTokenSource = Axios.CancelToken.source();
-    if (!isComposing.value &&!model.value.moreActionRouter) {
-        model.value.getOptions(props.parameterAction, key,cancelTokenSource, function (data) {
-          if(data){
-            data.forEach((v) => {
-                let item = model.value.globalOptions.find((v1) => {
-                    return v1.code === v.code && v1.locked;
+    if (!isComposing.value && !model.value.moreActionRouter) {
+        model.value.getOptions(props.parameterAction, key, cancelTokenSource, function (data) {
+            if (data) {
+                data.forEach((v) => {
+                    let item = model.value.globalOptions.find((v1) => {
+                        return v1.code === v.code && v1.locked;
+                    });
+                    if (item) {
+                        v.locked = true
+                    }
+                    v.label = v.displayName || v.name
+                    v.value = v.code
+                    v.disabled = v.locked
+                    if (v.options) {
+                        let data1 = v.options;
+                        data1.forEach((v2) => {
+                            let item1 = model.value.globalOptions.find((v3) => {
+                                return v3.code === v2.code && v3.locked;
+                            });
+                            if (item1) {
+                                v2.locked = true
+                            }
+                            v2.label = v2.displayName || v2.name
+                            v2.value = v2.code
+                            v2.disabled = v2.locked
+                        });
+                    }
                 });
-                if (item) {
-                    v.locked = true
+                if (JSON.stringify(model.value.options) != JSON.stringify(data)) {
+                    model.value.options = data;
                 }
-                v.label = v.displayName || v.name
-                v.value = v.code
-                v.disabled = v.locked
-                if (v.options) {
-                    let data1 = v.options;
-                    data1.forEach((v2) => {
-                        let item1 = model.value.globalOptions.find((v3) => {
-                            return v3.code === v2.code && v3.locked;
-                        });
-                        if (item1) {
-                            v2.locked = true
-                        }
-                        v2.label = v2.displayName || v2.name
-                        v2.value = v2.code
-                        v2.disabled = v2.locked
-                    });
+
+                if (data.length == 0) {
+                    nodatatext.value = common.LocalizedString('无数据', '無數據');
                 }
-            });
-            if (JSON.stringify(model.value.options) != JSON.stringify(data)) {
-                model.value.options = data;
-            }
 
-            if(data.length==0){
-              nodatatext.value = common.LocalizedString('无数据', '無數據');
+                nextTick(function () {
+                    setminWidth()
+                });
+            }
+            else {
+                nodatatext.value = common.LocalizedString('无数据', '無數據');
             }
-
-            nextTick(function () {
-                setminWidth()
-            });
-          }
-          else{
-            nodatatext.value = common.LocalizedString('无数据', '無數據');
-          }
         })
     }
 
@@ -155,7 +155,7 @@ function debounce(func, delay) {
     return function () {
         const context = this;
         const args = arguments;
-        if(qrtimer.value)clearTimeout(qrtimer.value);
+        if (qrtimer.value) clearTimeout(qrtimer.value);
         qrtimer.value = setTimeout(() => {
             func.apply(context, args);
         }, delay);
@@ -171,6 +171,9 @@ function change(val) {
             model.value.value = val
             model.value.itemKey = Math.random()
         }
+        else {
+            val = ''
+        }
     }
     model.value.setcode(val)
     changeHandler(model.value, emit)
@@ -227,13 +230,13 @@ function setminWidth() {
     let maxLength = -1;
     let text;
     for (let item of model.value.options) {
-      if (item.name) {
-        if (item.name.length > maxLength) {
-            maxLength = item.name.length;
-            text = item.name;
+        if (item.name) {
+            if (item.name.length > maxLength) {
+                maxLength = item.name.length;
+                text = item.name;
+            }
         }
-      }
-    }   
+    }
 
     let span = document.createElement('span');
     span.innerText = text;
@@ -241,12 +244,12 @@ function setminWidth() {
     span.style.width = 'auto';
     span.style.fontSize = '17px';
     document.body.appendChild(span);
-    
+
     if ((span.getBoundingClientRect().width + 40) <= refselect.value.selectRef.offsetWidth) {
-      refselect.value.popperSize = refselect.value.selectRef.offsetWidth;
+        refselect.value.popperSize = refselect.value.selectRef.offsetWidth;
     }
-    else{      
-      refselect.value.popperSize = span.getBoundingClientRect().width + 40;
+    else {
+        refselect.value.popperSize = span.getBoundingClientRect().width + 40;
     }
 
     document.body.removeChild(span);

package/src/components/web/Label.vue

@@ -1,11 +1,13 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control v-if="model.code1">
-            <template v-if="model.controlType==Enum.ControlType.HtmlLabel">
-                <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }"  @click="clickHandle" v-html="model.value"></span>
+            <template v-if="model.controlType == Enum.ControlType.HtmlLabel">
+                <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }" @click="clickHandle"
+                    v-html="HtmlReplace(model.value)"></span>
             </template>
             <template v-else-if="model.flagJson">
-                <el-tag v-for="item in model.value" :key="item" type="info" :disable-transitions="true" style="margin: 2px 6px 2px 0px;">{{ item
+                <el-tag v-for="item in model.value" :key="item" type="info" :disable-transitions="true"
+                    style="margin: 2px 6px 2px 0px;">{{ item
                     }}</el-tag>
             </template>
             <template v-else>
@@ -16,7 +18,8 @@
                         <div :style="{ 'width': (model.value.length > 66 ? '400px' : 'auto') }" v-html="model.value">
                         </div>
                     </template>
-                    <span class="ct-lable" :class="{ 'cursor-pointer': model.onChanged }"  @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
+                    <span class="ct-lable" :class="{ 'cursor-pointer': model.onChanged }"
+                        @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
                 </el-tooltip>
                 <span class="unitName">{{ model.unitName1 }}</span>
             </template>
@@ -36,7 +39,7 @@ import { ref, nextTick } from 'vue'
 import { initData } from '../../utils/mixins';
 import Enum from '../../utils/Enum'
 import Label from '../../loader/src/Label';
-const emit = defineEmits(['popupSearchList','change'])
+const emit = defineEmits(['popupSearchList', 'change'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -51,7 +54,7 @@ function onMouseOver(event) {
     let ev = event.target;
     nextTick(function () {
         // 判断是否禁用tooltip功能
-        if(ev.clientWidth>0){
+        if (ev.clientWidth > 0) {
             isShowTooltip.value = refComputLabel.value.clientWidth <= ev.clientWidth;
         }
         isShowComput.value = false
@@ -61,12 +64,15 @@ function onMouseOver(event) {
 }
 //弹出选择列表
 function popupSearchListHandle() {
-    let isSingle=model.value.moreActionRouter.isSingle
+    let isSingle = model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
-function clickHandle(){
+function clickHandle() {
     emit('change', model);
 }
+function HtmlReplace(v) {
+  return v.replace(/ /g, "&nbsp;&nbsp;")
+}
 defineExpose({
     model
 })
@@ -83,17 +89,20 @@ defineExpose({
     -webkit-line-clamp: 1;
     word-break: break-all;
 }
-.ct-html{
+
+.ct-html {
     line-height: 26px;
     font-size: 12px;
     color: #3D5ECC;
 }
+
 .el-tag.el-tag--info {
     --el-tag-text-color: var(--el-color-info);
     color: var(--el-color-info);
 }
 
 .cursor-pointer {
-  cursor: pointer; /* 鼠标悬停时显示为“小手”形状 */
+    cursor: pointer;
+    /* 鼠标悬停时显示为“小手”形状 */
 }
 </style>

package/src/components/web/NumericRange.vue

@@ -45,8 +45,8 @@ defineExpose({
 </script>
 <style scoped>
 .el-date-editor {
-    height: 24px;
-    line-height: 24px;
+    height: 26px;
+    line-height: 26px;
 }
 
 .el-range-input {

package/src/components/web/SearchScreen.vue

@@ -176,6 +176,7 @@ function searchHandler(field) {
             model.value.reset();
             model.value.screen.forEach((v) => {
                 SearchScreen.hiddenHandle(v, model.value);
+                SearchScreen.displayHandle(v, model.value);
             })
             if (validExcute()) {
                 emit('resetSearch', model.value);

package/src/components/web/TextBox.vue

@@ -1,20 +1,22 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-          <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
-            <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
-                :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
-                :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
-                :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
-                <template #suffix>
-                    <span v-if="model.unitName1">{{ model.unitName1 }}</span>
-                </template>
-            </el-input>
-            <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
-          </div>
-          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
-                :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
-                :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
+            <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
+                <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()"
+                    @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
+                    :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
+                    :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()"
+                    class="fieldControl">
+                    <template #suffix>
+                        <span v-if="model.unitName1">{{ model.unitName1 }}</span>
+                    </template>
+                </el-input>
+                <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
+            </div>
+            <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()"
+                @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
+                :show-password="model.inputType == 'password'" autocomplete="on"
+                :maxlength="model.controlType !== Enum.ControlType.NumericTextBox ? model.maxValue1 : ''"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
                 <template #suffix>
                     <span v-if="model.unitName1">{{ model.unitName1 }}</span>
@@ -35,7 +37,7 @@
 import { initData, changeHandler } from '../../utils/mixins';
 import TextBox from '../../loader/src/TextBox';
 import Enum from '../../utils/Enum'
-const emit = defineEmits(['input', 'change', 'click','search','popupSearchList'])
+const emit = defineEmits(['input', 'change', 'click', 'search', 'popupSearchList'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -46,25 +48,37 @@ const props = defineProps({
     },
 })
 const model = initData(props, TextBox)
+model.value.selfValidExcute = () => {
+    model.value.valid = true;
+    if (model.value.controlType === Enum.ControlType.NumericTextBox) {
+        if (model.value.minValue1 && model.value.code1 < parseFloat(model.value.minValue1)) {
+            model.value.validMessage = "最小值为" + model.value.minValue1 + "";
+            model.value.valid = false;
+            return false;
+        }
+
+    }
+    return model.value.valid;
+}
 function search() {
-    if (model.value.autoSearch||props.from=='tree') {
+    if (model.value.autoSearch || props.from == 'tree') {
         emit('search');
     }
 }
 function input() {
-  if(model.value.controlType===Enum.ControlType.MultiLineText || model.value.controlType===Enum.ControlType.TextBox){
-  }
-  else{
-    change();
-  }
-} 
+    if (model.value.controlType === Enum.ControlType.MultiLineText || model.value.controlType === Enum.ControlType.TextBox) {
+    }
+    else {
+        change();
+    }
+}
 function change() {
-  changeHandler(model.value, emit);
-  if (props.from == 'tree') { emit('search'); }
+    changeHandler(model.value, emit);
+    if (props.from == 'tree') { emit('search'); }
 }
 //弹出选择列表
 function popupSearchListHandle() {
-    let isSingle=model.value.moreActionRouter.isSingle
+    let isSingle = model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
 defineExpose({

package/src/loader/src/Field.js

@@ -93,6 +93,20 @@ const Base = function (source, moreActionRouter) {
         set hiddenRelationFieldValue(v) {
             source.hiddenRelationFieldValue = v;
         },
+        //决定其显示相关的字段
+        get displayRelationField() {
+            return source.displayRelationField;
+        },
+        set displayRelationField(v) {
+            source.displayRelationField = v;
+        },
+        //决定其显示相关字段的值
+        get displayRelationFieldValue() {
+            return source.displayRelationFieldValue;
+        },
+        set displayRelationFieldValue(v) {
+            source.displayRelationFieldValue = v;
+        },
         //决定其必填相关的字段
         get requiredRelationField() {
             return source.requiredRelationField;
@@ -801,11 +815,21 @@ const Base = function (source, moreActionRouter) {
             if (typeof source.show !== "undefined") {
                 return source.show;
             }
+            if (source.hidden) {
+                return !source.hidden;
+            }
             return true;
         },
         set show(v) {
             source.show = v;
         },
+        //是否显示
+        get hidden() {
+            return source.hidden;
+        },
+        set hidden(v) {
+            source.hidden = v;
+        },
         //重置
         reset() {
             if (this.controlType === Enum.ControlType.Hidden
@@ -829,10 +853,10 @@ const Base = function (source, moreActionRouter) {
                     }
                     else {
                         this.value = this.defaultCode1
-                        if(this.searchName){
-                            this.searchName=''
-                            this.searchValue=''
-                            this.searchValue1=''
+                        if (this.searchName) {
+                            this.searchName = ''
+                            this.searchValue = ''
+                            this.searchValue1 = ''
                         }
                     }
 
@@ -853,8 +877,8 @@ const Base = function (source, moreActionRouter) {
                 this.code1 = this.defaultCode1 || '';
                 this.code2 = this.defaultCode2 || '';
                 this.name1 = this.defaultName1 || '';
-                if(this.controlType === Enum.ControlType.SearchListBox && this.defaultCode1 && this.defaultName1){
-                  this.options=[{ value: this.code1, label: this.name1 }]
+                if (this.controlType === Enum.ControlType.SearchListBox && this.defaultCode1 && this.defaultName1) {
+                    this.options = [{ value: this.code1, label: this.name1 }]
                 }
             }
             else {
@@ -971,7 +995,7 @@ const Base = function (source, moreActionRouter) {
         getFormParentFieldPara() {
             if (rtn.form && typeof rtn.parentFields !== 'undefined' && rtn.parentFields.length > 0) {
                 if (typeof rtn.form.getRefFieldPara === 'function') {
-                    return rtn.form.getParentFieldPara(rtn.parentFields,rtn.form);
+                    return rtn.form.getParentFieldPara(rtn.parentFields, rtn.form);
                 }
             }
             return null;