centaline-data-driven-v3 0.0.60 → 0.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/web/FormList.vue

@@ -273,7 +273,8 @@ function saveRow(row, index, isCancel) {
                         if (k !== '$sourceIndex') {
                             row[k].code1 = data[k].code1;
                             row[k].code2 = data[k].code2;
-                            row[k].text = data[k].text;
+                            row[k].name1 = data[k].name1;
+                            row[k].name2 = data[k].name2;
                         }
                     };
                     if (model.value.currentRow.isNew) {

package/src/components/web/PhotoSelectList.vue

@@ -2,8 +2,9 @@
     <div v-loading="loading" style="width: 100%;height: 100%;">
         <div style="width: 100%;height: 100%;position: relative;" class="ct-photoSelectList" v-if="FlagPhoto">
             <div style="padding: 10px 0 0 20px" v-if="paramName">
-                <el-select-v2 v-model="mediaLabelID" :props="optionAttrs" :options="options" :placeholder="common.LocalizedString('类别','類別')"
-                    style="width: 150px;" @change="change" clearable />
+                <el-select-v2 v-model="mediaLabelID" :props="optionAttrs" :options="options"
+                    :placeholder="common.LocalizedString('类别', '類別')" style="width: 150px;" @change="change"
+                    clearable />
             </div>
             <el-main :style="paramName ? 'top: 40px' : 'top: 10px'"
                 style="position: absolute; bottom: 50PX;left: 10px;right: 0;padding:0px">
@@ -11,7 +12,9 @@
                 <template v-if="imageList.length > 0">
                     <template v-if="layout">
                         <div style="display: flex;" v-for="(item, index) in imageList" :key="index">
-                            <el-checkbox style="margin: 0 5px;" @change="choose(item, true)"
+                            <el-radio v-if="selectedMode == 1" style="margin: 0 5px;height: auto;"
+                                @change="chooseRadio(item)" v-model="item.ischeck" :label="true">&nbsp;</el-radio>
+                            <el-checkbox v-else style="margin: 0 5px;" @change="choose(item, true)"
                                 v-model="item.ischeck"></el-checkbox>
                             <ct-layout :vmodel="item" :cellLayout="layout" :rowindex="index" :flagMediaSelect="true"
                                 @rolRouterclick="rolRouterCellClickHandler">
@@ -53,14 +56,15 @@
                     </template>
                 </template>
                 <template v-else>
-                    <el-empty :description="common.LocalizedString('没有数据','沒有數據')" />
+                    <el-empty :description="common.LocalizedString('没有数据', '沒有數據')" />
                 </template>
             </el-main>
 
             <div style="width:100%;text-align:center">
-                <el-checkbox style="position:absolute;bottom:10px;left: 15px;" @change="allchoose"
-                    v-model="allcheck">{{common.LocalizedString('全选','全選')}}</el-checkbox>
-                <el-button type="primary" style="position:absolute;bottom:10px;" @click="handleClick()">{{common.LocalizedString('确定','確認')}}</el-button>
+                <el-checkbox v-if="selectedMode != 1" style="position:absolute;bottom:10px;left: 15px;"
+                    @change="allchoose" v-model="allcheck">{{ common.LocalizedString('全选', '全選') }}</el-checkbox>
+                <el-button type="primary" style="position:absolute;bottom:10px;" @click="handleClick()">{{
+                    common.LocalizedString('确定', '確認') }}</el-button>
             </div>
         </div>
     </div>
@@ -91,6 +95,7 @@ const allcheck = ref(false)
 const options = ref([])
 const mediaLabelID = ref('')
 const loading = ref(true)
+const selectedMode = ref(2)
 const optionAttrs = {
     label: 'name',
     value: 'code',
@@ -121,6 +126,9 @@ function load(data) {
             layout.value = data.source.content.layout;
             paramName.value = data.source.content.paramName;
             sourceRows = common.deepClone(data.source.content.mediaList);
+            if (data.source.content.selectedMode) {
+                selectedMode.value = data.source.content.selectedMode
+            }
         }
         else {
             sourceRows = common.deepClone(data.source.content);
@@ -192,6 +200,16 @@ function choose(item, flagCheckbox) {
         item.ischeck = false;
     }
 
+}
+function chooseRadio(item) {
+    let chooseItem = common.deepClone(item);
+    chooseList.value = [];
+    imageList.value.forEach((v) => {
+        v.ischeck = false;
+    });
+    item.ischeck = true;
+    chooseList.value.push(chooseItem);
+
 }
 function allchoose() {
     chooseList.value = [];

package/src/loader/src/Form.js

@@ -838,7 +838,7 @@ function requiredHandle(item, model) {
 //清除关联当前组件的组件值
 function clearRelatedHandle(field, fields) {
   var f = fields.filter((v) => {
-    return v.parentField && v.parentField.indexOf(field.fieldName1) > -1;
+    return v.parentField && field.fieldName1 && (','+v.parentField+',').indexOf(','+field.fieldName1+',') > -1;
   });
   f.forEach((v) => {
     if (v.reset) {
@@ -1098,10 +1098,10 @@ function changeHandler(field, model) {
   }
   if (field.onAfterChanged && field.controlType !== Enum.ControlType.NumericTextBox) {
     var router = model.actionRouters.find((v) => {
-      return v.id === field.onAfterChanged;
+      return v.key === field.onAfterChanged;
     });
     if (router) {
-      clickHandler(router);
+      model.$vue.clickHandler(router);
     }
     else {
       if (model.scripts) {

package/src/loader/src/SearchTable.js

@@ -1106,7 +1106,7 @@ function doAction(response, model) {
                 model.dataDictionary = response.content;
 
                 model.source.page.rows = model.source.page.rows + response.content.length;
-                model.setRow(rtn.listData);
+                model.setRow(model.listData);
                 if (!common.flagApp()) {
                     model.$vue.calculatingRowHeight();
                     model.$vue.emit("searchComplate");
@@ -1125,10 +1125,10 @@ function doAction(response, model) {
             if (response.content && Array.isArray(response.content)) {
                 response.content.forEach((row) => {
                     for (var vkey in row) {
-                        model.dataDictionary[row[model.primaryKey]][vkey] = row[vkey];
+                        model.dataDictionary[row[model.primaryFieldName]][vkey] = row[vkey];
                     }
                 });
-                model.setRow(rtn.listData);
+                model.setRow(model.listData);
             }
             else {
                 model.$vue.updateCurrentRow({ flagFreshCurrentRow: true }, { responseData: response });
@@ -1154,7 +1154,7 @@ function doAction(response, model) {
 
         case Enum.ActionType.Replace: //替换
             if (response.content && Array.isArray(response.content)) {
-                delete model.dataDictionary[rtn.listData[model.selectIndex][model.primaryKey]];
+                delete model.dataDictionary[model.listData[model.selectIndex][model.primaryFieldName]];
                 response.content.forEach((row) => {
                     model.listData.splice(model.selectIndex, 1, row);
                 });

package/src/main.js

@@ -64,7 +64,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1-7acf3f06-c2ea-471c-a5fa-07e1c2a81728"}',
-                authObject: '{EmpID:"Token_5f3cda7e-a0b5-4899-8231-f6a4aaae661b",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_5f3cda7e-a0b5-4899-8231-f6a4aaae661b",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_0f977713-7a8d-420b-9536-967f8c8183c7",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_0f977713-7a8d-420b-9536-967f8c8183c7",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/mixins.js

@@ -125,6 +125,7 @@ function validExcuteMessage(validtemp, model) {
 
 //路由操作事件
 export function RouterClickHandler(field, submitData, action, model, source, callBack) {
+    debugger
     if (source == 'form') {
         model.scripts.$fd = field.id;
         model.scripts.$result = [];

package/src/components/web/PopupGroupList.vue

@@ -1,6 +0,0 @@
-<template>
-
-</template>
-<script setup lang="ts">
-
-</script>