cloud-web-corejs 1.0.54-dev.247 → 1.0.54-dev.249

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.247",
+  "version": "1.0.54-dev.249",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -239,8 +239,17 @@ modules = {
         }*/
         let defaultValue = this.field.options.defaultValue;
         let dataId = this.getFormRef()?.dataId ?? null;
+        let nullValue = null;
+        let widgetType = this.field.type;
+        if (widgetType == "number") {
+          nullValue = undefined;
+        } else if (widgetType === 'checkbox' || (widgetType === 'select' && this.field.options.multiple)) {
+          nullValue = [];
+        }else if(widgetType == "time-range"  || widgetType=="date-range" || (widgetType === 'date' && this.field.options.type=="dates")){
+          nullValue = [];
+        }
         if (void 0 === currentData[this.fieldKeyName]) {
-          this.$set(currentData, this.fieldKeyName, null);
+          this.$set(currentData, this.fieldKeyName, nullValue);
         }
         if (flag) {
           this.fieldModel = currentData[this.fieldKeyName];
@@ -387,7 +396,7 @@ modules = {
             let changedFieldRef = sourceWidget
             const changedFieldName = sourceWidget.field.options.name
             //检查计算公式是否包含当前修改字段
-            if (fieldIsUsedInFormula(changedFieldName, this.field.options.formula, this.getFormRef(),this)) {
+            if (fieldIsUsedInFormula(changedFieldName, this.field.options.formula, this.getFormRef(), this)) {
 
               /* 计算公式的计算改成延时执行，否则当子表单开启默认创建新行后，子表单字段的计算公式中使用到主表单字段则会出现计算错误！！ */
               //calculateFormula(this.getFormRef(), this.getGlobalDsv(), formulajs, this, changedFieldRef)
@@ -457,7 +466,7 @@ modules = {
       if (null !== this.refList && this.field.options.name) {
         if (this.tableParam && !this.designState) {
           let row = this.tableParam.row;
-          if(!row._X_ROW_KEY){
+          if (!row._X_ROW_KEY) {
             row._X_ROW_KEY = "row_" + generateId()
           }
           let keyVal = row._X_ROW_KEY;
@@ -771,7 +780,7 @@ modules = {
       });
     },
     emitFieldDataChange(newValue, oldValue) {
-      if(this.designState)return
+      if (this.designState) return
       this.$emit('field-value-changed', [newValue, oldValue])
 
       /* 同步更新keyName属性一致的字段组件值！！ */

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

@@ -59,7 +59,7 @@
     data() {
       return {
         oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        fieldModel: undefined,
         rules: [],
       }
     },

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

@@ -9,12 +9,22 @@
     </el-form-item>
 
     <el-form-item label="默认值">
-      <el-input v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="!optionModel.optionItemValueType"></el-input>
-      <base-input-number v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="optionModel.optionItemValueType==1" />
-      <el-select v-model="optionModel.defaultValue" style="width: 100px" v-if="optionModel.optionItemValueType===2" clearable @clear="optionModel.defaultValue=null">
-        <el-option :value="true" label="true"></el-option>
-        <el-option :value="false" label="false"></el-option>
-      </el-select>
+      <template  v-if="selectedWidget.type === 'checkbox' || (selectedWidget.type === 'select' && selectedWidget.options.multiple)">
+        <a href="javascript:void(0);" class="a-link link-oneLind"
+           @click="openTableDataEdit()">
+          <span>{{ getDefaultValue() }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </template>
+      <template v-else>
+        <el-input v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="!optionModel.optionItemValueType"></el-input>
+        <base-input-number v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="optionModel.optionItemValueType==1" />
+        <el-select v-model="optionModel.defaultValue" style="width: 100px" v-if="optionModel.optionItemValueType===2" clearable @clear="optionModel.defaultValue=null">
+          <el-option :value="true" label="true"></el-option>
+          <el-option :value="false" label="false"></el-option>
+        </el-select>
+      </template>
+
     </el-form-item>
 		<el-radio-group
 			v-if="selectedWidget.type === 'radio' || (selectedWidget.type === 'select' && !selectedWidget.options.multiple)"
@@ -112,6 +122,31 @@
 				<el-button size="large" type="" @click="showImportCascaderDialogFlag = false">{{ i18nt('designer.hint.cancel') }}</el-button>
 			</div>
 		</el-dialog>
+    <el-dialog
+      v-if="dataDialogVisible"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('默认值编辑')"
+      :visible.sync="dataDialogVisible"
+      :show-close="!0"
+      append-to-body=""
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="75%"
+      v-dialog-drag
+    >
+      <template slot="footer">
+        <div class="dialog-footer">
+          <el-button type="" @click="dataDialogVisible = !1" class="button-sty" icon="el-icon-close">
+            {{ i18nt('designer.hint.cancel') }}
+          </el-button>
+          <el-button type="primary" @click="saveTableData" class="button-sty" icon="el-icon-check">
+            {{ i18nt('designer.hint.confirm') }}
+          </el-button>
+        </div>
+      </template>
+      <code-editor mode="json" :readonly="!1" v-model="tableDataOptions"></code-editor>
+    </el-dialog>
 	</div>
 </template>
 
@@ -138,7 +173,9 @@ export default {
 			showImportCascaderDialogFlag: false,
 
 			//separator: '||',
-			separator: ','
+			separator: ',',
+      dataDialogVisible:false,
+      tableDataOptions:[],
 		};
 	},
 	computed: {
@@ -237,7 +274,7 @@ export default {
 			if (this.selectedWidget.type === 'checkbox' || (this.selectedWidget.type === 'select' && this.selectedWidget.options.multiple)) {
 				this.optionModel.defaultValue = [];
 			} else {
-				this.optionModel.defaultValue = null;
+				this.optionModel.defaultValue = undefined;
 			}
 
 			this.emitDefaultValueChange();
@@ -261,7 +298,8 @@ export default {
 		},
     changeValueType(val){
       let optionItems = this.optionModel.optionItems;
-      this.optionModel.defaultValue = null;
+      // this.optionModel.defaultValue = undefined;
+      this.resetDefault();
       this.optionModel.optionItems.length = 0;
       if(val==2){
         optionItems.push({
@@ -277,7 +315,28 @@ export default {
       }
       this.$forceUpdate()
       this.emitDefaultValueChange();
-    }
+    },
+
+
+    openTableDataEdit: function () {
+      (this.dataDialogVisible = !0), (this.tableDataOptions = JSON.stringify(this.optionModel.defaultValue, null, '  '));
+    },
+    saveTableData: function () {
+      try {
+        (this.optionModel.defaultValue = JSON.parse(this.tableDataOptions)), (this.dataDialogVisible = !1);
+      } catch (e) {
+        this.$message.error(this.i18nt('designer.hint.invalidOptionsData') + e.message);
+      }
+    },
+    getDefaultValue(){
+      let result = this.optionModel.defaultValue;
+      if(result){
+        if(Array.isArray(result)){
+          result = result.join(",");
+        }
+      }
+      return result;
+    },
 	}
 };
 </script>

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

@@ -8,9 +8,9 @@
     </el-form-item>
     <template>
 
-      <el-form-item label="请求表单编码" v-if="optionModel.formScriptEnabled">
+<!--      <el-form-item label="请求表单编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.httpFormCode" clearable></el-input>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.formScriptCode" clearable></el-input>
       </el-form-item>

package/src/components/xform/form-render/indexMixin.js

@@ -1082,12 +1082,13 @@ modules = {
                 this.showFormContent = true;
                 this.$nextTick(() => {
                   this.handleShowHideRule();
-                  if (hasWf) {
-                    setTimeout(() => {
-                      callback && callback()
-                      callback1 && callback1(wfParam)
-                    }, 1000)
-                  }
+                  /*if (hasWf) {
+
+                  }*/
+                  setTimeout(() => {
+                    callback && callback()
+                    callback1 && callback1(wfParam)
+                  }, 1000)
                   wfParam.done()
                 })
               }

package/src/components/xform/mixins/scriptHttp.js

@@ -112,7 +112,7 @@ modules = {
             let reportGlobalMap = getReportGlobalMap() || {};
             let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
             return this.getHttpTarget().$http({
-              aes: true,
+              // aes: true,
               url: url,
               method: `post`,
               // loadingTarget: this.getLoadingTarget(),

package/src/index.js

@@ -81,7 +81,7 @@ import vxeFilter from '@base/components/table/vxeFilter/index.js';
 
 Vue.use(vxeFilter);
 
-import baseTableExport from "@base/components/excelExport/button";
+import baseTableExport from "@base/components/excelExport2/button";
 
 Vue.component(baseTableExport.name, baseTableExport);
 

package/src/views/user/home/default.vue

@@ -287,7 +287,7 @@ export default {
     initSystemNotice() {
       this.$http({
         url: USER_PREFIX + '/system_notice/listPage',
-        data: {publish: true},
+        data: {publish: true, searchCount: false},
         method: 'post',
         success: res => {
           this.systemNotices = res.objx && res.objx.records ? res.objx.records : [];
@@ -301,7 +301,7 @@ export default {
     initUnDoWfInfo() {
       this.$http({
         url: AGILEBPM_PREFIX + '/wf_manage/listPage',
-        data: {type: 0},
+        data: {type: 0, searchCount: false},
         method: 'post',
         success: res => {
           this.unDoWfRows = res.objx.records || [];
@@ -412,7 +412,7 @@ export default {
     initNotifyMessage() {
       this.$http({
         url: USER_PREFIX + '/notify_message/listPage',
-        data: {},
+        data: {searchCount: false},
         method: 'post',
         success: res => {
           this.notifyMessages = res.objx && res.objx.records ? res.objx.records : [];
@@ -452,9 +452,9 @@ export default {
       this.$http({
         url: USER_PREFIX + `/notify_template/listPage`,
         method: `post`,
-        data: {},
+        data: {searchCount: false},
         isLoading: true,
-        loadingTarget: document.body,
+        // loadingTarget: document.body,
         success: res => {
           this.notifyTemplates = res.objx && res.objx.records ? res.objx.records : [];
           this.showGroupDialog = true;
@@ -515,7 +515,7 @@ export default {
         method: `post`,
         data: {},
         isLoading: true,
-        loadingTarget: document.body,
+        // loadingTarget: document.body,
         modalStrictly: true,
         success: res => {
           this.wfParamDTOs = res.objx || [];
@@ -529,10 +529,11 @@ export default {
       }
       this.$http({
         url: USER_PREFIX + '/wf_info/listPage',
-        data: {type: 0, size: 20},
+        data: {type: 0, size: 20, searchCount: false},
         method: 'post',
         isLoading: isLoading,
-        loadingTarget: document.body,
+        modal: isLoading || false,
+        // loadingTarget: document.body,
         success: res => {
           this.unDoWfRows = res.objx && res.objx.records ? res.objx.records : [];
         },
@@ -554,7 +555,8 @@ export default {
         method: `post`,
         data: {},
         isLoading: isLoading,
-        loadingTarget: document.body,
+        modal: isLoading || false,
+        // loadingTarget: document.body,
         success: res => {
           this.unreadMessageNum = res.objx || 0;
         },

package/src/views/user/project_tag/dialog.vue

@@ -144,19 +144,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {