Merge remote-tracking branch 'origin/qin_25'

src/components/DesignForm/app/index.vue

@@ -17,6 +17,7 @@ import {
   FormPageList,
   FormPageConfig,
   viewPageType,
+  tableButton,
 } from "@/api/DesignForm/tableButton";
 import {
   inputUnit,
@@ -56,12 +57,15 @@ import AKSelect from "@/components/DesignForm/public/form/select.vue";
 import ContainerPath from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue";
 import exportPanel from "../exportPanel.vue";
 import importPanel from "../importPanel.vue";
+import { EpPropMergeType } from "element-plus/es/utils";
+import { RendererNode, RendererElement } from "vue";
+import { echatsViews } from "@/api/DesignForm/types";
 
 const props = withDefaults(
   defineProps<{
     data: FormPageList;
     searchData?: attrButton[];
-    config: FormPageConfig;
+    config?: FormPageConfig|any;
     formId?: string;
     beforeRequest?: (params: any, rout: any) => any;
     afterResponse?: (result: any) => any | string;
@@ -79,7 +83,7 @@ const props = withDefaults(
     signCode?: string;
     pickAppMenu?: any;
     versiontitle?: string;
-    viewPage?: viewPageType;
+    viewPage?: viewPageType|any;
     formBasicConfig?: any;
     fieldsDetailList?: any;
     orgAndManTree?: any;
@@ -1512,7 +1516,7 @@ const confirmEvent = (val: any) => {
     id: [val.masters_key],
     isTrue: 2,
   };
-  softDeletion(sendData).then((data) => {
+  softDeletion(sendData).then((data: { mag: EpPropMergeType<(new (...args: any[]) => string|globalThis.VNode<RendererNode, RendererElement, { [key: string]: any; }>)|(() => string|globalThis.VNode<RendererNode, RendererElement, { [key: string]: any; }>)|((new (...args: any[]) => string|globalThis.VNode<RendererNode, RendererElement, { [key: string]: any; }>)|(() => string|globalThis.VNode<RendererNode, RendererElement, { [key: string]: any; }>))[], unknown, unknown>|undefined; }) => {
     // console.log('cancel!',data)
     ElNotification({
       title: "系统提示！",
@@ -1709,10 +1713,10 @@ const tabsView = (val: any, types: number) => {
 const writeListTitle = (val: any, viewConfig: any) => {
   // console.log("判断是否有标题--1-->",val)
   // console.log("判断是否有标题--2-->",viewConfig)
-  var titleAry = [];
+  var titleAry: any[] = [];
   if (viewConfig.form && viewConfig.form.title) {
     if (viewConfig.form.title.length > 0) {
-      viewConfig.form.title.forEach((item, index) => {
+      viewConfig.form.title.forEach((item: string|number, index: any) => {
         // console.log("判断是否有标题--"+index+"-->",val[item])
         if (val[item]) {
           titleAry.push(val[item]);
@@ -1902,7 +1906,122 @@ const readerColumnSun = (column: any) => {
               {{ item.label }}
             </el-button>
           </div>
-          <div></div>
+          <div>
+            <el-button-group class="ml-4">
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                content="折叠查询表单"
+                placement="bottom"
+              >
+                <el-button
+                  size="small"
+                  @click="config.searchIsShow = !config.searchIsShow"
+                  class="fa fa-search"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.list.status"
+                class="box-item"
+                effect="dark"
+                content="列表视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-table"
+                  :color="viewPage.list.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.list, 1)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="props.viewPage.card && props.viewPage.card.status"
+                class="box-item"
+                effect="dark"
+                content="卡片视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-id-card-o"
+                  :color="
+                    props.viewPage.card && props.viewPage.card.isClick ? '#a0cfff' : ''
+                  "
+                  @click="tabsView(props.viewPage.card, 6)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.date.status"
+                class="box-item"
+                effect="dark"
+                content="日历视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-calendar"
+                  :color="viewPage.date.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.date, 2)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.time.status"
+                class="box-item"
+                effect="dark"
+                content="时间轴"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-clock-o"
+                  :color="viewPage.time.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.time, 3)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.gantt.status"
+                class="box-item"
+                effect="dark"
+                content="甘特图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-bar-chart"
+                  :color="viewPage.gantt.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.gantt, 4)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.map.status"
+                class="box-item"
+                effect="dark"
+                content="地图视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-map-signs"
+                  :color="viewPage.map.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.map, 5)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.chart.status"
+                class="box-item"
+                effect="dark"
+                content="BI报表"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-line-chart"
+                  :color="viewPage.chart.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.chart, 7)"
+                />
+              </el-tooltip>
+            </el-button-group>
+          </div>
         </div>
       </el-col>
 

src/components/DesignForm/public/expand/datePicker.vue

@@ -96,6 +96,7 @@ const shichang = computed(() => {
     :placeholder="props.data.control.placeholder"
     :value-format="valueFormat"
     :format="props.data.control.format"
+    clearable
   />
 
   <!-- 2 天 3 小时 -->

src/components/DesignForm/public/expand/digitpage.vue

@@ -142,6 +142,7 @@ const judgeIsDisabled = (key: string) => {
     @change="onValueChange"
     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')"
     placeholder="请输入"
+    clearable
   >
     <template #append v-if="config.append">
       <div v-if="getInputSlot()">

src/components/DesignForm/public/expand/diy-iconfont.vue

@@ -76,7 +76,7 @@ const iconClick = (newVal: string) => {
 		</div>
 		<template #reference>
 			<div class="iconfont-input">
-			<el-input v-model="value" placeholder="输入或选择iconfont图标" />
+			<el-input v-model="value" placeholder="输入或选择iconfont图标" clearable />
 				<div @click.stop="" class="color-input" v-if="colorPicker"><el-color-picker v-model="color" /></div>
 			</div>
 		</template>

src/components/DesignForm/public/expand/org.vue

@@ -83,6 +83,7 @@ onMounted(() => {
     :data="orgTreeList"
     check-strictly
     :render-after-expand="false"
+    clearable
   />
   <div></div>
 </template>

src/components/DesignForm/public/expand/orgCitys.vue

@@ -273,17 +273,17 @@ const getFormItemInputStyle = (ele: any,sty:number) => {
 				<el-col :span="21">
 					<el-row :gutter="20">
 						<el-col :span="8">
-							<el-select v-model="province" class="m-2" placeholder="省">
+							<el-select v-model="province" class="m-2" placeholder="省" clearable>
 								<el-option v-for="item in provinceArr" :key="item" :label="item" :value="item" />
 							</el-select>
 						</el-col>
 						<el-col :span="8">
-							<el-select v-model="city" class="m-2" placeholder="市">
+							<el-select v-model="city" class="m-2" placeholder="市" clearable>
 								<el-option v-for="item in cityArr" :key="item" :label="item" :value="item" />
 							</el-select>
 						</el-col>
 						<el-col :span="8">
-							<el-select v-model="area" class="m-2" placeholder="区/县">
+							<el-select v-model="area" class="m-2" placeholder="区/县" clearable>
 								<el-option v-for="item in areaArr" :key="item" :label="item" :value="item" />
 							</el-select>
 						</el-col>

src/components/DesignForm/public/expand/pickpost.vue

@@ -203,6 +203,7 @@ const writeInfo = (val: any) => {
         :render-after-expand="false"
         placeholder="请选择行政组织"
         @change="orgChange"
+        clearable
       />
     </el-col>
     <el-col :span="24">
@@ -210,6 +211,7 @@ const writeInfo = (val: any) => {
         v-model="orgPostInfo.postId"
         v-loading="orgPostTreeLoading"
         placeholder="请选择岗位"
+        clearable
       >
         <el-option
           v-for="item in postOptions"
@@ -219,7 +221,7 @@ const writeInfo = (val: any) => {
         />
       </el-select>
     </el-col>
-    <el-input style="display: none" v-model="value" placeholder="请选择" />
+    <el-input style="display: none" v-model="value" placeholder="请选择" clearable />
   </el-row>
   <div v-else v-html="writeInfo(value)"></div>
 </template>

src/components/DesignForm/public/expand/pickrole.vue

@@ -43,7 +43,7 @@ onBeforeMount(() => {
 });
 </script>
 <template>
-  <el-select v-model="value" placeholder="请选择">
+  <el-select v-model="value" placeholder="请选择" clearable>
     <el-option
       v-for="item in roleLiet"
       :key="item.id"

src/components/DesignForm/public/expand/uploadPage.vue

@@ -146,6 +146,7 @@ const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => {
       v-bind="props.control"
       :action="uploadUrl"
       :name="props.name"
+      clearable
       :class="{ limit: props.control.limit <= fileList.length }"
       :file-list="fileList as any"
       :style="getFormItemInputStyle(configStyle, 2)"

src/components/DesignForm/public/expand/user.vue

@@ -73,6 +73,7 @@ onMounted(() => {
 		v-bind="$props"
 		v-model="value"
 		@click="openDialog"
+		clearable
 	>
 		<template #append>
 			<i class="icon-user" @click.stop="openDialog"></i>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue

@@ -504,6 +504,10 @@ const searchList = () => {
 */
 const pickDimMeaSet = () => {
   console.log("确定选择", props.dimMeaType);
+  console.log(
+    "确定选择----------checkListsunduLiang-------------->",
+    checkListsunduLiang.value
+  );
   switch (props.dimMeaType) {
     case 2:
       drawTitle.value = "添加度量";
@@ -642,6 +646,7 @@ const duliangBianhua = () => {
   }
 };
 const checkListsund = ref([]);
+const checkListsunduLiang = ref([]);
 </script>
 <template>
   <el-drawer
@@ -703,16 +708,13 @@ const checkListsund = ref([]);
         >子表</el-divider
       >
       <el-tabs v-if="props.dimMeaType != 2" type="border-card">
-        <el-tab-pane v-for="(item, index) in props.sunDimAry" :label="index">
+        <el-tab-pane v-for="(item, index) in props.sunMeaAry" :label="index">
           <el-checkbox-group v-model="checkListsund">
             <div v-for="(iv, idx) in item">
               <el-checkbox :value="iv.field" :label="iv.title" size="large" :key="idx" />
             </div>
           </el-checkbox-group>
         </el-tab-pane>
-        <el-tab-pane label="Config">Config</el-tab-pane>
-        <el-tab-pane label="Role">Role</el-tab-pane>
-        <el-tab-pane label="Task">Task</el-tab-pane>
       </el-tabs>
 
       <el-divider
@@ -768,12 +770,13 @@ const checkListsund = ref([]);
         >子表</el-divider
       >
       <el-tabs v-if="props.dimMeaType != 1" type="border-card">
-        <el-tab-pane v-for="(item, index) in props.sunMeaAry" :label="index">{{
+        <el-tab-pane v-for="(item, index) in props.sunDimAry" :label="index">
-          item
+          <el-checkbox-group v-model="checkListsunduLiang">
-        }}</el-tab-pane>
+            <div v-for="(iv, idx) in item">
-        <el-tab-pane label="Config">Config</el-tab-pane>
+              <el-checkbox :value="iv.field" :label="iv.title" size="large" :key="idx" />
-        <el-tab-pane label="Role">Role</el-tab-pane>
+            </div>
-        <el-tab-pane label="Task">Task</el-tab-pane>
+          </el-checkbox-group>
+        </el-tab-pane>
       </el-tabs>
 
       <el-button class="drawBut" type="primary" @click="pickDimMeaSet()">确定</el-button>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue

@@ -1617,6 +1617,7 @@ const delAllPick = () => {
           </el-button>
         </div>
         <div>
+          {{ state.view }}
           <el-button-group class="ml-4">
             <el-tooltip
               v-if="state.config.searchFormIsShow"

src/views/sysworkflow/lowcodepage/pageList.vue

@@ -991,6 +991,7 @@ const dialogConfirm = (editVal: string) => {
             </el-button>
           </div>
           <div>
+            {{ state.view }}
             <el-button-group class="ml-4">
               <el-tooltip
                 v-if="state.config.searchFormIsShow"

src/widget/associatedforms/associatedFormsChildFillRole.vue

@@ -8,7 +8,7 @@
     <el-tree-select 
       v-model="selectedChildTable1"  style="width: 270px;margin-bottom: -1px" :data="childTableList" :disabled="isDisabled"
       placeholder="请选择关联表单子表" check-strictly :render-after-expand="false" filterable
-      @change="selectedChildTableChanged" />
+      @change="selectedChildTableChanged"  clearable />
     <el-popover placement="top-end" title="" :width="200" trigger="hover" content="若【设置筛选条件】，则仅填充满足筛选条件的子表数据">
       <template #reference>
         <el-button 
@@ -33,7 +33,7 @@
           <span style="margin-left: 8px;margin-right: 8px;">的值填充到</span>
           <el-tree-select 
             v-model="childRoles1[index].rightValue" style="width: 270px;" :data="currentFormChildTableFieldsForFillRole[0].children"
-            check-strictly :render-after-expand="false"  placeholder="当前表单子表字段" filterable @change="childRoleRightChanged" />
+            check-strictly :render-after-expand="false"  placeholder="当前表单子表字段" filterable @change="childRoleRightChanged" clearable />
             <Delete v-if="childRoles1.length>1" style="width: 22px; height: 22px;cursor: pointer; color: #50A6FF; display: block;  float:right;margin-left: 35px;margin-top: 4px;" @click="delChildRole(item)" />
 
         </div>

src/widget/number/index.vue

@@ -201,7 +201,7 @@ const formatCustomRules = () => {
     </template>
     <div v-if="type === 4" class="form-value" v-html="value"></div>
     <template v-else>
-      <el-input v-model="value" :disabled="editDisabled" placeholder="请输入编码">
+      <el-input v-model="value" :disabled="editDisabled" placeholder="请输入编码" clearable >
         <template #prefix>NO.</template>
       </el-input>
     </template>

src/widget/org/index.vue

@@ -196,6 +196,7 @@ onMounted(() => {
 				check-strictly
 				disabled
 				:render-after-expand="false"
+				clearable
 			/>
 		</template>
 		<template v-else>
@@ -207,6 +208,7 @@ onMounted(() => {
 				:data="orgTreeList"
 				check-strictly
 				:render-after-expand="false"
+				clearable
 			/>
 		</template>
 	</el-form-item>