Merge branch 'dev'

@CONTROL/列表/CONTROL-BASE.vue.ftl

@@ -213,12 +213,12 @@ import CodeListService from "@/codelist/codelist-service";
     @Prop() public fetchAction!: string;
 
     /**
-     * 是否单选
+     * 父引用类型
      *
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop({default:true}) public isSingleSelect?: boolean;
+    @Prop({default:true}) public parentType: any;;
 
 <#if view.getPSAppViewLogics?? && view.getPSAppViewLogics()??>
   <#list view.getPSAppViewLogics() as logic>
@@ -918,11 +918,17 @@ import CodeListService from "@/codelist/codelist-service";
      *
      */
     public handleClick(args: any) {
-        //  this.clearSelection();
-        if(this.isSingleSelect){
+        if(this.parentType && this.parentType === "listExpBar") {
+            const flag = args.isselected;
             this.clearSelection();
+            if(!flag) {
+                args.isselected = !args.isselected;
+            } else {
+                args.isselected = flag;
+            }
+        } else {
+            args.isselected = !args.isselected;
         }
-        args.isselected = !args.isselected;
         this.selectchange();
     }
 

@CONTROL/列表/CONTROL.html.ftl

@@ -8,7 +8,7 @@
   <#if view.getViewType() == 'DELISTEXPVIEW'>
     :isSelectFirstDefault="true"
   </#if>
-  :isSingleSelect="isSingleSelect"
+  :parentType="controlType"
   <#if view.getPSAppViewLogics?? && view.getPSAppViewLogics()??>
     <#list view.getPSAppViewLogics() as logic>
       <#if logic.getPFLogicCodeType() == 'APP_NEWDATA'>

@CONTROL/列表导航/CONTROL-BASE.vue.ftl

@@ -173,6 +173,15 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
      */
     public searchText:string = "";
 
+    /**
+     * 部件类型
+     * 
+     * @public
+     * @type {(string)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public controlType: string = "listExpBar";
+
     /**
      * 分割宽度
      *

@CONTROL/看板视图/CONTROL-BASE.vue.ftl

@@ -21,12 +21,12 @@ ${ctrl.render.code}
                         </div>
                     </div>
                 </draggable>
-                <div :key="group + index" class="dataview-group-content dataview-group-kanban" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>">
+                <div v-show="group.folding" :key="group + index" class="dataview-group-content dataview-group-kanban" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>">
                     <div class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>">
                         <div class="fold-icon" @click="onClick(group,index)">
                             <i class="el-icon-s-fold" :title="$t('app.kanban.fold')"></i>
                         </div>
-                        <span>
+                        <span class="fold-text">
                             {{ getGroupText(group.value) }}
                         </span>
                         <#if ctrl.getGroupPSUIActionGroup()??>
@@ -53,7 +53,7 @@ ${ctrl.render.code}
                         </Poptip>
                         </#if>
                     </div>
-                    <draggable v-show="group.folding" :list="group.items" group="${ctrl.name}" class="dataview-group-items" @change="onDragChange($event, group.value)">
+                    <draggable :list="group.items" group="${ctrl.name}" class="dataview-group-items" @change="onDragChange($event, group.value)">
                         <div v-for="(item, i) in group.items" :key="i" :class="{'dataview-group-item': true, 'is-select': item.isselected}" @click="handleClick(item)" @dblclick="handleDblClick(item)">
                             <#if ctrl.getItemPSLayoutPanel()??>
                             <#assign panel = ctrl.getItemPSLayoutPanel()>

@CONTROL/看板视图/CONTROL.less.ftl

@@ -10,7 +10,6 @@
     width: 40px;
     background-color: #d8d8d8;
     color: #a5a5a5;
-    display: none;
     .unfold-icon {
         padding: 3px 0;
         font-size: 20px;
@@ -39,6 +38,9 @@
           color:#a5a5a5;
           position: absolute;
       }
+      .fold-text {
+        margin-left: 24px;
+      }
       .group-action {
         .group-action-item:nth-child(1) + .group-action-item {
           margin-top: 5px;
@@ -90,6 +92,9 @@
     border: none !important;
     padding: 0px !important;
     height: 0px !important;
+    width: 10px !important;
+    color: #fff;
+    overflow: hidden;
     .app-layoutpanel {
       .app-layoutpanel-container {
         padding: 0px !important;

@VIEW/@MACRO/LIST_VIEW.vue.ftl

@@ -30,6 +30,14 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
      */
     public query: string = '';
 
+    /**
+     * 视图类型
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${view.name}')}
+     */
+    public controlType: string = "view";
+
     /**
      * 是否展开搜索表单
      *

@VIEW/实体列表视图（部件视图）/VIEW-BASE.vue.ftl

@@ -45,6 +45,14 @@
      */
     protected query: string = '';
 
+    /**
+     * 视图类型
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${view.name}')}
+     */
+    public controlType: string = "view";
+
     /**
      * 是否展开搜索表单
      *

APP/src/locale/lang/en-US-base.ts.ftl

@@ -36,7 +36,8 @@ function getAppLocale(){
                 startsuccess:"Start successful",
                 loadmore:"Load more",
                 nomore:"No more",
-                other:"other"
+                other:"other",
+                valueNotEmpty:"The value cannot be null",
             },
             local:{
                 new: "New",

APP/src/locale/lang/zh-CN-base.ts.ftl

@@ -36,7 +36,8 @@ function getAppLocale(){
                 startsuccess:"启动成功",
                 loadmore:"加载更多",
                 nomore:"没有更多了",
-                other:"其他"
+                other:"其他",
+                valueNotEmpty:"值不能为空",
             },
             local:{
                 new: "新建",