cloud-web-corejs 1.0.75 → 1.0.77

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

@@ -3,14 +3,14 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">请求访问设置</el-divider>
     </el-form-item>
-    <el-form-item label="启用表单脚本" v-if="formScriptEnabledTypes.includes(selectedWidget.type)">
-      <el-switch v-model="optionModel.formScriptEnabled"></el-switch>
+    <el-form-item label="启用请求后台脚本" v-if="formScriptEnabledTypes.includes(selectedWidget.type)">
+      <el-switch v-model="optionModel.formScriptEnabled" @change="changeFormScriptEnabled"></el-switch>
     </el-form-item>
     <template>
-      <el-form-item label="表单脚本编码">
+      <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.formScriptCode" clearable></el-input>
       </el-form-item>
-      <el-form-item label="查询参数">
+      <el-form-item label="查询参数" v-if="optionModel.formScriptEnabled">
         <a href="javascript:void(0);" class="a-link link-oneLind"
            @click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
           <span>{{ optionModel.formScriptParam }}</span>
@@ -18,6 +18,27 @@
         </a>
       </el-form-item>
     </template>
+    <template  v-if="formScriptEnabledTypes.includes(selectedWidget.type)">
+      <el-form-item :label="i18nt('启用系统词汇')">
+        <el-switch v-model="optionModel.commonAttributeEnabled" @change="changeCommonAttributeEnabled"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
+        <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
+      </el-form-item>
+      <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled">
+        <el-input type="text" v-model="optionModel.labelKey"></el-input>
+      </el-form-item>
+      <el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled">
+        <el-input type="text" v-model="optionModel.valueKey"></el-input>
+      </el-form-item>
+    </template>
+    <el-form-item label="查询回调">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('formScriptSuccess', ['dataId', 'formCode','res'])">
+        <span>{{ optionModel.formScriptSuccess }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
   </div>
 </template>
 
@@ -42,6 +63,23 @@ export default {
   methods: {
     getIsShow() {
       return this.selectedWidget.type !== 'data-table';
+    },
+    changeFormScriptEnabled(val){
+      if(val){
+        if(this.optionModel.hasOwnProperty("commonAttributeEnabled")){
+          this.optionModel.commonAttributeEnabled = false
+        }
+      }
+    },
+    changeCommonAttributeEnabled(val){
+      if(val){
+        this.optionModel.formScriptEnabled = false;
+        this.optionModel.labelKey = "value";
+        this.optionModel.valueKey = "sn";
+      }else{
+          this.optionModel.labelKey = null;
+          this.optionModel.valueKey = null;
+      }
     }
   }
 }

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top">请求访问设置</el-divider>
+      <el-divider class="custom-divider-margin-top">项目标签设置</el-divider>
     </el-form-item>
     <el-form-item label="表单编码">
       <el-input v-model="optionModel.tagFormCode" clearable></el-input>
@@ -12,13 +12,30 @@
     <el-form-item label="唯一关键字段">
       <el-input v-model="optionModel.tagUniqueField" clearable></el-input>
     </el-form-item>
+    <el-form-item label="来源展示字段">
+      <el-input v-model="optionModel.tagFormLabelField" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="来源唯一关键字段">
+      <el-input v-model="optionModel.tagFormUniqueField" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="表单参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('tagFormParam', ['dataId', 'formCode'])">
+        <span>{{ optionModel.cf_vendor_item }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
     <el-form-item label="明细字段回填">
-      <el-input v-model="optionModel.tagFillConfig" clearable></el-input>
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="openDialog">
+        <span>{{ optionModel.tagFillConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
     </el-form-item>
     <el-form-item label="确认回调">
 <!--      <el-input v-model="optionModel.tagConfirmCallback" clearable></el-input>-->
       <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('tagConfirmCallback', [])">
+         @click="editEventHandler('tagConfirmCallback', ['dataId', 'formCode','rows'])">
         <span>{{ optionModel.tagConfirmCallback }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -26,7 +43,7 @@
     <el-form-item label="删除回调">
 <!--      <el-input v-model="optionModel.tagDeleteCallback" clearable></el-input>-->
       <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('tagDeleteCallback', [])">
+         @click="editEventHandler('tagDeleteCallback', ['dataId', 'formCode'])">
         <span>{{ optionModel.tagDeleteCallback }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -42,6 +59,80 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>-->
+    <el-dialog
+      custom-class="dialog-style list-dialog"
+      title="数据回填"
+      :visible.sync="showDialog"
+      :modal="false"
+      :show-close="!0"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      top="5vh"
+      width="500px"
+      v-dialog-drag
+    >
+      <div class="cont">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          height="500"
+          :data="tableData"
+          border=""
+          stripe=""
+          default-expand-all
+        >
+          <el-table-column label="目标字段" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="来源字段" width="150" prop="sourceField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.sourceField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="50" fixed="right">
+            <template #header="{ row, $index }">
+              <el-tooltip
+                :hide-after="500"
+                class="item"
+                effect="dark"
+                content="添加"
+                placement="top"
+              >
+                <el-button
+                  size="mini" type="" circle=""
+                  icon="el-icon-plus"
+                  @click="tableData.push({})"
+                />
+              </el-tooltip>
+            </template>
+            <template #default="{ row, $index }">
+              <el-tooltip
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini" type="" circle=""
+                  icon="el-icon-delete"
+                  @click="tableData.splice($index,1)"
+                />
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="confirmDialog" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -51,7 +142,7 @@ import eventMixin
   from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
 
 export default {
-  name: "formScriptEnabled-editor",
+  name: "project-tag-editor",
   mixins: [i18n, eventMixin],
   props: {
     designer: Object,
@@ -60,12 +151,22 @@ export default {
   },
   data() {
     return {
-      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census']
+      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census'],
+      showDialog: false,
+      tableData: [],
     }
   },
   methods: {
     getIsShow() {
       return this.selectedWidget.type !== 'data-table';
+    },
+    openDialog() {
+      this.tableData = this.$baseLodash.cloneDeep(this.optionModel.tagFillConfig);
+      this.showDialog = true;
+    },
+    confirmDialog() {
+      this.optionModel.tagFillConfig = this.$baseLodash.cloneDeep(this.tableData);
+      this.showDialog = false;
     }
   }
 }

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

@@ -1,28 +1,32 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.required')" v-show="showProperty()">
+  <el-form-item
+    :label="i18nt('designer.setting.required')"
+    v-show="showProperty()"
+  >
     <el-switch v-model="optionModel.required"></el-switch>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "required-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
+export default {
+  name: "required-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  methods: {
+    showProperty() {
+      let widgetRef = this.designer.vueInstance.getWidgetRef(
+        this.selectedWidget.options.name
+      );
+      return widgetRef?.$attrs["table-condition"] !== true;
     },
-    methods:{
-      showProperty(){
-        return this.designer.formWidget.getWidgetRef(this.selectedWidget.options.name).$attrs['table-condition']!==true;
-      }
-    }
-  }
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -148,6 +148,8 @@ const COMMON_PROPERTIES = {
   "submitFlag": "submitFlag-editor",
   "aLinkFlag": "a-link-editor",
   "aTextFlag": "a-text-editor",
+  "tagFormCode": "project-tag-editor",
+  // "commonAttributeEnabled": "commonAttributeEnabled-editor"
 }
 
 const ADVANCED_PROPERTIES = {

package/src/components/xform/form-designer/toolbar-panel/index.vue

@@ -43,12 +43,12 @@
                   表单/列表设置
                 </el-button>-->
         <el-button type="primary" @click="saveReportTemplate()" plain
-                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1">
+                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1 && !readonly">
           <i class="el-icon-check"/>
           保存
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('clearDesignerButton')" type="text" @click="clearFormWidget">
+        <el-button v-if="showToolButton('clearDesignerButton') && !readonly" type="text" @click="clearFormWidget">
           <i class="el-icon-delete"/>
           {{ i18nt('designer.toolbar.clear') }}
         </el-button>
@@ -57,7 +57,7 @@
           {{ i18nt('designer.toolbar.preview') }}
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('importJsonButton')" type="text" @click="importJson">
+        <el-button v-if="showToolButton('importJsonButton') && !readonly" type="text" @click="importJson">
           {{ i18nt('designer.toolbar.importJson') }}
         </el-button>
         <el-button v-if="showToolButton('exportJsonButton')" type="text" @click="exportJson">
@@ -437,6 +437,7 @@ export default {
     Clipboard,
     FormSetting
   },
+  inject:["readonly"],
   mixins: [indexMixin],
   data() {
     return {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -258,7 +258,7 @@ export const containers = [
       accessScript: null,
       scriptEnabled: false,
       accessParam: null,
-  
+
       formScriptEnabled: true,
       formScriptCode: null,
       formScriptParam: null,
@@ -273,14 +273,14 @@ export const containers = [
       isQueryTable: false,
       entityTableCode: null,
       entityTableDesc: null,
-  
+
       tableConfig: null,
       isEditTable: false,
       isTreeTable: false,
       wbsEnabled: false,
       sortScriptCode: null,
       importTemplateFile: null,
-  
+
       ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1075,8 +1075,12 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
+      formScriptSuccess: null,
       ...defaultWfConfig,
 
+      commonAttributeEnabled: false,
+      commonAttributeCode: "",
+
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],
@@ -1144,8 +1148,12 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
+      formScriptSuccess: null,
       ...defaultWfConfig,
 
+      commonAttributeEnabled: false,
+      commonAttributeCode: "",
+
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],
@@ -1224,8 +1232,12 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
+      formScriptSuccess: null,
       ...defaultWfConfig,
 
+      commonAttributeEnabled: false,
+      commonAttributeCode: "",
+
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],
@@ -1990,6 +2002,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      formScriptSuccess: null,
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
@@ -2163,6 +2176,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      formScriptSuccess: null,
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
@@ -2377,6 +2391,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      formScriptSuccess: null,
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
@@ -2520,6 +2535,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,
+      formScriptSuccess: null,
       ...defaultWfConfig,
 
       showRuleFlag: 1,
@@ -2965,6 +2981,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      formScriptSuccess: null,
       onCreated: "",
       onMounted: "",
       ...defaultWfConfig,
@@ -2976,7 +2993,7 @@ export const advancedFields = [
   {
     type: "project-tag",
     icon: "uploadbox",
-    commonFlag: !1,
+    commonFlag: !0,
     formItemFlag: !0,
     tableField: null,
     options: {
@@ -2992,17 +3009,31 @@ export const advancedFields = [
       required: !1,
       labelWidth: null,
       labelHidden: !1,
-      onCreated: "if(this.formDataId)this.loadDataDefaultHandle();",
+      onCreated: "if(this.dataId)this.loadDataDefaultHandle();",
       onMounted: "",
+      onClick: "",
       vabUpload: 1,
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,
+      formScriptSuccess: null,
       ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
-      showRules: []
+      showRules: [],
+
+      tagFormCode: null,
+      tagFormParam: null,
+      tagLabelField: null,
+      tagUniqueField: null,
+      tagFormLabelField: null,
+      tagFormUniqueField: null,
+      tagFillConfig: [],
+      tagConfirmCallback: null,
+      tagDeleteCallback: null,
+      tabDeleteEnabled: false,
+
     }
   },
   {
@@ -3024,6 +3055,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      formScriptSuccess: null,
       onCreated: "this.loadDataDefaultHandle()",
       onMounted: "",
       ...defaultWfConfig,

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -100,7 +100,7 @@
                     </template>
                   </div>-->
 
-      <tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel"
+      <tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel" :xform="true"
                  @searchEvent="searchEvent" @resetEvent="resetEvent" @advancedClear="advancedClear"
                  @settingConfirm="tableFormSettingConfirm">
         <template #buttonLeft>
@@ -149,25 +149,24 @@
           </vxe-button>
         </template>
 
-        <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
-          <component
-            v-if="'container' !== subWidget.category"
-            :key="swIdx"
-            :is="subWidget.type + '-widget'"
-            :field="subWidget"
-            :designer="null"
-            :parent-list="subWidget.widgetList"
-            :parent-widget="widget"
-          >
-            <!-- 递归传递插槽！！！ -->
-            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-              <slot :name="slot" v-bind="scope"/>
-            </template>
-          </component>
-        </template>
+          <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
+            <component
+              v-if="'container' !== subWidget.category"
+              :key="swIdx"
+              :is="subWidget.type + '-widget'"
+              :field="subWidget"
+              :designer="null"
+              :parent-list="subWidget.widgetList"
+              :parent-widget="widget"
+            >
+              <!-- 递归传递插槽！！！ -->
+              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+                <slot :name="slot" v-bind="scope"/>
+              </template>
+            </component>
+          </template>
 
         <template #searchWidget="{searchColumn}">
-          {{ searchColumn.widget.type }}
           <component
             :is="searchColumn.widget.type + '-widget'"
             :field="searchColumn.widget"
@@ -207,7 +206,7 @@
     <template #widget="obj">
       <component
         :is="getColumnWidgetName(obj.column.params.widget)"
-        :field="obj.column.params.widget"
+        :field="getRowWidget(obj)"
         :form-model="globalModel.formModel"
         :designer="null"
         :key="obj.column.params.widget.id+'-'+obj.rowIndex"