fix: 流程样式优化

src/views/flow/stDesignMain/index.vue

@@ -5,7 +5,7 @@
         <span class="pg-h-txt">{{ title }}<span style="padding: 20px;font-size: 14px;color: #0D366F">{{ flowCode}}</span></span>
         <a-button-group size="large" style="flex: 1; display: flex; justify-content: center">
           <a-button
-              :type="currentComName === item.componentName && 'primary'"
+              :type="currentComName === item.componentName? 'primary':''"
               size="large"
               @click="switchTag(item, index)"
               v-for="(item, index) in headerList"

src/views/flow/stFormDesign/packages/StFormDesign/module/formComponentPanel.vue

@@ -55,23 +55,18 @@
     <div v-show="showRightMenu" :style="{ top: menuTop + 'px', left: menuLeft + 'px' }" class="right-menu">
       <ul>
         <li @click="handleDownMerge">
-          <a-icon type="caret-down"/>
           向下合并
         </li>
         <li @click="handleRightMerge">
-          <a-icon type="caret-right"/>
           向右合并
         </li>
         <li @click="handleRightSplit">
-          <a-icon type="border-inner"/>
           拆分单元格
         </li>
         <li @click="handleAddCol">
-          <a-icon type="border-horizontal"/>
           增加一列
         </li>
         <li @click="handleAddRow">
-          <a-icon type="border-verticle"/>
           增加一行
         </li>
       </ul>

src/views/flow/stFormDesign/packages/StFormDesign/module/formComponentPanelMobile.vue

@@ -58,23 +58,18 @@
         <div v-show="showRightMenu" :style="{ top: menuTop + 'px', left: menuLeft + 'px' }" class="right-menu">
           <ul>
             <li @click="handleDownMerge">
-              <a-icon type="caret-down"/>
               向下合并
             </li>
             <li @click="handleRightMerge">
-              <a-icon type="caret-right"/>
               向右合并
             </li>
             <li @click="handleRightSplit">
-              <a-icon type="border-inner"/>
               拆分单元格
             </li>
             <li @click="handleAddCol">
-              <a-icon type="border-horizontal"/>
               增加一列
             </li>
             <li @click="handleAddRow">
-              <a-icon type="border-verticle"/>
               增加一行
             </li>
           </ul>

src/views/flow/stFormDesign/packages/StFormDesign/module/formItemProperties.vue

@@ -83,7 +83,7 @@
 <!--        <a-form-item v-if="typeof options.width !== 'undefined'&&!isInBatchTable" label='宽度'>-->
 <!--          <a-input placeholder='请输入' v-model:value='options.width'/>-->
 <!--        </a-form-item>-->
-        <a-form-item v-if="isInBatchTable">
+        <a-form-item v-if="isInBatchTable&&selectItem.type != 'text'">
           <template #label>
             <span style="display: inline-flex; align-items: center;">
               <a-tooltip placement="topLeft">
@@ -511,36 +511,36 @@
               placeholder='严格JSON格式'
           ></a-textarea>
         </a-form-item>
-        <!-- 文字对齐方式 -->
-        <a-form-item v-if="selectItem.type === 'text'" label='文字对齐方式'>
-          <a-radio-group buttonStyle='solid' v-model:value='options.textAlign'>
-            <a-radio-button value='left'>左</a-radio-button>
-            <a-radio-button value='center'>居中</a-radio-button>
-            <a-radio-button value='right'>右</a-radio-button>
-          </a-radio-group>
-        </a-form-item>
-        <!-- 文字字体 -->
-        <a-form-item v-if="selectItem.type === 'text'" label='字体属性设置'>
-          <!-- <colorPicker v-model:value='options.color' /> -->
-          <a-select
-              :options='familyOptions'
-              v-model:value='options.fontFamily'
-              style='width:36%;margin-left:2%;vertical-align:bottom;'
-          />
-          <a-select
-              :options='sizeOptions'
-              v-model:value='options.fontSize'
-              style='width:35%;margin-left:2%;vertical-align:bottom;'
-          />
-          <a-checkbox v-model:checked="options.fontBold">加粗</a-checkbox>
-        </a-form-item>
-        <a-form-item v-if="selectItem.type === 'text'" label='操作属性'>
-          <stCheckbox v-model:value='options.showRequiredMark' label='显示必选标记'/>
-        </a-form-item>
+<!--        &lt;!&ndash; 文字对齐方式 &ndash;&gt;-->
+<!--        <a-form-item v-if="selectItem.type === 'text'" label='文字对齐方式'>-->
+<!--          <a-radio-group buttonStyle='solid' v-model:value='options.textAlign'>-->
+<!--            <a-radio-button value='left'>左</a-radio-button>-->
+<!--            <a-radio-button value='center'>居中</a-radio-button>-->
+<!--            <a-radio-button value='right'>右</a-radio-button>-->
+<!--          </a-radio-group>-->
+<!--        </a-form-item>-->
+<!--        &lt;!&ndash; 文字字体 &ndash;&gt;-->
+<!--        <a-form-item v-if="selectItem.type === 'text'" label='字体属性设置'>-->
+<!--          &lt;!&ndash; <colorPicker v-model:value='options.color' /> &ndash;&gt;-->
+<!--          <a-select-->
+<!--              :options='familyOptions'-->
+<!--              v-model:value='options.fontFamily'-->
+<!--              style='width:36%;margin-left:2%;vertical-align:bottom;'-->
+<!--          />-->
+<!--          <a-select-->
+<!--              :options='sizeOptions'-->
+<!--              v-model:value='options.fontSize'-->
+<!--              style='width:35%;margin-left:2%;vertical-align:bottom;'-->
+<!--          />-->
+<!--          <a-checkbox v-model:checked="options.fontBold">加粗</a-checkbox>-->
+<!--        </a-form-item>-->
+<!--        <a-form-item v-if="selectItem.type === 'text'" label='操作属性'>-->
+<!--          <stCheckbox v-model:value='options.showRequiredMark' label='显示必选标记'/>-->
+<!--        </a-form-item>-->
 
         <a-form-item
-            v-if="
-            (typeof options.hidden !== 'undefined' ||
+            v-if="  selectItem.type!='text'&&
+            ((typeof options.hidden !== 'undefined' ||
               typeof options.disabled !== 'undefined' ||
               typeof options.readonly !== 'undefined' ||
               typeof options.clearable !== 'undefined' ||
@@ -549,7 +549,7 @@
               typeof options.showTime !== 'undefined' ||
               typeof options.allowHalf !== 'undefined' ||
               typeof options.showInput !== 'undefined' ||
-              typeof options.animated !== 'undefined') || ['divider', 'alert', 'table', 'button', 'grid', 'card', 'tabs', 'text'].includes(selectItem.type)
+              typeof options.animated !== 'undefined') || ['divider', 'alert', 'table', 'button', 'grid', 'card', 'tabs', 'text'].includes(selectItem.type))
           "
             label='操作属性'
         >
@@ -559,6 +559,7 @@
               label='子表卡片展示'
           />
           <stCheckbox
+
               v-model:value='options.hidden'
               label='隐藏'
           />
@@ -712,7 +713,7 @@ import JsModal from './jsModal.vue'
 import cloneDeep from 'lodash.clonedeep';
 
 function hasBatchParent(code, jsonData) {
-  if (code.indexOf('html_')>=0){
+  if (code&&code.indexOf('html_')>=0){
     return false
   }
   // 遍历jsonData中的每个元素

src/views/flow/stFormDesign/packages/StFormDesign/module/layoutItem.vue

@@ -144,12 +144,12 @@
         </a-form-item>
         <div class="copy" :class="record.key === selectItem.key ? 'active' : 'unactivated'"
              @click.stop="$emit('handleCopy')">
-          <a-icon type="copy"/>
+          复制
         </div>
 
         <div class="delete" :class="record.key === selectItem.key ? 'active' : 'unactivated'"
              @click.stop="$emit('handleDelete')">
-          <a-icon type="delete"/>
+         删除
         </div>
       </div>
     </template>

src/views/flow/stFormDesign/packages/StFormDesign/module/operatingArea.vue

@@ -8,7 +8,6 @@
     <div class="left-btn-box">
       <a-tooltip title="保存">
         <a v-if="toolbars.includes('save')" @click="$emit('handleSave')">
-          <!-- <a-icon type="save" /> -->
           <span v-if="showToolbarsText">保存</span>
         </a>
       </a-tooltip>
@@ -24,7 +23,6 @@
             v-if="toolbars.includes('importJson')"
             @click="$emit('handleOpenImportJsonModal')"
         >
-          <!-- <a-icon type="upload" /> -->
           <span v-if="showToolbarsText">导入</span>
         </a>
       </a-tooltip>
@@ -44,14 +42,12 @@
             v-if="toolbars.includes('exportCode')"
             @click="$emit('handleOpenCodeModal')"
         >
-          <!-- <a-icon type="code" /> -->
           <span v-if="showToolbarsText">生成代码</span>
         </a>
       </a-tooltip>
 
       <a-tooltip title="清空">
         <a @click="$emit('handleReset')">
-          <!-- <a-icon type="delete" /> -->
           <span v-if="showToolbarsText">清空</span>
         </a>
       </a-tooltip>
@@ -62,7 +58,6 @@
             :class="{ disabled: !(recordList.length > 0) }"
             @click="$emit('handleUndo')"
         >
-          <!-- <a-icon type="undo" /> -->
           <span v-if="showToolbarsText">撤销</span>
         </a>
       </a-tooltip>
@@ -72,7 +67,6 @@
             :class="{ disabled: !(redoList.length > 0) }"
             @click="$emit('handleRedo')"
         >
-          <!-- <a-icon type="redo" /> -->
           <span v-if="showToolbarsText">重做</span>
         </a>
       </a-tooltip>

src/views/flow/stFormDesign/packages/StFormItem/index.vue

@@ -146,20 +146,12 @@
                :showIcon="record.options.showIcon" :closable="record.options.closable" :banner="record.options.banner"/>
     </a-form-item>
 
-    <!-- 文本
-    <a-form-item v-else-if="record.type === 'text'">
-      <div :style="{ textAlign: record.options.textAlign }">
-        <div v-for="(text, i) in record.label.split('<br>')">
-          <label :class="{ 'ant-form-item-required': record.options.showRequiredMark }" :style="{
-            fontFamily: record.options.fontFamily,
-            fontSize: record.options.fontSize,
-            color: record.options.color,
-            fontWeight: record.options.fontBold == true ? '800' : '100',
-          }" v-text="text"></label>
-        </div>
 
+    <a-form-item v-else-if="record.type === 'text'&&isDesign==true">
+      <div :style="{ textAlign: record.options.textAlign, fontSize: '22px',fontWeight:100,fontFamily:'SimHei' }">
+        {{ record.label }}
       </div>
-    </a-form-item> -->
+    </a-form-item>
     <!-- html -->
     <div :id="record.key" v-else-if="record.type === 'html'"
          v-html="getHtml(record.options.defaultValue)"></div>

src/views/flow/stFormWork/style/formWork.less

@@ -202,7 +202,6 @@
 :deep(.ant-select-disabled .ant-select-selection),
 :deep(.ant-btn[disabled]),
 :deep(.ant-input-disabled) {
-  border-radius: 0px;
   background-color: #fafafa !important;
   color: black;
 }