cloud-web-corejs 1.0.54-dev.800 → 1.0.54-dev.802

package/src/components/xform/form-designer/setting-panel/property-editor/field-date/date-defaultValue-editor.vue

@@ -1,44 +1,43 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')" class="form-item-label-top">
-    <el-checkbox v-model="nowDefaultValue">当前日期</el-checkbox>
-    <el-date-picker v-if="!nowDefaultValue" :type="optionModel.type"
-                    v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                    :format="optionModel.format" :value-format="optionModel.valueFormat"
-                    style="width: 100%">
-    </el-date-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="date"
+      @change="emitDefaultValueChange"
+    >
+      <el-date-picker
+        :type="optionModel.type"
+        v-model="optionModel.defaultValue"
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        :value-format="optionModel.valueFormat"
+        style="width: 100%"
+      >
+      </el-date-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "date-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-    computed: {
-      /* 老表单的options可能没有defaultValueType属性，用$set赋值保证响应式 */
-      nowDefaultValue: {
-        get() {
-          return this.optionModel.defaultValueType === 'now'
-        },
-        set(checked) {
-          this.$set(this.optionModel, 'defaultValueType', checked ? 'now' : '')
-          if (checked) {
-            this.$set(this.optionModel, 'defaultValue', null)
-          }
-          this.emitDefaultValueChange()
-        },
-      },
-    },
-  }
+export default {
+  name: "date-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-date-range/date-range-defaultValue-editor.vue

@@ -1,26 +1,43 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')" class="form-item-label-top">
-    <el-date-picker :type="optionModel.type" v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                    :format="optionModel.format" :value-format="optionModel.valueFormat" style="width: 100%">
-    </el-date-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="date-range"
+      @change="emitDefaultValueChange"
+    >
+      <el-date-picker
+        :type="optionModel.type"
+        v-model="optionModel.defaultValue"
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        :value-format="optionModel.valueFormat"
+        style="width: 100%"
+      >
+      </el-date-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "date-range-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "date-range-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -34,7 +34,7 @@
     <el-form-item label="启用确认回调">
       <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
     </el-form-item>
-    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled">
+    <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"
          @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
         <span>{{ optionModel.onConfirmImport }}</span>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue

@@ -1,44 +1,42 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')" class="form-item-label-top">
-    <el-checkbox v-model="nowDefaultValue">当前时间</el-checkbox>
-    <el-time-picker v-if="!nowDefaultValue" v-model="optionModel.defaultValue"
-                    @change="emitDefaultValueChange"
-                    :format="optionModel.format" value-format="HH:mm:ss"
-                    style="width: 100%">
-    </el-time-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "time-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-    computed: {
-      /* 老表单的options可能没有defaultValueType属性，用$set赋值保证响应式 */
-      nowDefaultValue: {
-        get() {
-          return this.optionModel.defaultValueType === 'now'
-        },
-        set(checked) {
-          this.$set(this.optionModel, 'defaultValueType', checked ? 'now' : '')
-          if (checked) {
-            this.$set(this.optionModel, 'defaultValue', null)
-          }
-          this.emitDefaultValueChange()
-        },
-      },
-    },
-  }
+export default {
+  name: "time-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time-range/time-range-defaultValue-editor.vue

@@ -1,26 +1,43 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')" class="form-item-label-top">
-    <el-time-picker v-model="optionModel.defaultValue" is-range @change="emitDefaultValueChange"
-                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
-    </el-time-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time-range"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        is-range
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "time-range-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "time-range-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -0,0 +1,39 @@
+<template>
+  <!-- 只在数据表格查询区显示：这个开关在别处（主表单字段、表格列）没有任何作用 -->
+  <el-form-item v-if="showEditor" :label="i18nt('designer.setting.fixedQuery')">
+    <el-tooltip
+      :enterable="false"
+      effect="dark"
+      :content="i18nt('designer.setting.fixedQueryHelp')"
+      placement="top"
+      popper-class="tooltip-skin"
+    >
+      <el-switch v-model="optionModel.fixedQuery"></el-switch>
+    </el-tooltip>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+import { isQueryAreaWidget } from "../../../../../components/xform/utils/fixedQueryUtil";
+
+export default {
+  name: "fixedQuery-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  computed: {
+    showEditor() {
+      return isQueryAreaWidget(
+        this.designer && this.designer.widgetList,
+        this.selectedWidget
+      );
+    },
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -6,6 +6,7 @@
     <el-form-item
       label="启用请求后台脚本"
       v-if="formScriptEnabledTypes.includes(selectedWidget.type)"
+      class="el-form-item-isSwitch"
     >
       <el-switch
         v-model="optionModel.formScriptEnabled"
@@ -16,11 +17,12 @@
       <!--      <el-form-item label="请求表单编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.httpFormCode" clearable></el-input>
       </el-form-item>-->
-      <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled" class="form-item-label-top">
+      <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled" class="form-item-label-top el-form-item-second">
         <el-input v-model="optionModel.formScriptCode" clearable></el-input>
       </el-form-item>
       <el-form-item
         label="查询参数"
+        class="el-form-item-second"
         v-if="
           optionModel.formScriptEnabled || optionModel.commonAttributeEnabled
         "
@@ -45,7 +47,7 @@
       <el-form-item
         :label="i18nt('词汇编码')"
         v-if="optionModel.commonAttributeEnabled"
-        class="form-item-label-top"
+        class="form-item-label-top el-form-item-second"
       >
         <el-input
           type="text"
@@ -62,11 +64,13 @@
     <el-form-item
       label="请求去掉data层"
       v-if="optionModel.formScriptEnabled"
+      class="el-form-item-second"
     >
       <el-switch v-model="optionModel.removeDataLevel"></el-switch>
     </el-form-item>
     <el-form-item
       label="查询回调"
+      class="el-form-item-second"
       v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled"
     >
       <a
@@ -138,4 +142,17 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped lang="scss">
+  ::v-deep .el-form-item-second{
+    .el-form-item__label{
+      padding-left:0 !important;
+      &:before{display:none !important}
+    }
+  }
+  ::v-deep .el-form-item-isSwitch{
+    ~ .el-form-item-second .el-form-item__label{
+      padding-left:4px !important;
+      &:before{display:inline-block !important}
+    }
+  }
+</style>