centaline-data-driven-v3 0.0.89 → 0.0.90

package/package.json

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

package/src/components/Layout/LayoutMore.vue

@@ -4,7 +4,8 @@
             <span v-if="rowMenuDisplayCountForAPP == 1 && RouterlistMore.length > 0" style="font-size: 24px;font-weight:bold"
                 @click="clickmore">...</span>
             <template v-else>
-                <van-button v-for="(field, index) in Routerlist" :key="index" color="#999999" plain size="small"
+                <van-button v-for="(field, index) in Routerlist" :key="index" plain size="small"
+                :style="{ color: field.textColor ? field.textColor : '#999999', backgroundColor: field.bgColor ? field.bgColor : '#ffffff', borderColor: field.borderColor ? field.borderColor : '#cccccc' }"
                     @click="clickHandler(field)">{{ field.controlLabel }}</van-button>
                 <van-button v-if="RouterlistMore.length>0" color="#999999" plain size="small"
                     @click="clickmore">...</van-button>

package/src/components/app/Form.vue

@@ -21,8 +21,7 @@
                 :border="false">
                 <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                     :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="fieldClickHandler"
-                    @tableButtonClick="clickHandler"
-                    @change="changeHandler" />
+                    @tableButtonClick="clickHandler" @change="changeHandler" />
             </van-cell-group>
             <template v-if="model.collapse.length > 0">
                 <!--tabs-->
@@ -37,8 +36,7 @@
                                     <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                                         :parameterAction="model.parameterAction" v-bind="field.bindPara"
                                         @fieldClick="fieldClickHandler" @change="changeHandler"
-                                        @tableButtonClick="clickHandler"
-                                        @popupSearchList="popupSearchListHandler" />
+                                        @tableButtonClick="clickHandler" @popupSearchList="popupSearchListHandler" />
                                 </van-cell-group>
                             </van-tab>
                         </template>
@@ -49,17 +47,16 @@
                 <!--分组-->
                 <template v-else>
                     <van-cell-group v-for="(item, index) in model.collapse" :key="index">
-                        <template v-if="item.show !== false" v-for="(field, collapseIndex) in model.collapseFields[index + 1]"
-                            :key="collapseIndex">
+                        <template v-if="item.show !== false"
+                            v-for="(field, collapseIndex) in model.collapseFields[index + 1]" :key="collapseIndex">
                             <component ref="Fields" :is="field.is" v-if="field.show !== false" :vmodel="field"
                                 :parameterAction="model.parameterAction" v-bind="field.bindPara"
-                                @fieldClick="fieldClickHandler" @change="changeHandler"
-                                @tableButtonClick="clickHandler"
+                                @fieldClick="fieldClickHandler" @change="changeHandler" @tableButtonClick="clickHandler"
                                 @popupSearchList="popupSearchListHandler" />
                         </template>
                         <template #title v-if="item.show !== false">
-                            <span :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel }}</span>
-                            <span v-html="item.sufLabel1"></span>
+                            <div :class="[item.required ? 'requiredLabel' : '']">{{ item.controlLabel }}</div>
+                            <div v-html="item.sufLabel1"></div>
                         </template>
                     </van-cell-group>
                 </template>
@@ -71,8 +68,8 @@
                     :border="false">
                     <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                         :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="fieldClickHandler"
-                        @tableButtonClick="clickHandler"
-                        @change="changeHandler" @popupSearchList="popupSearchListHandler" />
+                        @tableButtonClick="clickHandler" @change="changeHandler"
+                        @popupSearchList="popupSearchListHandler" />
                 </van-cell-group>
             </template>
             <div v-if="model.links.findIndex((v) => { return v.show }) > -1" style="padding: 0 10px;">
@@ -85,7 +82,7 @@
             <div class="safe-area-inset-bottom-height"></div>
         </div>
         <div class="button-absoluteAPP"
-            v-if="common.flagMicroMessenger() && model.buttons.findIndex((v) => { return v.show }) > -1">
+            v-if="(common.flagMicroMessenger() || common.flagHK()) && model.buttons.findIndex((v) => { return v.show }) > -1">
             <template v-for="(field, index) in model.buttons" :key="index">
                 <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                     :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="clickHandler" />
@@ -178,7 +175,7 @@ function init() {
 function load(data) {
     model.value = data
     model.value.parentModelForm = props.parentModelForm
-    model.value.$vue = { fieldClickHandler, clickHandler, emit, getFormObj, getFileData, Form, validExcute, changeCallBackHandler, load, init, updateFields,loaded };
+    model.value.$vue = { fieldClickHandler, clickHandler, emit, getFormObj, getFileData, Form, validExcute, changeCallBackHandler, load, init, updateFields, loaded };
     if (model.value.scripts) {
         model.value.scripts.formData = model.value.formData;
         model.value.scripts.formData.form = model.value;
@@ -251,7 +248,7 @@ function setFormHeight() {
             h2 = refForm.value.offsetTop
         }
         let formHeight = h1 - h2
-        if (common.flagMicroMessenger()) {
+        if (common.flagMicroMessenger()||common.flagHK()) {
             formHeight = formHeight - 64
         }
         model.value.formHeight = formHeight
@@ -284,11 +281,11 @@ function validExcute() {
                         }
                         setTimeout(function () {
                             if (f.$el.offsetParent) {
-                                var h1=0;
-                                if(!props.flagNavbar){
-                                    h1=46
+                                var h1 = 0;
+                                if (!props.flagNavbar) {
+                                    h1 = 46
                                 }
-                                refForm.value.scrollTop = f.$el.offsetTop + f.$el.offsetParent.offsetTop-h1
+                                refForm.value.scrollTop = f.$el.offsetTop + f.$el.offsetParent.offsetTop - h1
                             }
 
                         }, timeOut);

package/src/components/app/PhotoSelectList.vue

@@ -8,11 +8,11 @@
             </div>
             <template v-if="imageList.length > 0">
                 <template v-if="layout">
-                    <div style="display: flex;" v-for="(item, index) in imageList" :key="index">
-                        <van-radio v-if="selectedMode == 1" @click="chooseRadio(item)" style="margin: 0 5px;"
+                    <div style="display: flex;" v-for="(item, index) in imageList" :key="index" @click="changeChoose(item,false)" >
+                        <van-radio v-if="selectedMode == 1" @click.stop="changeChoose(item,true)" style="margin: 0 5px;"
                             :checked="item.ischeck" icon-size="14px"></van-radio>
-                        <van-checkbox v-else style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
-                            shape="square" icon-size="14px"></van-checkbox>
+                        <van-checkbox v-else style="margin: 0 5px;" v-model="item.ischeck"
+                            shape="square" @click.stop="changeChoose(item,true)"  icon-size="14px"></van-checkbox>
                         <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey" :rowindex="index"
                             :flagMediaSelect="true" @rolRouterclick="rolRouterCellClickHandler">
                         </ct-layout>
@@ -163,6 +163,16 @@ function load(data) {
         });
     }
 }
+function changeChoose(item,flagCheckboxOrRadio){
+  if(!flagCheckboxOrRadio){
+    item.ischeck=!item.ischeck;
+  }
+  if(selectedMode.value==1){
+    chooseRadio(item)
+  }else{
+    choose(item,true);
+  }
+}
 // 点击选中图片
 function choose(item, flagCheckbox) {
     let chooseItem = common.deepClone(item);
@@ -227,11 +237,12 @@ function handleClick() {
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {
         viewerfile(imageList.value, rowindex)
+        event.stopPropagation();
     }
 }
 function viewerfile(list, index) {
 
-    var MediaAlbum = [{ albumName: model.value.label || "媒体", medias: [] as any }];
+    var MediaAlbum = [{ albumName: model.value.label || common.LocalizedString('媒体', '媒體'), medias: [] as any }];
 
     let fileList = list.filter((item) => {
         return item.flagDeleted !== true;
@@ -239,7 +250,7 @@ function viewerfile(list, index) {
     fileList.forEach((v) => {
         MediaAlbum[0].medias.push(v);
     });
-    common.viewerfile((model.value.label || "预览媒体"), MediaAlbum, 0, index, props.mediaViewPageType);
+    common.viewerfile((model.value.label || common.LocalizedString('预览媒体', '預覽媒體')), MediaAlbum, 0, index, props.mediaViewPageType);
 }
 function change(item) {
     showPicker.value = false;

package/src/components/app/SearchList/SearchTable.vue

@@ -15,9 +15,9 @@
                     @load="onLoad" :immediate-check="false" :style="'min-height:' + model.tableHeight + 'px'">
                     <template v-if="flagPopupSearchlist && singleSelectio">
                         <van-radio-group v-model="checkeds" ref="refCheckboxGroup">
-                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex">
-                                <van-radio @click="selectRow(row)" icon-size="16px" checked-color="#EE6B6B"
-                                    :name="rowindex" :disabled="!flagSelect(row)"> </van-radio>
+                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex" @click="selectRow(row,rowindex,false)">
+                                <van-radio @click.stop="selectRow(row,rowindex,true)" icon-size="16px" checked-color="#EE6B6B"
+                                    :name="rowindex" :checked="row.$select" :disabled="!flagSelect(row)"> </van-radio>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
                                     :actionRouter="model.actionRouter"
@@ -28,11 +28,11 @@
                     </template>
                     <template v-else>
                         <van-checkbox-group v-model="checkeds" ref="refCheckboxGroup">
-                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex">
+                            <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex" @click="selectRow(row,rowindex,false)">
                                 <template v-if="isoperate || flagPopupSearchlist">
                                     <van-checkbox v-if="flagSelect(row)" shape="square" checked-color="#EE6B6B"
-                                        icon-size="14px" :name="rowindex" @click="selectRow(row)"></van-checkbox>
-                                    <div class="van-checkbox" v-else></div>
+                                        icon-size="14px" :name="rowindex"  @click.stop="selectRow(row,rowindex,true)"></van-checkbox>
+                                    <div class="van-checkbox" v-else>{{row.$select}}</div>
                                 </template>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
@@ -339,6 +339,7 @@ function rolRouterCellClickHandler(routerKey, rowindex, forname, forrowindex, fl
     }
     model.value.selectIndex = rowindex
     RouterClickHandler(field, submitData, action, model.value, 'table')
+    event.stopPropagation();
 }
 //toolButtons操作
 function toolbarClickHandler(field) {
@@ -388,21 +389,34 @@ function modeClickHandler() {
     selectCount.value = getSelectRowLength();
 }
 //选择行
-function selectRow(row) {
-    if (props.singleSelectio) {
-        model.value.listData.forEach((ro) => {
-            if (
-                !model.value.rightCheckBoxColumn ||
-                common.getDataOfUpperLower(ro, model.value.rightCheckBoxColumn) == 1
-            ) {
-                ro.$select = false
+function selectRow(row,rowIndex,flagCheckboxOrRadio) {
+    if(flagSelect(row)&&(isoperate.value || props.flagPopupSearchlist)){
+        if (props.singleSelectio) {
+            model.value.listData.forEach((ro) => {
+                if (
+                    !model.value.rightCheckBoxColumn ||
+                    common.getDataOfUpperLower(ro, model.value.rightCheckBoxColumn) == 1
+                ) {
+                    ro.$select = false
+                }
+            });
+        }
+        row.$select = !row.$select
+        if(!flagCheckboxOrRadio){
+            if(row.$select){
+                if(checkeds.value.indexOf(rowIndex) == -1){
+                    checkeds.value.push(rowIndex);
+                }
+            }else{
+                if(checkeds.value.indexOf(rowIndex) > -1){
+                    checkeds.value.splice(checkeds.value.indexOf(rowIndex),1);
+                }
             }
-        });
+        }
+        SearchTable.setSelectAll(model.value);
+        SearchTable.getSelectAll(model.value);
+        selectCount.value = getSelectRowLength();
     }
-    row.$select = !row.$select
-    SearchTable.setSelectAll(model.value);
-    SearchTable.getSelectAll(model.value);
-    selectCount.value = getSelectRowLength();
 }
 function exit() {
     model.value.selectAll = false

package/src/components/app/Span.vue

@@ -94,10 +94,10 @@ function getLableShow() {
             labelShow = props.vmodel.getCheckedName();;
             break;
         case Enum.ControlType.Switch:
-            labelShow = props.vmodel.code1 ? '开启' : '关闭';
+            labelShow = props.vmodel.value ? '开启' : '关闭';
             break;
         case Enum.ControlType.CheckBox:
-            labelShow = props.vmodel.code1 ? '是' : '否';
+            labelShow = props.vmodel.value ? '是' : '否';
             break;
         default:
             break;

package/src/components/app/dialog.vue

@@ -1,7 +1,7 @@
 <template>
     <van-popup :show="true" :z-index="zindex" position="right" :style="{ width: '100%', height: '100%' }">
         <van-nav-bar :title="vmodel.title" :left-arrow="true" @click-left="close" @click-right="onClickRight">
-            <template #right v-if="!common.flagMicroMessenger()">
+            <template #right v-if="!common.flagMicroMessenger()&&!common.flagHK()">
                 <template v-if="buttons.length == 1">
                     {{ buttons[0].controlLabel }}
                 </template>

package/src/components/app/searchScreen.vue

@@ -57,7 +57,7 @@
         </div>
         <div class="screen-condition" v-if="searchdata.length > 0">
             <van-dropdown-menu active-color="#323233">
-                <van-dropdown-item :title="'当前搜索条件：已选中' + searchdata.length + '个条件'">
+                <van-dropdown-item :title="common.LocalizedString('当前搜索条件：已选中' + searchdata.length + '个条件', '當前搜尋條件：已選中' + searchdata.length + '個條件')">
                     <van-row gutter="20" v-for="(field, index) in searchdata" :key="index">
                         <van-col span="6" style="text-align: right;">{{ field.controlLabel }}</van-col>
                         <van-col span="18">
@@ -81,8 +81,15 @@
                 </van-dropdown-item>
             </van-dropdown-menu>
         </div>
-        <van-action-sheet v-model:show="issort" :actions="actions" cancel-text="取消" @select="selectsort($event)"
-            :round="false" />
+        <van-action-sheet v-model:show="issort" cancel-text="取消"
+            :round="false">
+        <template #default>
+            <button type="button" class="van-action-sheet__item" v-for="(v, i) in actions" :key="i"
+            :style="{ 'background': v.name==sortname ? '#f2f3f5' : ''}">
+                <span class="van-action-sheet__name"  @click="selectsort(v)">{{ v.name}}</span>
+            </button>
+        </template>
+        </van-action-sheet>
     </div>
 </template>
 <script setup lang="ts">

package/src/components/web/AIChat.vue

@@ -292,7 +292,7 @@ const getDistanceToBottom = () => {
 function getRefFieldJson() {
     let rtn = {};
     let router = props.router;
-    if (router.refFieldName) {
+    if (router?.refFieldName &&  props.form?.getFormObj) {
         let refFieldName = router.refFieldName.split(',');
         let submitData = props.form.getFormObj();
         if (refFieldName.length > 0 && submitData) {
@@ -524,7 +524,7 @@ const getTemplateType = (fullText) => {
                 rtn = "error";
                 outtext.value = (eventData.rtnMsg || fullText);
                 if (eventData.rtnCode == Enum.ReturnCode.Unauthorized) {
-                    if (common.getDataDrivenOpts().handler?.login) { 
+                    if (common.getDataDrivenOpts().handler?.login) {
                         common.getDataDrivenOpts().handler.login();
                     };
                 }

package/src/components/web/ComboBox.vue

@@ -74,7 +74,7 @@ function visibleChange(visible) {
         //出现获取数据
         if (visible) {
             open.value = true;
-            nodatatext.value = '加载中';
+            nodatatext.value = common.LocalizedString('加载中', '加載中');
             if (!model.value.filterable) {
                 getOptions('')
             }

package/src/components/web/Form.vue

@@ -240,8 +240,8 @@ const props = defineProps({
             return [];
         },
     },
-    dialogHeight: String,
-    dialoWidth: String,
+    dialogHeight: Number,
+    dialoWidth: Number,
 })
 
 const itemKey = ref(1)

package/src/components/web/FormList.vue

@@ -72,21 +72,25 @@
                     <h5>{{ model.controlLabel }}</h5>
                 </div>
                 <div class="list-button">
-                  <template v-if="!model.tableDisabled">
-                    <ul>
-                      <li v-for="(v,i) in model.toolButtonsShow" >
-                        <component :is="v.is" :vmodel="v" :parentModel="model" @fieldClick="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
-                      </li>
-                      <li v-if="model.selectRouter!==null">
-                        <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle(model.selectRouter)"></component>                        
-                      </li>
-                      <li v-if="model.create">
-                        <el-button :disabled="model.disabled" class="btn-add" type="success" style="width: auto;" size="small" :icon="CirclePlus" @click="addRow">
-                          {{ model.createText }}
-                        </el-button>                    
-                      </li>
-                    </ul>
-                  </template>
+                    <template v-if="!model.tableDisabled">
+                        <ul>
+                            <li v-for="(v, i) in model.toolButtonsShow">
+                                <component :is="v.is" :vmodel="v" :parentModel="model" @fieldClick="toolButtonsClick"
+                                    @importComplete="importComplete" @change="toolButtonsChangeHandler(v, $event)">
+                                </component>
+                            </li>
+                            <li v-if="model.selectRouter !== null">
+                                <component :is="model.selectRouter.is" :vmodel="model.selectRouter"
+                                    @click="popupSearchListHandle(model.selectRouter)"></component>
+                            </li>
+                            <li v-if="model.create">
+                                <el-button :disabled="model.disabled" class="btn-add" type="success"
+                                    style="width: auto;" size="small" :icon="CirclePlus" @click="addRow">
+                                    {{ model.createText }}
+                                </el-button>
+                            </li>
+                        </ul>
+                    </template>
                 </div>
                 <el-table :data="model.tableData" border :show-summary="model.showSummary"
                     :summary-method="getSummaries" style="width: 100%" highlight-current-row>
@@ -113,8 +117,10 @@
                                     @click="saveRow(scope.row, scope.$index, false)"
                                     style="cursor: pointer;">取消</el-tag>
                                 <template v-for="(v, i) in model.buttons">
-                                    <el-tag v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}</el-tag>
+                                    <el-tag
+                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label
+                                        }}</el-tag>
                                 </template>
                             </template>
                         </el-table-column>
@@ -141,8 +147,9 @@
                                 </span>
                                 <!--可点击的列-->
                                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                                  <Tablecurrency :router="v.router" :colValue="scope.row[v.fieldName1].code1" :rowData="scope.row" @click="rolRouterClickHandler">
-                                  </Tablecurrency>
+                                    <Tablecurrency :router="v.router" :colValue="scope.row[v.fieldName1].code1"
+                                        :rowData="scope.row" @click="rolRouterClickHandler">
+                                    </Tablecurrency>
                                 </span>
                                 <ct-span v-else-if="scope.row[v.fieldName1]" :vmodel="scope.row[v.fieldName1]"
                                     :rowNum="scope.row.$sourceIndex" :rowData="scope.row"></ct-span>
@@ -172,8 +179,10 @@
                                     @click="saveRow(scope.row, scope.$index, false)"
                                     style="cursor: pointer;">取消</el-tag>
                                 <template v-for="(v, i) in model.buttons">
-                                    <el-tag v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}</el-tag>
+                                    <el-tag
+                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label
+                                        }}</el-tag>
                                 </template>
                             </template>
                         </el-table-column>
@@ -424,9 +433,26 @@ function getSummaries(param) {
 function fieldsValidExcute() {
     var rtnBool = true;
     var i = 0;
+    var controlLabel = model.value.controlLabel;
+    //如果当前组件的controlLabel为空 取上一个分组组的controlLabel
+    if (!model.value.controlLabel) {
+        if (model.value.form && model.value.form.fields) {
+            const currentIndex = model.value.form.fields.findIndex(v => v.fieldName1 === model.value.fieldName1);
+            if (currentIndex - 1 >= 0) {
+                if (model.value.form.fields[currentIndex - 1].controlType == Enum.ControlType.Group){
+                    controlLabel = model.value.form.fields[currentIndex - 1].controlLabel;
+                }
+            }
+        }
+    }
     if (model.value.required) {
         if (model.value.tableData.length == 0) {
-            model.value.displayValidMessage = common.LocalizedString('请填写', '請填寫') + '[' + model.value.controlLabel + ']'
+            if (controlLabel) {
+                model.value.displayValidMessage = common.LocalizedString('请填写', '請填寫') + '[' + controlLabel + ']'
+            }
+            else {
+                model.value.displayValidMessage = '表格不能为空'
+            }
             return false;
         }
     }
@@ -495,23 +521,23 @@ function setcolumnminWidth(column) {
 function buttonClick(row, button) {
     var submitData = {};
     button.submitFormField.forEach((v) => {
-        submitData[v] = common.getDataOfUpperLower(row,v).code1;
+        submitData[v] = common.getDataOfUpperLower(row, v).code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 
     emit('tableButtonClick', button, submitData);
 }
-function rolRouterClickHandler(field, rowData,rowindex) {
-  buttonClick(rowData, field);
+function rolRouterClickHandler(field, rowData, rowindex) {
+    buttonClick(rowData, field);
 }
 function toolButtonsClick(field) {
-  emit('tableButtonClick', field, null);
+    emit('tableButtonClick', field, null);
 }
 function toolButtonsChangeHandler(field) {
-  emit('change', field);
+    emit('change', field);
 }
 function importComplete(res, button) {
-  emit('importComplete', res, button);
+    emit('importComplete', res, button);
 }
 function insertOrUpdateRow(row) {
     FormList.insertOrUpdateRow(row, true, model.value);
@@ -623,6 +649,7 @@ defineExpose({
     padding: 10px;
     width: 100%;
 }
+
 .list-button ul li {
     margin-right: 5px;
     float: left;

package/src/components/web/Span.vue

@@ -95,10 +95,10 @@ function getLableShow() {
             labelShow = props.vmodel.getCheckedName();;
             break;
         case Enum.ControlType.Switch:
-            labelShow = props.vmodel.code1 ? '开启' : '关闭';
+            labelShow = props.vmodel.value? '开启' : '关闭';
             break;
         case Enum.ControlType.CheckBox:
-            labelShow = props.vmodel.code1 ? '是' : '否';
+            labelShow = props.vmodel.value? '是' : '否';
             break;
         default:
             break;

package/src/loader/src/CheckBoxList.js

@@ -8,7 +8,7 @@ const CheckBoxList = function (source) {
             this._value = [];
             if (source.code1) {
                 let val = source.code1
-                if (typeof source.code1 === 'string'){
+                if (typeof source.code1 === 'string') {
                     val = JSON.parse(source.code1)
                 }
                 val.forEach((v) => {
@@ -33,14 +33,14 @@ const CheckBoxList = function (source) {
             });
             currentOptions.forEach((v) => {
                 rtn.globalOptions.forEach((v1) => {
-                    if(v.code===v1.code){
-                        v['rowID']=v1['rowID']
+                    if (v.code === v1.code) {
+                        v['rowID'] = v1['rowID']
                     }
                 });
             });
             if (source.code1) {
                 let checked = source.code1
-                if (typeof source.code1 === 'string'){
+                if (typeof source.code1 === 'string') {
                     checked = JSON.parse(source.code1)
                 }
                 checked.forEach((v) => {
@@ -68,17 +68,28 @@ const CheckBoxList = function (source) {
         //初始数据
         get globalOptions() {
             if (source.code1) {
-                if (typeof source.code1 === 'string'){
+                if (typeof source.code1 === 'string') {
                     return [].concat(JSON.parse(source.code1));
                 }
                 return [].concat(source.code1);
-                
+
             }
             else {
                 return []
             }
         },
-
+        getCheckedName() {
+            var nameArr = '';
+            var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
+            checked.forEach((v) => {
+                if (v['code']) {
+                    if (!v['flagDeleted']) {
+                        nameArr = nameArr + (nameArr ? ' ' : '') + v['name'];
+                    }
+                }
+            });
+            return nameArr;
+        },
 
     };
     rtn = base.copy(source, rtn);

package/src/loader/src/Form.js

@@ -63,17 +63,6 @@ function loadFromModel(source, isFormList) {
           router[attrKey] = attrValue;
         }
       },
-      setbuttonRouter(id, attrKey, attrValue) {
-        var router = this.form.buttons.find((v1) => {
-          return v1.key === id;
-        });
-        if (router) {
-          router[attrKey] = attrValue;
-          if (common.flagApp() && this.form.$vue.loaded) {
-            this.form.$vue.loaded(this.form)
-          }
-        }
-      },
       //获取Field的属性attrKey的值
       getValueByFieldName(id, attrKey) {
         attrKey = common.initialsToLowerCase(attrKey);
@@ -125,6 +114,11 @@ function loadFromModel(source, isFormList) {
             }
             if (rtn1.itemKey) rtn1.itemKey = Math.random()
           }
+          if (rtn1.is == 'ct-button') {
+            if (common.flagApp() && this.form.$vue.loaded) {
+              this.form.$vue.loaded(this.form)
+            }
+          }
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }
@@ -917,14 +911,14 @@ function allRequiredHandle(model) {
 function requiredHandle(item, model) {
   if (item.fieldName1) {
     let field = null;
+    let field1 = null;
     let value = getFieldValue(item);
     for (var i in model.fields) {
       if (model.fields[i].requiredRelationField === item.fieldName1) {
         field = model.fields[i];
-        let f = model.fieldsDic[field.fieldName1];
         if (field) {
-          let hiddenValueArr = field.requiredRelationFieldValue.split(',');
-          if (hiddenValueArr.indexOf(value) > -1) {
+          let requiredValueArr = field.requiredRelationFieldValue.split(',');
+          if (requiredValueArr.indexOf(value) > -1) {
             field.required = true;
           }
           else {
@@ -932,6 +926,22 @@ function requiredHandle(item, model) {
           }
         }
       }
+      if (model.fields[i].controlType == Enum.ControlType.Compound || model.fields[i].controlType == Enum.ControlType.ContainerControl) {
+        for (var i1 in model.fields[i].fields) {
+          if (model.fields[i].fields[i1].requiredRelationField === item.fieldName1) {
+            field1 = model.fields[i].fields[i1];
+            if (field1) {
+              let requiredValueArr = field1.requiredRelationFieldValue.split(',');
+              if (requiredValueArr.indexOf(item.code1) > -1) {
+                field1.required = true;
+              }
+              else {
+                field1.required = false;
+              }
+            }
+          }
+        }
+      }
     }
   }
 }