cloud-web-corejs 1.0.54-dev.365 → 1.0.54-dev.367

package/src/components/xform/form-designer/form-widget/field-widget/project-tag-widget.vue

@@ -26,7 +26,14 @@
         :closable="!field.options.disabled && field.options.tabDeleteEnabled"
         @close="deleteCallback(index)"
       >
-        {{ tag[field.options.tagLabelField] }}
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="tag[field.options.tagLabelField]"
+          placement="bottom"
+        >
+          <span :style="tagStyle">{{ tag[field.options.tagLabelField] }}</span>
+        </el-tooltip>
       </el-tag>
       <el-button
         icon="el-icon-plus"
@@ -101,6 +108,17 @@ export default {
     multi() {
       return this.limit !== 1;
     },
+    tagStyle() {
+      let result = {};
+      let tagWidth = this.field.options.tagWidth;
+      if (tagWidth) {
+        result.width = tagWidth;
+        // result.overflow = "hidden";
+        result.textOverflow = "ellipsis";
+        // result.whiteSpace = "nowrap";
+      }
+      return result;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */

package/src/components/xform/form-designer/form-widget/field-widget/tempStorage-widget.vue

@@ -12,8 +12,14 @@
     :sub-form-row-id="subFormRowId"
   >
     <span class="button-sty" v-if="designState">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain >暂存</el-button>
-      <el-button class="btn-connect" icon="iconfont icon-chakanshuju" type="success"></el-button>
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain
+        >暂存</el-button
+      >
+      <el-button
+        class="btn-connect"
+        icon="iconfont icon-chakanshuju"
+        type="success"
+      ></el-button>
     </span>
     <temp-storage-button
       v-else
@@ -102,7 +108,7 @@ export default {
 
       this.initConfig();
     },
-    initConfig(){
+    initConfig() {
       let formCode = this.getFormRef()?.reportTemplate?.formCode;
       let tempStorageCode = this.field.options.tempStorageCode || formCode;
       let vue = this.getFormRef();
@@ -113,11 +119,25 @@ export default {
           return this.formModel;
         },
         chooseConfirm: (tempStorageData) => {
-          this.getFormRef().setFormData(tempStorageData);
+          vue.showFormContent = false;
+          this.$nextTick(() => {
+            this.getFormRef().setFormData(tempStorageData);
+            this.$nextTick(() => {
+              vue.showFormContent = true;
+              this.$nextTick(() => {
+                this.handleCustomEvent(
+                  this.field.options.tempStorageConfirm,
+                  ["tempStorageData"],
+                  [tempStorageData]
+                );
+              });
+            });
+          });
+          // this.getFormRef().setFormData(tempStorageData);
         },
         saveConfirm: () => {},
-      }
-    }
+      };
+    },
   },
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -22,6 +22,9 @@
     <el-form-item label="查询列表">
       <el-switch v-model="optionModel.isQueryTable"></el-switch>
     </el-form-item>
+    <el-form-item label="是否显示查询按钮">
+      <el-switch v-model="isShowQueryButton"></el-switch>
+    </el-form-item>
     <el-form-item :label="i18nt('designer.setting.showPagination')">
       <el-switch v-model="optionModel.showPagination"></el-switch>
     </el-form-item>
@@ -211,162 +214,6 @@
       </template>
       <code-editor mode="json" :readonly="!1" v-model="tableDataOptions"></code-editor>
     </el-dialog>
-    <!--    <el-dialog
-          v-if="dialogVisible"
-          custom-class="dialog-style list-dialog"
-          :title="i18nt('designer.setting.tableColEdit')"
-          :visible.sync="dialogVisible"
-          :show-close="!0"
-          :append-to-body="false"
-          :modal="false"
-          :close-on-click-modal="!1"
-          :close-on-press-escape="!1"
-          :destroy-on-close="!0"
-          width="1220px"
-          v-dialog-drag
-        >
-          <div class="cont">
-            <template slot="footer">
-              <div class="dialog-footer">
-                <el-button type="" @click="dialogVisible = !1" class="button-sty" icon="el-icon-close">
-                  {{ i18nt('designer.hint.cancel') }}
-                </el-button>
-                <el-button type="primary" @click="colSubmit" class="button-sty" icon="el-icon-check">
-                  {{ i18nt('designer.hint.confirm') }}
-                </el-button>
-
-              </div>
-            </template>
-            <el-table
-              ref="singleTable"
-              width="100%"
-              :data="optionModel.tableColumns"
-
-              height="500"
-              border=""
-              row-key="columnId"
-              stripe=""
-            >
-              <el-table-column type="index" width="35" fixed="left"></el-table-column>
-              <el-table-column label="" width="35"><i class="el-icon-s-operation drag-option"></i></el-table-column>
-              <el-table-column :label="i18nt('designer.setting.columnLabel')" width="150" prop="label">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.label"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.columnName')" width="150" prop="prop">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.prop"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.columnWidth')" width="100" prop="width">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.width"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.visibleColumn')" width="70" prop="show">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.show"></el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('必填')" width="70" prop="required">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.required"></el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.sortableColumn')" width="70" prop="sortable">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.sortable"></el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.fixedColumn')" width="100" prop="fixed">
-                <template slot-scope="scope">
-                  <el-select v-model="scope.row.fixed" clearable>
-                    <el-option value="left">left</el-option>
-                    <el-option value="right">right</el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              &lt;!&ndash;          <el-table-column :label="i18nt('designer.setting.alignTypeOfColumn')" width="100" prop="align">
-                          <template slot-scope="scope">
-                            <el-select v-model="scope.row.align">
-                              <el-option v-for="(e,index) in alignOptions" :key="index" :value="e.value" :label="e.label"></el-option>
-                            </el-select>
-                          </template>
-                        </el-table-column>&ndash;&gt;
-              <el-table-column :label="i18nt('designer.setting.formatOfColumn')" width="200" prop="formatS">
-                <template slot-scope="scope">
-                  <el-select v-model="scope.row.formatS" @change="changeFormatS(scope.row)" clearable>
-                    <el-option-group :label="i18nt('designer.setting.customRenderGroup')">
-                      <el-option value="render" label="render"></el-option>
-                    </el-option-group>
-                    <el-option-group v-for="t in op" :key="t.label" :label="t.label">
-                      <el-option v-for="e in t.options" :key="e.value" :value="e.value" :label="e.label"></el-option>
-                    </el-option-group>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="格式化配置" width="70" fixed="right" align="center">
-                <template slot-scope="scope">
-                  <el-button size="mini" plain="" round="" icon="el-icon-edit"
-                             @click="openFormatConfigDialog(scope.row,scope.$index)"
-                             :disabled="!columnFormatMap[scope.row.formatS]"></el-button>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.renderFunction')" width="70" fixed="right" align="center">
-                <template slot-scope="scope">
-                  <el-button :disabled="'render' !== scope.row.formatS" size="mini" plain="" round="" icon="el-icon-edit"
-                             @click="showRenderDialog(scope.row)"></el-button>
-                </template>
-              </el-table-column>
-              <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" fixed="right" align="center">
-                <template #header>
-                  <span>{{ i18nt('designer.setting.actionColumn') }}</span>
-                  &lt;!&ndash;              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
-                                           icon="el-icon-plus" @click="openFieldTreeDialog"></el-button>&ndash;&gt;
-                </template>
-                <template slot-scope="scope">
-                  <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
-                             icon="el-icon-plus" @click="addCol"></el-button>
-                  <el-button
-                    :title="i18nt('designer.setting.deleteTableColumn')"
-                    size="mini"
-                    type=""
-                    circle=""
-                    icon="el-icon-minus"
-                    @click="handleDelete(scope.$index, scope.row)"
-                  ></el-button>
-                </template>
-              </el-table-column>
-
-            </el-table>
-          </div>
-
-        </el-dialog>-->
-    <!--    <el-dialog
-          v-if="showRenderDialogFlag"
-          :title="i18nt('designer.setting.renderFunction')"
-          :visible.sync="showRenderDialogFlag"
-          append-to-body=""
-          :show-close="!0"
-          custom-class="dialog-style list-dialog"
-          :close-on-click-modal="!1"
-          :close-on-press-escape="!1"
-          :destroy-on-close="!0"
-          v-dialog-drag
-        >
-          <el-alert type="info" :closable="!1" title="function customRender(params,h) {"/>
-          <code-editor ref="dsResultEditor" mode="javascript" :readonly="!1" v-model="renderJson"></code-editor>
-          <el-alert type="info" :closable="!1" title="}"/>
-          <div class="dialog-footer" slot="footer">
-            <el-button @click="showRenderDialogFlag = !1" class="button-sty" icon="el-icon-close">
-              {{ i18nt('designer.hint.cancel') }}
-            </el-button>
-            <el-button type="primary" @click="saveColumnRender" class="button-sty" icon="el-icon-check">
-              {{ i18nt('designer.hint.confirm') }}
-            </el-button>
-          </div>
-        </el-dialog>-->
     <el-dialog
       v-if="showSqlEditDialog"
       :title="i18nt('数据源SQL编辑')"
@@ -457,111 +304,6 @@
         </el-button>
       </span>
     </el-dialog>
-    <!--    <el-dialog
-          v-if="showDateConfigDialog"
-          :title="i18nt('日期配置编辑')"
-          :visible.sync="showDateConfigDialog"
-          append-to-body=""
-          :show-close="!0"
-          custom-class="dialog-style list-dialog"
-          :close-on-click-modal="!1"
-          :close-on-press-escape="!1"
-          :destroy-on-close="!0"
-          v-dialog-drag
-        >
-          <div class="cont">
-            <el-form>
-              <template v-for="(editorName, index) in dateFieldList">
-                <component
-                  :is="editorName"
-                  :designer="designer"
-                  :selected-widget="selectedWidget"
-                  :option-model="columnOption"
-                  :key="index"
-                ></component>
-              </template>
-            </el-form>
-          </div>
-          <div class="dialog-footer" slot="footer">
-            <el-button @click="showDateConfigDialog = !1" class="button-sty" icon="el-icon-close">
-              {{ i18nt('designer.hint.cancel') }}
-            </el-button>
-            <el-button type="primary" class="button-sty" icon="el-icon-check" @click="confirmDateConfigDialog">
-              {{ i18nt('designer.hint.confirm') }}
-            </el-button>
-          </div>
-        </el-dialog>-->
-    <!--    <el-dialog
-          v-if="showDateConfigDialog"
-          :title="i18nt('日期配置编辑')"
-          :visible.sync="showDateConfigDialog"
-          append-to-body=""
-          :show-close="!0"
-          custom-class="dialog-style list-dialog"
-          :close-on-click-modal="!1"
-          :close-on-press-escape="!1"
-          :destroy-on-close="!0"
-          v-dialog-drag
-        >
-          <div class="cont">
-            <el-scrollbar class="setting-scrollbar">
-                <el-form :model="columnOption" size="mini" label-position="left" label-width="120px" class="setting-form"
-                         @submit.native.prevent>
-                  <el-collapse v-model="widgetActiveCollapseNames" class="setting-collapse">
-                    <el-collapse-item name="1" v-if="showCollapse(commonProps)"
-                                      :title="i18nt('designer.setting.commonSetting')">
-                      <template v-for="(editorName, propName) in commonProps">
-                        <component
-                          v-if="hasPropEditor(propName, editorName)"
-                          :is="getPropEditor(propName, editorName)"
-                          :designer="designer"
-                          :selected-widget="columnSelectedWidget"
-                          :option-model="columnOption"
-                          :key="propName"
-                        ></component>
-                      </template>
-                    </el-collapse-item>
-
-                    <el-collapse-item name="2" v-if="showCollapse(advProps)"
-                                      :title="i18nt('designer.setting.advancedSetting')">
-                      <template v-for="(editorName, propName) in advProps">
-                        <component
-                          v-if="hasPropEditor(propName, editorName)"
-                          :is="getPropEditor(propName, editorName)"
-                          :designer="designer"
-                          :selected-widget="selectedWidget"
-                          :option-model="columnOption"
-                          :key="propName"
-                        ></component>
-                      </template>
-                    </el-collapse-item>
-
-                    <el-collapse-item name="3" v-if="showEventCollapse() && showCollapse(eventProps)"
-                                      :title="i18nt('designer.setting.eventSetting')">
-                      <template v-for="(editorName, propName) in eventProps">
-                        <component
-                          v-if="hasPropEditor(propName, editorName)"
-                          :is="getPropEditor(propName, editorName)"
-                          :designer="designer"
-                          :selected-widget="selectedWidget"
-                          :option-model="columnOption"
-                          :key="propName"
-                        ></component>
-                      </template>
-                    </el-collapse-item>
-                  </el-collapse>
-                </el-form>
-            </el-scrollbar>
-          </div>
-          <div class="dialog-footer" slot="footer">
-            <el-button @click="showDateConfigDialog = !1" class="button-sty" icon="el-icon-close">
-              {{ i18nt('designer.hint.cancel') }}
-            </el-button>
-            <el-button type="primary" class="button-sty" icon="el-icon-check" @click="confirmDateConfigDialog">
-              {{ i18nt('designer.hint.confirm') }}
-            </el-button>
-          </div>
-        </el-dialog>-->
     <tableColumnDialog
       v-if="dialogVisible"
       :visiable.sync="dialogVisible"
@@ -578,7 +320,7 @@ import Draggable from "vuedraggable";
 import { deepClone, generateId } from "../../../../../../components/xform/utils/util";
 import Sortable from "sortablejs";
 import requestaccessDialog from "../../../../../../views/user/form/report_requestaccess/dialog.vue";
-import conditionEditor from "./condition-editor.vue";
+// import conditionEditor from "./condition-editor.vue";
 import tableColumnDialog from "./table-column-dialog.vue";
 import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 import setttingConfig from "@/settings";
@@ -590,7 +332,7 @@ export default {
   components: {
     Draggable,
     requestaccessDialog,
-    conditionEditor,
+    // conditionEditor,
     tableColumnDialog,
   },
   props: {
@@ -805,6 +547,14 @@ export default {
         this.optionModel.isNotQueryAllPage = !val;
       },
     },
+    isShowQueryButton: {
+      get() {
+        return !this.optionModel.isNotShowQueryButton;
+      },
+      set(val) {
+        this.optionModel.isNotShowQueryButton = !val;
+      },
+    },
   },
   created: function () {
     // this.reportTemplate = this.getReportTemplate();

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

@@ -54,6 +54,9 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </el-form-item>
 
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>

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

@@ -41,6 +41,9 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </el-form-item>
 
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>