cloud-web-corejs 1.1.0-dev.19 → 1.1.0-dev.21

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -5,7 +5,7 @@
       size="mini"
       label-position="left"
       label-width="120px"
-      class="setting-form"
+      class="setting-form form-settings-panel"
       @submit.native.prevent
     >
       <el-collapse v-model="formActiveCollapseNames" class="setting-collapse">
@@ -359,9 +359,12 @@
         </el-collapse-item>
         <el-collapse-item name="4" title="列表标签页信息（仅列表表单生效）">
           <el-form-item label-width="0">
-            <span style="color:rgba(0,0,0,0.45); font-size: 12px; line-height: 1.6;display:block;">
+            <el-tooltip placement="left" popper-class="xform-setting-help">
+            <span slot="content">
               本组配置只从「查询列表页」所用的表单读取，在详情/编辑表单里设置不会生效
             </span>
+            <span>适用范围<i class="el-icon-info setting-help-icon" tabindex="0"></i></span>
+            </el-tooltip>
           </el-form-item>
           <el-form-item :label="i18nt('列表启用详情多标签')">
             <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
@@ -379,17 +382,21 @@
           >
             <el-switch v-model="formConfig.addTabEnabled"></el-switch>
             <span style="margin-left: 8px; color: #999; font-size: 12px">
-              开启后新增打开独立可关闭页签，需配置「标签名称字段」
+              <el-tooltip content="开启后新增打开独立可关闭页签，需配置标签名称字段。" placement="left" popper-class="xform-setting-help">
+                <i class="el-icon-info setting-help-icon" tabindex="0" aria-label="新增页签说明"></i>
+              </el-tooltip>
             </span>
           </el-form-item>
-          <el-form-item :label="i18nt('流程启动后行为')" class="form-item-label-top">
+          <el-form-item class="stacked-setting submit-behavior-setting">
+            <span slot="label">{{ i18nt('流程启动后行为') }}
+              <el-tooltip content="详情页保存并提交、直接启动流程成功后的行为，不填默认刷新当前页签。" placement="left" popper-class="xform-setting-help">
+                <i class="el-icon-info setting-help-icon" tabindex="0" aria-label="流程启动后行为说明"></i>
+              </el-tooltip>
+            </span>
             <el-radio-group v-model="formConfig.submitBehavior">
               <el-radio label="closeToList">关闭页签并回列表刷新</el-radio>
               <el-radio label="refreshCurrent">刷新当前页签</el-radio>
             </el-radio-group>
-            <div style="color: #999; font-size: 12px; line-height: 1.6">
-              详情页「保存并提交」「直接启动流程」成功后的行为，不填默认「刷新当前页签」
-            </div>
           </el-form-item>
         </el-collapse-item>
         <el-collapse-item name="5" title="其他标签页信息">
@@ -406,11 +413,11 @@
           <el-form-item :label="i18nt('隐藏常规标签')">
             <el-switch v-model="formConfig.hideNormalTab"></el-switch>
           </el-form-item>
-          <el-form-item :label="i18nt('其他标签页配置')" class="form-item-label-top" label-width="0">
+          <el-form-item :label="i18nt('其他标签页配置')" class="stacked-setting other-tabs-setting">
             <div>
               <draggable
                 tag="ul"
-                class="draggable-box"
+                class="other-tabs-list"
                 :list="formConfig.otherTabList"
                 v-bind="{
                   group: 'optionsGroup',
@@ -1792,3 +1799,61 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
   word-break: break-all;
 }
 </style>
+
+<style lang="scss">
+.form-settings-panel.setting-form {
+  .el-form-item {
+    min-width: 0;
+  }
+  .el-form-item > .el-form-item__label {
+    flex-shrink: 0;
+    white-space: normal !important;
+    overflow-wrap: anywhere;
+    line-height: 20px;
+    text-align: left;
+  }
+  .el-form-item > .el-form-item__content {
+    min-width: 0;
+    line-height: 28px;
+  }
+  .el-form-item__content > .el-input,
+  .el-form-item__content > .el-select,
+  .el-form-item__content > .el-textarea { width: 100% !important; min-width: 0; }
+  .el-form-item__content > .el-select { width: calc(100% - 28px) !important; }
+  .el-form-item__content > a { max-width: 100%; overflow: hidden; text-overflow: ellipsis; }
+  .el-radio { margin: 0 12px 4px 0; white-space: normal; line-height: 22px; }
+  .el-collapse-item__header { height: auto; min-height: 42px; line-height: 22px; padding: 8px 0; }
+  .el-collapse-item__arrow { flex-shrink: 0; }
+  .el-form-item.stacked-setting {
+    display: block !important;
+    > .el-form-item__label {
+      float: none;
+      display: block !important;
+      width: 100% !important;
+      padding: 0 0 8px;
+    }
+    > .el-form-item__content { margin-left: 0 !important; width: 100%; }
+  }
+  .submit-behavior-setting .el-radio-group { display: flex; flex-direction: column; gap: 8px; }
+  .submit-behavior-setting .el-radio { display: flex; align-items: baseline; margin: 0; }
+  .other-tabs-list { padding: 0; margin: 0; width: 100%; }
+  .other-tabs-list > li {
+    display: grid;
+    grid-template-columns: 18px minmax(0, 1fr) 28px;
+    align-items: center;
+    gap: 8px;
+    padding: 10px 8px;
+    margin-bottom: 10px;
+    list-style: none;
+    background: #f5f7fa;
+    border-radius: 4px;
+  }
+  .other-tabs-list > li > .el-input { grid-column: 2; width: 100% !important; min-width: 0; margin: 0; }
+  .other-tabs-list .drag-option { grid-column: 1; grid-row: 1 / 3; cursor: move; color: #909399; }
+  .other-tabs-list .col-delete-button { grid-column: 3; grid-row: 1 / 3; margin: 0; padding: 6px; }
+  .tree-options-error { overflow-wrap: anywhere; margin-bottom: 8px; }
+}
+.setting-help-icon { margin-left: 8px; color: #909399; cursor: help; font-size: 14px; }
+.setting-help-icon:hover, .setting-help-icon:focus { color: #409eff; }
+.el-tooltip__popper.xform-setting-help { max-width: 300px; line-height: 1.7; overflow-wrap: anywhere; }
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import2-button-editor.vue

@@ -154,6 +154,14 @@
     </el-form-item>
     <el-form-item label="启用确认回调">
       <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          选完文件点确定、Excel 解析完后立刻执行。<br/>
+          进度框开：前置钩子，done() 继续导入，close() 中止；不返回 false 则自动继续。<br/>
+          进度框关：由脚本接管整批导入，done() 结束并触发导入完成回调。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
     </el-form-item>
     <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled" class="el-form-item-second">
       <a href="javascript:void(0);" class="a-link link-oneLind"