centaline-data-driven 1.2.34 → 1.2.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.34",
+  "version": "1.2.35",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -1,10 +1,8 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form>
-    <!-- <ct-form :api="'/PropertyPublish/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
+    <!-- <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/PropertyRET/getLayoutOfNewStepOne'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <!--:api="'FormSample/formdata'"-->
-    <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
@@ -16,10 +14,10 @@
     name: 'App',
     data() {
       return {
-        apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
+        // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        // apiParam: {SN: "13557_132", UserID: "wuhan3"},
+        apiParam: {actionType: "2", pageStyle: "2", pageTitle: "新增盘源", pageOnly: "true"},
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -308,6 +308,7 @@ html {
  }
  
  .errorMessage {
+   height: 26px;
    font-size: 12px;
    color: #ff5b5b !important;
    padding: 3px 5px;

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -298,6 +298,11 @@
               }
             }
             else {
+              if(field.flagAttachSearchCondition){
+                if (!self.validExcute()){
+                  return;
+                }
+              }
               if (typeof field.onClick !== 'undefined') {
                 verified = self.$common.excute.call(self.model.scripts, field.onClick);
               }
@@ -305,9 +310,14 @@
               if (!submitData) {
                 submitData = {};
                 var tempFormData = self.model.getFormObj();
-                field.submitFormField.forEach((v) => {
-                  submitData[v] = tempFormData[v];
-                });
+                if(field.flagAttachSearchCondition){
+                  submitData.jsonData=tempFormData;
+                }
+                else{
+                  field.submitFormField.forEach((v) => {
+                    submitData[v] = tempFormData[v];
+                  });
+                }
               }
 
               if (field.isOpenForm) {

package/src/centaline/dynamicTags/src/dynamicTags.vue

@@ -11,9 +11,9 @@
             <div ref="cttags" class="el-select__tags" :style="{'max-width':tagsWidth + 'px'}" @click="clickHandle">
               <span>
                 <span class="ct-tags-value-label">{{model.valueLabel}}</span>
-                <span class="el-tag el-tag--info" :class="[model.attrs.size?'el-tag--'+model.attrs.size:'']" v-for="item in model.value">
+                <span class="el-tag el-tag--info" :class="[model.attrs.size?'el-tag--'+model.attrs.size:'']" v-for="(item, index) in model.value" :key="index">
                   <span class="el-select__tags-text">{{getOptionText(item)}}</span>
-                  <i v-if="!model.lock" class="el-tag__close el-icon-close" @click="deleteOption(item,$event)"></i>
+                  <i v-if="!model.lock && !getOptionLocked(item)" class="el-tag__close el-icon-close" @click="deleteOption(item,$event)"></i>
                 </span>
               </span>
             </div>
@@ -240,6 +240,16 @@
           return "";
         }
       },
+      getOptionLocked: function (value) {
+        var self = this;
+        var option = this.globalOptions.find((v) => { return v[self.model.optionAttrs.value] === value });
+        if (option) {
+          return option[self.model.optionAttrs.locked];
+        } 
+        else {
+          return "";
+        }
+      },
       deleteOption(value, event) {
         var self = this;
         this.model.value.splice(
@@ -303,7 +313,13 @@
         this.$set(this, 'showClear', false);
       },
       clearClickHandle: function (event) {
+        var self =this;
         this.model.value.splice(0);
+        if(this.model.lockedValue.length>0){
+          this.model.lockedValue.forEach((v) => {
+            self.model.value.push(v);
+          });          
+        }
         this.resize();
         this.tagsChange();
         this.$emit('input', this.model.value);

package/src/centaline/loader/src/ctl/Tags.js

@@ -14,8 +14,10 @@ const Tags = function (source, moreActionRouter) {
       label: 'name',
       displayLabel:'displayName',
       actionType: 'actionType',
-      flagDeleted: 'flagDeleted'
+      flagDeleted: 'flagDeleted',
+      locked: 'locked'
     },
+    _lockedValue: null,
     _value: null,
     get value() {
       if (this._value !== null) {
@@ -102,6 +104,11 @@ const Tags = function (source, moreActionRouter) {
     //},
     reset() {
       this.value.splice(0);
+      if(this.model.lockedValue.length>0){
+        this.model.lockedValue.forEach((v) => {
+          this.model.value.push(v);
+        });          
+      }
       this.defaultValue.forEach((v1) => {
         this.value.push(v1);
       });
@@ -183,6 +190,20 @@ const Tags = function (source, moreActionRouter) {
 
       return null;
     },
+    get lockedValue() {
+      if (this._lockedValue !== null) {
+        return this._lockedValue;
+      }
+      else {
+        this._lockedValue = [];
+        this.options.forEach((v) => {
+          if(v[this.optionAttrs.locked]){
+            this._lockedValue.push(v[this.optionAttrs.value]);
+          }
+        });
+        return this._lockedValue;
+      }
+    },
   };
   rtn = base.copy(Base(source), rtn);
   rtn = base.copy(rtn, valid.Init(rtn));

package/src/main.js

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",  
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",  
   // baseUrl: "http://10.88.22.46:7070/", 
   // flagRouterSelf: true,
   zindex: 999,